Mercurial > vim
annotate src/screen.c @ 17229:f1c7b7a4d9e4 v8.1.1614
patch 8.1.1614: 'numberwidth' can only go up to 10
commit https://github.com/vim/vim/commit/f8a071265535b8cc43e50a81f4d5049883ca50e4
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jul 1 22:06:07 2019 +0200
patch 8.1.1614: 'numberwidth' can only go up to 10
Problem: 'numberwidth' can only go up to 10.
Solution: Allow up to 20. (Charlie Stanton, closes https://github.com/vim/vim/issues/4584)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 01 Jul 2019 22:15:05 +0200 |
| parents | 09fa437d33d8 |
| children | cbd0432cf8ff |
| 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); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
126 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, 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 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
|
148 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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
154 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
|
155 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
|
156 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
|
157 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
158 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
|
159 #endif |
| 7 | 160 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
161 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 162 #endif |
| 163 #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
|
164 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 165 #endif |
| 166 | |
| 167 /* Ugly global: overrule attribute used by screen_char() */ | |
| 168 static int screen_char_attr = 0; | |
| 169 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
170 #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
|
171 /* 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
|
172 # 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
|
173 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
175 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
176 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
177 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
181 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
182 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
183 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
184 |
| 7 | 185 /* |
| 186 * Redraw the current window later, with update_screen(type). | |
| 187 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
188 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 189 */ |
| 190 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
191 redraw_later(int type) |
| 7 | 192 { |
| 193 redraw_win_later(curwin, type); | |
| 194 } | |
| 195 | |
| 196 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
197 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
198 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
199 int type) |
| 7 | 200 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
201 if (!exiting && wp->w_redr_type < type) |
| 7 | 202 { |
| 203 wp->w_redr_type = type; | |
| 204 if (type >= NOT_VALID) | |
| 205 wp->w_lines_valid = 0; | |
| 206 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 207 must_redraw = type; | |
| 208 } | |
| 209 } | |
| 210 | |
| 211 /* | |
| 212 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 213 * after executing a shell command that messes up the screen. | |
| 214 */ | |
| 215 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
216 redraw_later_clear(void) |
| 7 | 217 { |
| 218 redraw_all_later(CLEAR); | |
| 826 | 219 #ifdef FEAT_GUI |
| 220 if (gui.in_use) | |
| 221 /* Use a code that will reset gui.highlight_mask in | |
| 222 * gui_stop_highlight(). */ | |
| 223 screen_attr = HL_ALL + 1; | |
| 224 else | |
| 225 #endif | |
| 226 /* 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
|
227 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 228 } |
| 229 | |
| 230 /* | |
| 231 * Mark all windows to be redrawn later. | |
| 232 */ | |
| 233 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
234 redraw_all_later(int type) |
| 7 | 235 { |
| 236 win_T *wp; | |
| 237 | |
| 238 FOR_ALL_WINDOWS(wp) | |
| 239 redraw_win_later(wp, type); | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
240 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
241 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
242 must_redraw = type; |
| 7 | 243 } |
| 244 | |
| 245 /* | |
| 301 | 246 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 247 */ |
| 248 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
249 redraw_curbuf_later(int type) |
| 7 | 250 { |
| 251 redraw_buf_later(curbuf, type); | |
| 252 } | |
| 253 | |
| 254 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
255 redraw_buf_later(buf_T *buf, int type) |
| 7 | 256 { |
| 257 win_T *wp; | |
| 258 | |
| 259 FOR_ALL_WINDOWS(wp) | |
| 260 { | |
| 261 if (wp->w_buffer == buf) | |
| 262 redraw_win_later(wp, type); | |
| 263 } | |
| 264 } | |
| 265 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
266 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
267 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
268 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
269 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
270 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
276 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
277 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
278 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
279 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
280 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
281 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
282 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
283 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
285 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
286 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
287 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
288 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
289 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
290 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
291 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
292 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
293 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
294 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
295 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
297 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
298 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
299 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
300 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
301 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
302 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 303 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
304 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
305 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
306 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
309 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int rows; |
| 6959 | 312 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
315 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
316 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
319 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
|
320 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
321 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 redraw_later(type); |
| 6959 | 323 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
|
324 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
326 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 327 rows = screen_Rows - cmdline_row; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
328 screenline = LALLOC_MULT(schar_T, rows * cols); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
329 screenattr = LALLOC_MULT(sattr_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
330 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
331 ret = 2; |
|
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 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
334 screenlineUC = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
337 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
339 screenlineC[i] = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
342 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
346 screenline2 = LALLOC_MULT(schar_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
349 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 if (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 /* 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
|
354 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 { |
| 6959 | 356 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 358 (size_t)cols * sizeof(schar_T)); |
| 359 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 361 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
362 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 { |
| 6959 | 364 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 366 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
367 for (i = 0; i < p_mco; ++i) |
| 6959 | 368 mch_memmove(screenlineC[i] + r * cols, |
| 369 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 370 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
371 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
372 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 373 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 375 (size_t)cols * sizeof(schar_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 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
378 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 if (must_redraw == 0) |
|
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 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 /* 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
|
386 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 mch_memmove(current_ScreenLine, |
| 6959 | 389 screenline + r * cols, |
| 390 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(ScreenAttrs + off, |
| 6959 | 392 screenattr + r * cols, |
| 393 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
395 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
396 mch_memmove(ScreenLinesUC + off, |
| 6959 | 397 screenlineUC + r * cols, |
| 398 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
400 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 401 screenlineC[i] + r * cols, |
| 402 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
404 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
405 mch_memmove(ScreenLines2 + off, |
| 6959 | 406 screenline2 + r * cols, |
| 407 (size_t)cols * sizeof(schar_T)); | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
408 screen_line(cmdline_row + r, 0, cols, cols, 0); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
409 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
410 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
411 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 if (enc_utf8) |
|
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 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 vim_free(screenlineC[i]); |
|
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 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
425 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
426 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
427 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
430 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
431 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
432 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
435 * 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
|
436 * 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
|
437 * 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
|
438 * 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
|
439 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
441 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
442 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
|
443 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
444 ++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
|
445 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
446 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
|
447 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
448 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
|
449 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
450 // 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
|
451 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
|
452 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // 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
|
454 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 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
|
456 #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
|
457 && 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
|
458 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
459 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 update_screen(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 // 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
|
463 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 } |
|
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
|
466 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
467 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
|
468 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
469 // 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
|
470 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
471 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
472 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
473 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
474 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
475 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
|
476 // 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
|
477 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
479 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
480 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
481 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
|
482 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
483 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
484 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
485 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
486 /* |
| 7 | 487 * Changed something in the current window, at buffer line "lnum", that |
| 488 * requires that line and possibly other lines to be redrawn. | |
| 489 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 490 * Used to remove the "$" from a change command. | |
| 491 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 492 * may become invalid and the whole window will have to be redrawn. | |
| 493 */ | |
| 494 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
495 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
496 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
|
497 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
498 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
499 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
|
500 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
|
501 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
|
502 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
|
503 redraw_win_later(wp, VALID); |
| 7 | 504 } |
| 505 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
506 /* |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
507 * To be called when "updating_screen" was set before and now the postponed |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
508 * side effects may take place. |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
509 */ |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
510 void |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
511 after_updating_screen(int may_resize_shell UNUSED) |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
512 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 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
|
514 #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
|
515 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
|
516 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
|
517 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 #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
|
519 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
|
520 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
521 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
522 #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
|
523 // 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
|
524 // 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
|
525 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
|
526 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
527 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
528 |
| 7 | 529 /* |
|
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
|
530 * Update all windows that are editing the current buffer. |
| 7 | 531 */ |
| 532 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
533 update_curbuf(int type) |
| 7 | 534 { |
| 535 redraw_curbuf_later(type); | |
| 536 update_screen(type); | |
| 537 } | |
| 538 | |
| 539 /* | |
| 540 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 541 * 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
|
542 * 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
|
543 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
544 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
|
545 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
|
546 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
547 int type = type_arg; |
| 7 | 548 win_T *wp; |
| 549 static int did_intro = FALSE; | |
| 550 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 551 int did_one; | |
| 552 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
553 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
554 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
555 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
556 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
557 #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
|
558 int no_update = FALSE; |
| 7 | 559 |
| 2008 | 560 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 561 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
|
562 return FAIL; |
| 7 | 563 |
|
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
|
564 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
|
565 { |
|
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
|
566 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
|
567 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
|
568 } |
|
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 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
570 #ifdef FEAT_EVAL |
|
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
571 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
572 buf_T *buf; |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
573 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
574 // Before updating the screen, notify any listeners of changed text. |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 FOR_ALL_BUFFERS(buf) |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
576 invoke_listeners(buf); |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
578 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
579 |
| 7 | 580 if (must_redraw) |
| 581 { | |
| 582 if (type < must_redraw) /* use maximal type */ | |
| 583 type = must_redraw; | |
| 1331 | 584 |
| 585 /* must_redraw is reset here, so that when we run into some weird | |
| 586 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 587 * scrolling), or update_topline() in win_update() will cause a | |
| 588 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 589 must_redraw = 0; |
| 590 } | |
| 591 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
592 /* 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
|
593 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
|
594 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
595 && !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
|
596 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
597 ) |
| 7 | 598 type = NOT_VALID; |
| 599 | |
| 2008 | 600 /* Postpone the redrawing when it's not needed and when being called |
| 601 * recursively. */ | |
| 602 if (!redrawing() || updating_screen) | |
| 7 | 603 { |
| 604 redraw_later(type); /* remember type for next time */ | |
| 605 must_redraw = type; | |
| 606 if (type > INVERTED_ALL) | |
| 607 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
|
608 return FAIL; |
| 7 | 609 } |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
610 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
611 #ifdef FEAT_TEXT_PROP |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
612 // Update popup_mask if needed. This may set w_redraw_top and w_redraw_bot |
|
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
613 // in some windows. |
|
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
614 may_update_popup_mask(type); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
615 #endif |
| 7 | 616 |
| 617 updating_screen = TRUE; | |
| 618 #ifdef FEAT_SYN_HL | |
| 619 ++display_tick; /* let syntax code know we're in a next round of | |
| 620 * display updating */ | |
| 621 #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
|
622 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
|
623 ++no_win_do_lines_ins; |
| 7 | 624 |
| 625 /* | |
| 626 * if the screen was scrolled up when displaying a message, scroll it down | |
| 627 */ | |
| 628 if (msg_scrolled) | |
| 629 { | |
| 630 clear_cmdline = TRUE; | |
| 631 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 632 type = CLEAR; | |
| 633 else if (type != CLEAR) | |
| 634 { | |
| 635 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
|
636 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
|
637 == FAIL) |
| 7 | 638 type = CLEAR; |
| 639 FOR_ALL_WINDOWS(wp) | |
| 640 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
641 if (wp->w_winrow < msg_scrolled) |
| 7 | 642 { |
| 643 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 644 && wp->w_redr_type < REDRAW_TOP | |
| 645 && wp->w_lines_valid > 0 | |
| 646 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 647 { | |
| 648 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 649 wp->w_redr_type = REDRAW_TOP; | |
| 650 } | |
| 651 else | |
| 652 { | |
| 653 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
|
654 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
|
655 <= msg_scrolled) |
| 7 | 656 wp->w_redr_status = TRUE; |
| 657 } | |
| 658 } | |
| 659 } | |
|
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
|
660 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
|
661 redraw_cmdline = TRUE; |
| 673 | 662 redraw_tabline = TRUE; |
| 7 | 663 } |
| 664 msg_scrolled = 0; | |
| 665 need_wait_return = FALSE; | |
| 666 } | |
| 667 | |
| 668 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 669 compute_cmdrow(); | |
| 670 | |
| 671 /* Check for changed highlighting */ | |
| 672 if (need_highlight_changed) | |
| 673 highlight_changed(); | |
| 674 | |
| 675 if (type == CLEAR) /* first clear screen */ | |
| 676 { | |
| 677 screenclear(); /* will reset clear_cmdline */ | |
| 678 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
|
679 /* 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
|
680 must_redraw = 0; |
| 7 | 681 } |
| 682 | |
| 683 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 684 check_for_delay(FALSE); | |
| 685 | |
| 13 | 686 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
687 /* 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
|
688 * changes. */ |
| 13 | 689 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
690 && 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
|
691 ? number_width(curwin) : 0)) |
| 13 | 692 curwin->w_redr_type = NOT_VALID; |
| 693 #endif | |
| 694 | |
| 7 | 695 /* |
| 696 * Only start redrawing if there is really something to do. | |
| 697 */ | |
| 698 if (type == INVERTED) | |
| 699 update_curswant(); | |
| 700 if (curwin->w_redr_type < type | |
| 701 && !((type == VALID | |
| 702 && curwin->w_lines[0].wl_valid | |
| 703 #ifdef FEAT_DIFF | |
| 704 && curwin->w_topfill == curwin->w_old_topfill | |
| 705 && curwin->w_botfill == curwin->w_old_botfill | |
| 706 #endif | |
| 707 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 708 || (type == INVERTED | |
| 1043 | 709 && VIsual_active |
| 7 | 710 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 711 && curwin->w_old_visual_mode == VIsual_mode | |
| 712 && (curwin->w_valid & VALID_VIRTCOL) | |
| 713 && curwin->w_old_curswant == curwin->w_curswant) | |
| 714 )) | |
| 715 curwin->w_redr_type = type; | |
| 716 | |
| 849 | 717 /* Redraw the tab pages line if needed. */ |
| 718 if (redraw_tabline || type >= NOT_VALID) | |
| 719 draw_tabline(); | |
| 720 | |
| 7 | 721 #ifdef FEAT_SYN_HL |
| 722 /* | |
| 723 * Correct stored syntax highlighting info for changes in each displayed | |
| 724 * buffer. Each buffer must only be done once. | |
| 725 */ | |
| 726 FOR_ALL_WINDOWS(wp) | |
| 727 { | |
| 728 if (wp->w_buffer->b_mod_set) | |
| 729 { | |
| 730 win_T *wwp; | |
| 731 | |
| 732 /* Check if we already did this buffer. */ | |
| 733 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 734 if (wwp->w_buffer == wp->w_buffer) | |
| 735 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
736 if (wwp == wp && syntax_present(wp)) |
| 7 | 737 syn_stack_apply_changes(wp->w_buffer); |
| 738 } | |
| 739 } | |
| 740 #endif | |
| 741 | |
| 742 /* | |
| 743 * Go from top to bottom through the windows, redrawing the ones that need | |
| 744 * it. | |
| 745 */ | |
| 746 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 747 did_one = FALSE; | |
| 748 #endif | |
| 749 #ifdef FEAT_SEARCH_EXTRA | |
| 750 search_hl.rm.regprog = NULL; | |
| 751 #endif | |
| 752 FOR_ALL_WINDOWS(wp) | |
| 753 { | |
| 754 if (wp->w_redr_type != 0) | |
| 755 { | |
| 756 cursor_off(); | |
| 757 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 758 if (!did_one) | |
| 759 { | |
| 760 did_one = TRUE; | |
| 761 # ifdef FEAT_SEARCH_EXTRA | |
| 762 start_search_hl(); | |
| 763 # endif | |
| 764 # ifdef FEAT_CLIPBOARD | |
| 765 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 766 if (clip_star.available && clip_isautosel_star()) |
| 767 clip_update_selection(&clip_star); | |
| 768 if (clip_plus.available && clip_isautosel_plus()) | |
| 769 clip_update_selection(&clip_plus); | |
| 7 | 770 # endif |
| 771 #ifdef FEAT_GUI | |
| 772 /* Remove the cursor before starting to do anything, because | |
| 773 * scrolling may make it difficult to redraw the text under | |
| 774 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
775 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
|
776 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
777 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
778 gui_cursor_row = gui.cursor_row; |
| 7 | 779 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
780 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
781 } |
| 7 | 782 #endif |
| 783 } | |
| 784 #endif | |
| 785 win_update(wp); | |
| 786 } | |
| 787 | |
| 788 /* redraw status line after the window to minimize cursor movement */ | |
| 789 if (wp->w_redr_status) | |
| 790 { | |
| 791 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
792 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 793 } |
| 794 } | |
| 795 #if defined(FEAT_SEARCH_EXTRA) | |
| 796 end_search_hl(); | |
| 797 #endif | |
| 4107 | 798 #ifdef FEAT_INS_EXPAND |
| 799 /* 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
|
800 pum_may_redraw(); |
| 4107 | 801 #endif |
| 7 | 802 |
| 803 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 804 * 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
|
805 FOR_ALL_WINDOWS(wp) |
| 7 | 806 wp->w_buffer->b_mod_set = FALSE; |
| 807 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
808 after_updating_screen(TRUE); |
| 7 | 809 |
| 810 /* Clear or redraw the command line. Done last, because scrolling may | |
| 811 * mess up the command line. */ | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
812 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 813 showmode(); |
| 814 | |
|
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
|
815 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
|
816 --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
|
817 |
| 7 | 818 /* 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
|
819 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
820 maybe_intro_message(); |
| 7 | 821 did_intro = TRUE; |
| 822 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
823 #ifdef FEAT_TEXT_PROP |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
824 // Display popup windows on top of the windows. |
|
17055
f4de7ccdfd8c
patch 8.1.1527: when moving popup window over the cmdline it is not redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17041
diff
changeset
|
825 update_popups(win_update); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
826 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
827 |
| 7 | 828 #ifdef FEAT_GUI |
| 829 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 830 * done. */ | |
| 831 if (gui.in_use) | |
| 832 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
833 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
|
834 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
835 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
836 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
|
837 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
839 /* 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
|
840 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
842 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
843 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 844 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
845 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
846 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
847 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
848 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
849 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
850 out_flush(); |
| 7 | 851 gui_update_scrollbars(FALSE); |
| 852 } | |
| 853 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
854 return OK; |
| 7 | 855 } |
| 856 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
857 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_GUI) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
858 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
859 * 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
|
860 * 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
|
861 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
862 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
863 update_prepare(void) |
|
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 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 /* 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
|
869 * 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
|
870 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 #endif |
|
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 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
876 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
877 // Update popup_mask if needed. |
|
17196
983950357c40
patch 8.1.1597: cannot scroll a popup window with the mouse
Bram Moolenaar <Bram@vim.org>
parents:
17162
diff
changeset
|
878 may_update_popup_mask(must_redraw); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
879 #endif |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 * 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
|
884 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
888 if (redraw_cmdline || redraw_mode) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
895 after_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 /* 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
|
899 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
902 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
|
903 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
905 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
907 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
908 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
909 #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
|
910 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
911 * 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
|
912 * 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
|
913 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
915 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
|
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 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
|
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 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
|
920 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
|
921 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
|
922 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
|
923 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
|
924 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
|
925 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
|
926 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
927 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
928 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
|
929 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
930 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
|
931 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
|
932 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
934 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 * 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
|
936 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
938 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
|
939 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
940 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
|
941 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
942 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
|
943 /* 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
|
944 * 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
|
945 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
|
946 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
947 } |
| 7 | 948 #endif |
| 949 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
950 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 951 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
952 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 953 { |
| 954 win_T *wp; | |
| 955 int doit = FALSE; | |
| 956 | |
| 957 # ifdef FEAT_FOLDING | |
| 958 win_foldinfo.fi_level = 0; | |
| 959 # endif | |
| 960 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
961 // 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
|
962 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
|
963 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
964 // check if it resulted in the need to redraw a window |
| 7 | 965 FOR_ALL_WINDOWS(wp) |
| 966 if (wp->w_redr_type != 0) | |
| 967 doit = TRUE; | |
| 968 | |
| 3250 | 969 /* 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
|
970 * 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
|
971 */ |
| 3250 | 972 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
|
973 || 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
|
974 || msg_scrolled |
| 3250 | 975 #ifdef FEAT_GUI |
| 976 || gui.starting | |
| 977 #endif | |
| 978 || starting) | |
| 7 | 979 return; |
| 980 | |
| 981 /* update all windows that need updating */ | |
| 982 update_prepare(); | |
| 983 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
984 FOR_ALL_WINDOWS(wp) |
| 7 | 985 { |
| 986 if (wp->w_redr_type != 0) | |
| 987 win_update(wp); | |
| 988 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
|
989 win_redr_status(wp, FALSE); |
| 7 | 990 } |
| 991 | |
| 992 update_finish(); | |
| 993 } | |
| 994 #endif | |
| 995 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
996 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
997 * Get 'wincolor' attribute for window "wp". If not set and "wp" is a popup |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
998 * window then get the "Pmenu" highlight attribute. |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
999 */ |
|
17055
f4de7ccdfd8c
patch 8.1.1527: when moving popup window over the cmdline it is not redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17041
diff
changeset
|
1000 int |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1001 get_wcr_attr(win_T *wp) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1002 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1003 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1004 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1005 if (*wp->w_p_wcr != NUL) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 wcr_attr = syn_name2attr(wp->w_p_wcr); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1007 #ifdef FEAT_TEXT_PROP |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
1008 if (WIN_IS_POPUP(wp) && wcr_attr == 0) |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1009 wcr_attr = HL_ATTR(HLF_PNI); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1010 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1011 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1012 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1013 |
| 7 | 1014 #if defined(FEAT_GUI) || defined(PROTO) |
| 1015 /* | |
| 1016 * Update a single window, its status line and maybe the command line msg. | |
| 1017 * Used for the GUI scrollbar. | |
| 1018 */ | |
| 1019 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1020 updateWindow(win_T *wp) |
| 7 | 1021 { |
| 2008 | 1022 /* return if already busy updating */ |
| 1023 if (updating_screen) | |
| 1024 return; | |
| 1025 | |
| 7 | 1026 update_prepare(); |
| 1027 | |
| 1028 #ifdef FEAT_CLIPBOARD | |
| 1029 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1030 if (clip_star.available && clip_isautosel_star()) |
| 1031 clip_update_selection(&clip_star); | |
| 1032 if (clip_plus.available && clip_isautosel_plus()) | |
| 1033 clip_update_selection(&clip_plus); | |
| 7 | 1034 #endif |
| 670 | 1035 |
| 7 | 1036 win_update(wp); |
| 670 | 1037 |
| 1038 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1039 if (redraw_tabline) |
| 677 | 1040 draw_tabline(); |
| 670 | 1041 |
| 7 | 1042 if (wp->w_redr_status |
| 1043 # ifdef FEAT_CMDL_INFO | |
| 1044 || p_ru | |
| 1045 # endif | |
| 1046 # ifdef FEAT_STL_OPT | |
| 40 | 1047 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1048 # endif |
| 1049 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1050 win_redr_status(wp, FALSE); |
| 7 | 1051 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1052 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1053 // Display popup windows on top of everything. |
|
17055
f4de7ccdfd8c
patch 8.1.1527: when moving popup window over the cmdline it is not redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17041
diff
changeset
|
1054 update_popups(win_update); |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1055 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1056 |
| 7 | 1057 update_finish(); |
| 1058 } | |
| 1059 #endif | |
| 1060 | |
| 1061 /* | |
| 1062 * Update a single window. | |
| 1063 * | |
| 1064 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1065 * screen or scrolling lines). | |
| 1066 * | |
| 1067 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1068 * implies the one below it. | |
| 1069 * NOT_VALID redraw the whole window | |
| 743 | 1070 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1071 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1072 * INVERTED redraw the changed part of the Visual area | |
| 1073 * INVERTED_ALL redraw the whole Visual area | |
| 1074 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1075 * 2. update lines at the top when scrolled down | |
| 1076 * 3. redraw changed text: | |
| 301 | 1077 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1078 * b_mod_top and b_mod_bot. |
| 1079 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1080 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1081 * - continue redrawing when syntax status is invalid. | |
| 1082 * 4. if scrolled up, update lines at the bottom. | |
| 1083 * This results in three areas that may need updating: | |
| 1084 * top: from first row to top_end (when scrolled down) | |
| 1085 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1086 * bot: from bot_start to last row (when scrolled up) | |
| 1087 */ | |
| 1088 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1089 win_update(win_T *wp) |
| 7 | 1090 { |
| 1091 buf_T *buf = wp->w_buffer; | |
| 1092 int type; | |
| 1093 int top_end = 0; /* Below last row of the top area that needs | |
| 1094 updating. 0 when no top area updating. */ | |
| 1095 int mid_start = 999;/* first row of the mid area that needs | |
| 1096 updating. 999 when no mid area updating. */ | |
| 1097 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1098 updating. 0 when no mid area updating. */ | |
| 1099 int bot_start = 999;/* first row of the bot area that needs | |
| 1100 updating. 999 when no bot area updating */ | |
| 1101 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1102 w_topline got smaller a bit */ | |
| 1103 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1104 matchitem_T *cur; /* points to the match list */ |
| 7 | 1105 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1106 #endif | |
| 1107 | |
| 1108 int row; /* current window row to display */ | |
| 1109 linenr_T lnum; /* current buffer lnum to display */ | |
| 1110 int idx; /* current index in w_lines[] */ | |
| 1111 int srow; /* starting row of the current line */ | |
| 1112 | |
| 1113 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1114 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1115 int i; | |
| 1116 long j; | |
| 1117 static int recursive = FALSE; /* being called recursively */ | |
| 1118 int old_botline = wp->w_botline; | |
| 1119 #ifdef FEAT_FOLDING | |
| 1120 long fold_count; | |
| 1121 #endif | |
| 1122 #ifdef FEAT_SYN_HL | |
| 1123 /* remember what happened to the previous line, to know if | |
| 1124 * check_visual_highlight() can be used */ | |
| 1125 #define DID_NONE 1 /* didn't update a line */ | |
| 1126 #define DID_LINE 2 /* updated a normal line */ | |
| 1127 #define DID_FOLD 3 /* updated a folded line */ | |
| 1128 int did_update = DID_NONE; | |
| 1129 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1130 #endif | |
| 1131 linenr_T mod_top = 0; | |
| 1132 linenr_T mod_bot = 0; | |
| 1133 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1134 int save_got_int; | |
| 1135 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1136 #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
|
1137 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
|
1138 #endif |
| 7 | 1139 |
| 1140 type = wp->w_redr_type; | |
| 1141 | |
| 1142 if (type == NOT_VALID) | |
| 1143 { | |
| 1144 wp->w_redr_status = TRUE; | |
| 1145 wp->w_lines_valid = 0; | |
| 1146 } | |
| 1147 | |
| 1148 /* 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
|
1149 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1150 { |
| 1151 wp->w_redr_type = 0; | |
| 1152 return; | |
| 1153 } | |
| 1154 | |
| 1155 /* Window is zero-width: Only need to draw the separator. */ | |
| 1156 if (wp->w_width == 0) | |
| 1157 { | |
| 1158 /* draw the vertical separator right of this window */ | |
| 1159 draw_vsep_win(wp, 0); | |
| 1160 wp->w_redr_type = 0; | |
| 1161 return; | |
| 1162 } | |
| 1163 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1164 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1165 // 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
|
1166 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
|
1167 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1168 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
|
1169 # 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
|
1170 /* 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
|
1171 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
|
1172 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
|
1173 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1174 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
|
1175 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1176 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1177 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1178 |
| 7 | 1179 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1180 init_search_hl(wp); |
| 7 | 1181 #endif |
| 1182 | |
| 13 | 1183 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1184 /* 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
|
1185 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1186 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1187 if (wp->w_nrwidth != i) |
| 13 | 1188 { |
| 1189 type = NOT_VALID; | |
| 677 | 1190 wp->w_nrwidth = i; |
| 13 | 1191 } |
| 1192 else | |
| 1193 #endif | |
| 1194 | |
| 7 | 1195 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1196 { | |
| 1197 /* | |
| 1198 * When there are both inserted/deleted lines and specific lines to be | |
| 1199 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1200 * everything (only happens when redrawing is off for while). | |
| 1201 */ | |
| 1202 type = NOT_VALID; | |
| 1203 } | |
| 1204 else | |
| 1205 { | |
| 1206 /* | |
| 1207 * Set mod_top to the first line that needs displaying because of | |
| 1208 * changes. Set mod_bot to the first line after the changes. | |
| 1209 */ | |
| 1210 mod_top = wp->w_redraw_top; | |
| 1211 if (wp->w_redraw_bot != 0) | |
| 1212 mod_bot = wp->w_redraw_bot + 1; | |
| 1213 else | |
| 1214 mod_bot = 0; | |
| 1215 if (buf->b_mod_set) | |
| 1216 { | |
| 1217 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1218 { | |
| 1219 mod_top = buf->b_mod_top; | |
| 1220 #ifdef FEAT_SYN_HL | |
| 1221 /* Need to redraw lines above the change that may be included | |
| 1222 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1223 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1224 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1225 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1226 if (mod_top < 1) |
| 1227 mod_top = 1; | |
| 1228 } | |
| 1229 #endif | |
| 1230 } | |
| 1231 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1232 mod_bot = buf->b_mod_bot; | |
| 1233 | |
| 1234 #ifdef FEAT_SEARCH_EXTRA | |
| 1235 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1236 * change in one line may make the Search highlighting in a | |
| 1237 * previous line invalid. Simple solution: redraw all visible | |
| 1238 * lines above the change. | |
| 1326 | 1239 * Same for a match pattern. |
| 7 | 1240 */ |
| 699 | 1241 if (search_hl.rm.regprog != NULL |
| 1242 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1243 top_to_mod = TRUE; |
| 699 | 1244 else |
| 1326 | 1245 { |
| 1246 cur = wp->w_match_head; | |
| 1247 while (cur != NULL) | |
| 1248 { | |
| 1249 if (cur->match.regprog != NULL | |
| 1250 && re_multiline(cur->match.regprog)) | |
| 699 | 1251 { |
| 1252 top_to_mod = TRUE; | |
| 1253 break; | |
| 1254 } | |
| 1326 | 1255 cur = cur->next; |
| 1256 } | |
| 1257 } | |
| 7 | 1258 #endif |
| 1259 } | |
| 1260 #ifdef FEAT_FOLDING | |
| 1261 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1262 { | |
| 1263 linenr_T lnumt, lnumb; | |
| 1264 | |
| 1265 /* | |
| 1266 * A change in a line can cause lines above it to become folded or | |
| 1267 * unfolded. Find the top most buffer line that may be affected. | |
| 1268 * If the line was previously folded and displayed, get the first | |
| 1269 * line of that fold. If the line is folded now, get the first | |
| 1270 * folded line. Use the minimum of these two. | |
| 1271 */ | |
| 1272 | |
| 1273 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1274 * the line below it. If there is no valid entry, use w_topline. | |
| 1275 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1276 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1277 lnumt = wp->w_topline; | |
| 1278 lnumb = MAXLNUM; | |
| 1279 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1280 if (wp->w_lines[i].wl_valid) | |
| 1281 { | |
| 1282 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1283 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1284 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1285 { | |
| 1286 lnumb = wp->w_lines[i].wl_lnum; | |
| 1287 /* When there is a fold column it might need updating | |
| 1288 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1289 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1290 ++lnumb; |
| 1291 } | |
| 1292 } | |
| 1293 | |
| 1294 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1295 if (mod_top > lnumt) | |
| 1296 mod_top = lnumt; | |
| 1297 | |
| 1298 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1299 --mod_bot; | |
| 1300 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1301 ++mod_bot; | |
| 1302 if (mod_bot < lnumb) | |
| 1303 mod_bot = lnumb; | |
| 1304 } | |
| 1305 #endif | |
| 1306 | |
| 1307 /* When a change starts above w_topline and the end is below | |
| 1308 * w_topline, start redrawing at w_topline. | |
| 36 | 1309 * If the end of the change is above w_topline: do like no change was |
| 1310 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1311 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1312 { | |
| 1313 if (mod_bot > wp->w_topline) | |
| 1314 mod_top = wp->w_topline; | |
| 1315 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1316 else if (syntax_present(wp)) |
| 7 | 1317 top_end = 1; |
| 1318 #endif | |
| 1319 } | |
| 36 | 1320 |
| 1321 /* When line numbers are displayed need to redraw all lines below | |
| 1322 * inserted/deleted lines. */ | |
| 1323 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1324 mod_bot = MAXLNUM; | |
| 7 | 1325 } |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1326 wp->w_redraw_top = 0; // reset for next time |
|
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
1327 wp->w_redraw_bot = 0; |
| 7 | 1328 |
| 1329 /* | |
| 1330 * When only displaying the lines at the top, set top_end. Used when | |
| 1331 * window has scrolled down for msg_scrolled. | |
| 1332 */ | |
| 1333 if (type == REDRAW_TOP) | |
| 1334 { | |
| 1335 j = 0; | |
| 1336 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1337 { | |
| 1338 j += wp->w_lines[i].wl_size; | |
| 1339 if (j >= wp->w_upd_rows) | |
| 1340 { | |
| 1341 top_end = j; | |
| 1342 break; | |
| 1343 } | |
| 1344 } | |
| 1345 if (top_end == 0) | |
| 1346 /* not found (cannot happen?): redraw everything */ | |
| 1347 type = NOT_VALID; | |
| 1348 else | |
| 1349 /* top area defined, the rest is VALID */ | |
| 1350 type = VALID; | |
| 1351 } | |
| 1352 | |
| 1378 | 1353 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1354 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1355 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1356 * called. */ | |
| 1357 if (screen_cleared) | |
| 1358 screen_cleared = MAYBE; | |
| 1359 | |
| 7 | 1360 /* |
| 1361 * If there are no changes on the screen that require a complete redraw, | |
| 1362 * handle three cases: | |
| 1363 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1364 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1365 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1366 * w_lines[] that needs updating. | |
| 1367 */ | |
| 743 | 1368 if ((type == VALID || type == SOME_VALID |
| 1369 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1370 #ifdef FEAT_DIFF |
| 1371 && !wp->w_botfill && !wp->w_old_botfill | |
| 1372 #endif | |
| 1373 ) | |
| 1374 { | |
| 1375 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1376 { | |
| 1377 /* | |
| 1378 * w_topline is the first changed line, the scrolling will be done | |
| 1379 * further down. | |
| 1380 */ | |
| 1381 } | |
| 1382 else if (wp->w_lines[0].wl_valid | |
| 1383 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1384 #ifdef FEAT_DIFF | |
| 1385 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1386 && wp->w_topfill > wp->w_old_topfill) | |
| 1387 #endif | |
| 1388 )) | |
| 1389 { | |
| 1390 /* | |
| 1391 * New topline is above old topline: May scroll down. | |
| 1392 */ | |
| 1393 #ifdef FEAT_FOLDING | |
| 1394 if (hasAnyFolding(wp)) | |
| 1395 { | |
| 1396 linenr_T ln; | |
| 1397 | |
| 1398 /* count the number of lines we are off, counting a sequence | |
| 1399 * of folded lines as one */ | |
| 1400 j = 0; | |
| 1401 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1402 { | |
| 1403 ++j; | |
| 1404 if (j >= wp->w_height - 2) | |
| 1405 break; | |
| 1406 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1407 } | |
| 1408 } | |
| 1409 else | |
| 1410 #endif | |
| 1411 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1412 if (j < wp->w_height - 2) /* not too far off */ | |
| 1413 { | |
| 1414 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1415 #ifdef FEAT_DIFF | |
| 1416 /* insert extra lines for previously invisible filler lines */ | |
| 1417 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1418 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1419 - wp->w_old_topfill; | |
| 1420 #endif | |
| 1421 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1422 { | |
| 1423 /* | |
| 1424 * Try to insert the correct number of lines. | |
| 1425 * If not the last window, delete the lines at the bottom. | |
| 1426 * win_ins_lines may fail when the terminal can't do it. | |
| 1427 */ | |
| 1428 if (i > 0) | |
| 1429 check_for_delay(FALSE); | |
| 1430 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1431 { | |
| 1432 if (wp->w_lines_valid != 0) | |
| 1433 { | |
| 1434 /* Need to update rows that are new, stop at the | |
| 1435 * first one that scrolled down. */ | |
| 1436 top_end = i; | |
| 1437 scrolled_down = TRUE; | |
| 1438 | |
| 1439 /* Move the entries that were scrolled, disable | |
| 1440 * the entries for the lines to be redrawn. */ | |
| 1441 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1442 wp->w_lines_valid = wp->w_height; | |
| 1443 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1444 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1445 while (idx >= 0) | |
| 1446 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1447 } | |
| 1448 } | |
| 1449 else | |
| 1450 mid_start = 0; /* redraw all lines */ | |
| 1451 } | |
| 1452 else | |
| 1453 mid_start = 0; /* redraw all lines */ | |
| 1454 } | |
| 1455 else | |
| 1456 mid_start = 0; /* redraw all lines */ | |
| 1457 } | |
| 1458 else | |
| 1459 { | |
| 1460 /* | |
| 1461 * New topline is at or below old topline: May scroll up. | |
| 1462 * When topline didn't change, find first entry in w_lines[] that | |
| 1463 * needs updating. | |
| 1464 */ | |
| 1465 | |
| 1466 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1467 j = -1; | |
| 1468 row = 0; | |
| 1469 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1470 { | |
| 1471 if (wp->w_lines[i].wl_valid | |
| 1472 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1473 { | |
| 1474 j = i; | |
| 1475 break; | |
| 1476 } | |
| 1477 row += wp->w_lines[i].wl_size; | |
| 1478 } | |
| 1479 if (j == -1) | |
| 1480 { | |
| 1481 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1482 * lines */ | |
| 1483 mid_start = 0; | |
| 1484 } | |
| 1485 else | |
| 1486 { | |
| 1487 /* | |
| 1488 * Try to delete the correct number of lines. | |
| 1489 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1490 */ | |
| 1491 #ifdef FEAT_DIFF | |
| 1492 /* If the topline didn't change, delete old filler lines, | |
| 1493 * otherwise delete filler lines of the new topline... */ | |
| 1494 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1495 row += wp->w_old_topfill; | |
| 1496 else | |
| 1497 row += diff_check_fill(wp, wp->w_topline); | |
| 1498 /* ... but don't delete new filler lines. */ | |
| 1499 row -= wp->w_topfill; | |
| 1500 #endif | |
| 1501 if (row > 0) | |
| 1502 { | |
| 1503 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
|
1504 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
|
1505 == OK) |
| 7 | 1506 bot_start = wp->w_height - row; |
| 1507 else | |
| 1508 mid_start = 0; /* redraw all lines */ | |
| 1509 } | |
| 1510 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1511 { | |
| 1512 /* | |
| 1513 * Skip the lines (below the deleted lines) that are still | |
| 1514 * valid and don't need redrawing. Copy their info | |
| 1515 * upwards, to compensate for the deleted lines. Set | |
| 1516 * bot_start to the first row that needs redrawing. | |
| 1517 */ | |
| 1518 bot_start = 0; | |
| 1519 idx = 0; | |
| 1520 for (;;) | |
| 1521 { | |
| 1522 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1523 /* stop at line that didn't fit, unless it is still | |
| 1524 * valid (no lines deleted) */ | |
| 1525 if (row > 0 && bot_start + row | |
| 1526 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1527 { | |
| 1528 wp->w_lines_valid = idx + 1; | |
| 1529 break; | |
| 1530 } | |
| 1531 bot_start += wp->w_lines[idx++].wl_size; | |
| 1532 | |
| 1533 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1534 if (++j >= wp->w_lines_valid) | |
| 1535 { | |
| 1536 wp->w_lines_valid = idx; | |
| 1537 break; | |
| 1538 } | |
| 1539 } | |
| 1540 #ifdef FEAT_DIFF | |
| 1541 /* Correct the first entry for filler lines at the top | |
| 1542 * when it won't get updated below. */ | |
| 1543 if (wp->w_p_diff && bot_start > 0) | |
| 1544 wp->w_lines[0].wl_size = | |
| 1545 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1546 + wp->w_topfill; | |
| 1547 #endif | |
| 1548 } | |
| 1549 } | |
| 1550 } | |
| 1551 | |
| 1552 /* When starting redraw in the first line, redraw all lines. When | |
| 1553 * there is only one window it's probably faster to clear the screen | |
| 1554 * first. */ | |
| 1555 if (mid_start == 0) | |
| 1556 { | |
| 1557 mid_end = wp->w_height; | |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
1558 if (ONE_WINDOW && !WIN_IS_POPUP(wp)) |
| 981 | 1559 { |
| 1331 | 1560 /* Clear the screen when it was not done by win_del_lines() or |
| 1561 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1562 * then. */ | |
| 1563 if (screen_cleared != TRUE) | |
| 1564 screenclear(); | |
| 981 | 1565 /* The screen was cleared, redraw the tab pages line. */ |
| 1566 if (redraw_tabline) | |
| 1567 draw_tabline(); | |
| 1568 } | |
| 7 | 1569 } |
| 1331 | 1570 |
| 1571 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1572 * cleared (only happens for the first window) or when screenclear() | |
| 1573 * was called directly above, "must_redraw" will have been set to | |
| 1574 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1575 if (screen_cleared == TRUE) | |
| 1576 must_redraw = 0; | |
| 7 | 1577 } |
| 1578 else | |
| 1579 { | |
| 1580 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1581 mid_start = 0; | |
| 1582 mid_end = wp->w_height; | |
| 1583 } | |
| 1584 | |
| 743 | 1585 if (type == SOME_VALID) |
| 1586 { | |
| 1587 /* SOME_VALID: redraw all lines. */ | |
| 1588 mid_start = 0; | |
| 1589 mid_end = wp->w_height; | |
| 1590 type = NOT_VALID; | |
| 1591 } | |
| 1592 | |
| 7 | 1593 /* check if we are updating or removing the inverted part */ |
| 1594 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1595 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1596 { | |
| 1597 linenr_T from, to; | |
| 1598 | |
| 1599 if (VIsual_active) | |
| 1600 { | |
| 1601 if (VIsual_active | |
| 1602 && (VIsual_mode != wp->w_old_visual_mode | |
| 1603 || type == INVERTED_ALL)) | |
| 1604 { | |
| 1605 /* | |
| 1606 * If the type of Visual selection changed, redraw the whole | |
| 1607 * selection. Also when the ownership of the X selection is | |
| 1608 * gained or lost. | |
| 1609 */ | |
| 1610 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1611 { | |
| 1612 from = curwin->w_cursor.lnum; | |
| 1613 to = VIsual.lnum; | |
| 1614 } | |
| 1615 else | |
| 1616 { | |
| 1617 from = VIsual.lnum; | |
| 1618 to = curwin->w_cursor.lnum; | |
| 1619 } | |
| 1620 /* redraw more when the cursor moved as well */ | |
| 1621 if (wp->w_old_cursor_lnum < from) | |
| 1622 from = wp->w_old_cursor_lnum; | |
| 1623 if (wp->w_old_cursor_lnum > to) | |
| 1624 to = wp->w_old_cursor_lnum; | |
| 1625 if (wp->w_old_visual_lnum < from) | |
| 1626 from = wp->w_old_visual_lnum; | |
| 1627 if (wp->w_old_visual_lnum > to) | |
| 1628 to = wp->w_old_visual_lnum; | |
| 1629 } | |
| 1630 else | |
| 1631 { | |
| 1632 /* | |
| 1633 * Find the line numbers that need to be updated: The lines | |
| 1634 * between the old cursor position and the current cursor | |
| 1635 * position. Also check if the Visual position changed. | |
| 1636 */ | |
| 1637 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1638 { | |
| 1639 from = curwin->w_cursor.lnum; | |
| 1640 to = wp->w_old_cursor_lnum; | |
| 1641 } | |
| 1642 else | |
| 1643 { | |
| 1644 from = wp->w_old_cursor_lnum; | |
| 1645 to = curwin->w_cursor.lnum; | |
| 1646 if (from == 0) /* Visual mode just started */ | |
| 1647 from = to; | |
| 1648 } | |
| 1649 | |
| 422 | 1650 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1651 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1652 { |
| 1653 if (wp->w_old_visual_lnum < from | |
| 1654 && wp->w_old_visual_lnum != 0) | |
| 1655 from = wp->w_old_visual_lnum; | |
| 1656 if (wp->w_old_visual_lnum > to) | |
| 1657 to = wp->w_old_visual_lnum; | |
| 1658 if (VIsual.lnum < from) | |
| 1659 from = VIsual.lnum; | |
| 1660 if (VIsual.lnum > to) | |
| 1661 to = VIsual.lnum; | |
| 1662 } | |
| 1663 } | |
| 1664 | |
| 1665 /* | |
| 1666 * If in block mode and changed column or curwin->w_curswant: | |
| 1667 * update all lines. | |
| 1668 * First compute the actual start and end column. | |
| 1669 */ | |
| 1670 if (VIsual_mode == Ctrl_V) | |
| 1671 { | |
| 6266 | 1672 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1673 #if defined(FEAT_LINEBREAK) |
| 6266 | 1674 int save_ve_flags = ve_flags; |
| 1675 | |
| 1676 if (curwin->w_p_lbr) | |
| 1677 ve_flags = VE_ALL; | |
| 1678 #endif | |
| 7 | 1679 getvcols(wp, &VIsual, &curwin->w_cursor, &fromc, &toc); |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1680 #if defined(FEAT_LINEBREAK) |
| 6266 | 1681 ve_flags = save_ve_flags; |
| 1682 #endif | |
| 7 | 1683 ++toc; |
| 1684 if (curwin->w_curswant == MAXCOL) | |
| 1685 toc = MAXCOL; | |
| 1686 | |
| 1687 if (fromc != wp->w_old_cursor_fcol | |
| 1688 || toc != wp->w_old_cursor_lcol) | |
| 1689 { | |
| 1690 if (from > VIsual.lnum) | |
| 1691 from = VIsual.lnum; | |
| 1692 if (to < VIsual.lnum) | |
| 1693 to = VIsual.lnum; | |
| 1694 } | |
| 1695 wp->w_old_cursor_fcol = fromc; | |
| 1696 wp->w_old_cursor_lcol = toc; | |
| 1697 } | |
| 1698 } | |
| 1699 else | |
| 1700 { | |
| 1701 /* Use the line numbers of the old Visual area. */ | |
| 1702 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1703 { | |
| 1704 from = wp->w_old_cursor_lnum; | |
| 1705 to = wp->w_old_visual_lnum; | |
| 1706 } | |
| 1707 else | |
| 1708 { | |
| 1709 from = wp->w_old_visual_lnum; | |
| 1710 to = wp->w_old_cursor_lnum; | |
| 1711 } | |
| 1712 } | |
| 1713 | |
| 1714 /* | |
| 1715 * There is no need to update lines above the top of the window. | |
| 1716 */ | |
| 1717 if (from < wp->w_topline) | |
| 1718 from = wp->w_topline; | |
| 1719 | |
| 1720 /* | |
| 1721 * If we know the value of w_botline, use it to restrict the update to | |
| 1722 * the lines that are visible in the window. | |
| 1723 */ | |
| 1724 if (wp->w_valid & VALID_BOTLINE) | |
| 1725 { | |
| 1726 if (from >= wp->w_botline) | |
| 1727 from = wp->w_botline - 1; | |
| 1728 if (to >= wp->w_botline) | |
| 1729 to = wp->w_botline - 1; | |
| 1730 } | |
| 1731 | |
| 1732 /* | |
| 1733 * Find the minimal part to be updated. | |
| 1734 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1735 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1736 * top_end; need to redraw from top_end to the "to" line. | |
| 1737 * A middle mouse click with a Visual selection may change the text | |
| 1738 * above the Visual area and reset wl_valid, do count these for | |
| 1739 * mid_end (in srow). | |
| 1740 */ | |
| 1741 if (mid_start > 0) | |
| 1742 { | |
| 1743 lnum = wp->w_topline; | |
| 1744 idx = 0; | |
| 1745 srow = 0; | |
| 1746 if (scrolled_down) | |
| 1747 mid_start = top_end; | |
| 1748 else | |
| 1749 mid_start = 0; | |
| 1750 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1751 { | |
| 1752 if (wp->w_lines[idx].wl_valid) | |
| 1753 mid_start += wp->w_lines[idx].wl_size; | |
| 1754 else if (!scrolled_down) | |
| 1755 srow += wp->w_lines[idx].wl_size; | |
| 1756 ++idx; | |
| 1757 # ifdef FEAT_FOLDING | |
| 1758 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1759 lnum = wp->w_lines[idx].wl_lnum; | |
| 1760 else | |
| 1761 # endif | |
| 1762 ++lnum; | |
| 1763 } | |
| 1764 srow += mid_start; | |
| 1765 mid_end = wp->w_height; | |
| 1766 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1767 { | |
| 1768 if (wp->w_lines[idx].wl_valid | |
| 1769 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1770 { | |
| 1771 /* Only update until first row of this line */ | |
| 1772 mid_end = srow; | |
| 1773 break; | |
| 1774 } | |
| 1775 srow += wp->w_lines[idx].wl_size; | |
| 1776 } | |
| 1777 } | |
| 1778 } | |
| 1779 | |
| 1780 if (VIsual_active && buf == curwin->w_buffer) | |
| 1781 { | |
| 1782 wp->w_old_visual_mode = VIsual_mode; | |
| 1783 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1784 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1785 wp->w_old_visual_col = VIsual.col; |
| 7 | 1786 wp->w_old_curswant = curwin->w_curswant; |
| 1787 } | |
| 1788 else | |
| 1789 { | |
| 1790 wp->w_old_visual_mode = 0; | |
| 1791 wp->w_old_cursor_lnum = 0; | |
| 1792 wp->w_old_visual_lnum = 0; | |
| 422 | 1793 wp->w_old_visual_col = 0; |
| 7 | 1794 } |
| 1795 | |
| 1796 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1797 /* reset got_int, otherwise regexp won't work */ | |
| 1798 save_got_int = got_int; | |
| 1799 got_int = 0; | |
| 1800 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1801 #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
|
1802 /* 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
|
1803 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
|
1804 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
|
1805 #endif |
| 7 | 1806 #ifdef FEAT_FOLDING |
| 1807 win_foldinfo.fi_level = 0; | |
| 1808 #endif | |
| 1809 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1810 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1811 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1812 * 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
|
1813 * 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
|
1814 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1815 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
|
1816 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
|
1817 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1818 |
| 7 | 1819 /* |
| 1820 * Update all the window rows. | |
| 1821 */ | |
| 1822 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1823 row = 0; | |
| 1824 srow = 0; | |
| 1825 lnum = wp->w_topline; /* first line shown in window */ | |
| 1826 for (;;) | |
| 1827 { | |
| 1828 /* stop updating when reached the end of the window (check for _past_ | |
| 1829 * the end of the window is at the end of the loop) */ | |
| 1830 if (row == wp->w_height) | |
| 1831 { | |
| 1832 didline = TRUE; | |
| 1833 break; | |
| 1834 } | |
| 1835 | |
| 1836 /* stop updating when hit the end of the file */ | |
| 1837 if (lnum > buf->b_ml.ml_line_count) | |
| 1838 { | |
| 1839 eof = TRUE; | |
| 1840 break; | |
| 1841 } | |
| 1842 | |
| 1843 /* Remember the starting row of the line that is going to be dealt | |
| 1844 * with. It is used further down when the line doesn't fit. */ | |
| 1845 srow = row; | |
| 1846 | |
| 1847 /* | |
| 1848 * Update a line when it is in an area that needs updating, when it | |
| 1849 * 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
|
1850 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1851 * win_del_lines(), check if the current line includes it. |
| 1852 * When syntax folding is being used, the saved syntax states will | |
| 1853 * already have been updated, we can't see where the syntax state is | |
| 1854 * the same again, just update until the end of the window. | |
| 1855 */ | |
| 1856 if (row < top_end | |
| 1857 || (row >= mid_start && row < mid_end) | |
| 1858 #ifdef FEAT_SEARCH_EXTRA | |
| 1859 || top_to_mod | |
| 1860 #endif | |
| 1861 || idx >= wp->w_lines_valid | |
| 1862 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1863 || (mod_top != 0 | |
| 1864 && (lnum == mod_top | |
| 1865 || (lnum >= mod_top | |
| 1866 && (lnum < mod_bot | |
| 1867 #ifdef FEAT_SYN_HL | |
| 1868 || did_update == DID_FOLD | |
| 1869 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1870 && syntax_present(wp) |
| 7 | 1871 && ( |
| 1872 # ifdef FEAT_FOLDING | |
| 1873 (foldmethodIsSyntax(wp) | |
| 1874 && hasAnyFolding(wp)) || | |
| 1875 # endif | |
| 1876 syntax_check_changed(lnum))) | |
| 1877 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1878 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1879 /* match in fixed position might need redraw |
| 1880 * if lines were inserted or deleted */ | |
| 1881 || (wp->w_match_head != NULL | |
| 1882 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1883 #endif |
| 7 | 1884 ))))) |
| 1885 { | |
| 1886 #ifdef FEAT_SEARCH_EXTRA | |
| 1887 if (lnum == mod_top) | |
| 1888 top_to_mod = FALSE; | |
| 1889 #endif | |
| 1890 | |
| 1891 /* | |
| 1892 * When at start of changed lines: May scroll following lines | |
| 1893 * up or down to minimize redrawing. | |
| 1894 * Don't do this when the change continues until the end. | |
| 3318 | 1895 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1896 */ |
| 1897 if (lnum == mod_top | |
| 1898 && mod_bot != MAXLNUM | |
| 3318 | 1899 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1900 { |
| 1901 int old_rows = 0; | |
| 1902 int new_rows = 0; | |
| 1903 int xtra_rows; | |
| 1904 linenr_T l; | |
| 1905 | |
| 1906 /* Count the old number of window rows, using w_lines[], which | |
| 1907 * should still contain the sizes for the lines as they are | |
| 1908 * currently displayed. */ | |
| 1909 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1910 { | |
| 1911 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1912 * lines are part of the changed area. */ | |
| 1913 if (wp->w_lines[i].wl_valid | |
| 1914 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1915 break; | |
| 1916 old_rows += wp->w_lines[i].wl_size; | |
| 1917 #ifdef FEAT_FOLDING | |
| 1918 if (wp->w_lines[i].wl_valid | |
| 1919 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1920 { | |
| 1921 /* Must have found the last valid entry above mod_bot. | |
| 1922 * Add following invalid entries. */ | |
| 1923 ++i; | |
| 1924 while (i < wp->w_lines_valid | |
| 1925 && !wp->w_lines[i].wl_valid) | |
| 1926 old_rows += wp->w_lines[i++].wl_size; | |
| 1927 break; | |
| 1928 } | |
| 1929 #endif | |
| 1930 } | |
| 1931 | |
| 1932 if (i >= wp->w_lines_valid) | |
| 1933 { | |
| 1934 /* We can't find a valid line below the changed lines, | |
| 1935 * need to redraw until the end of the window. | |
| 1936 * Inserting/deleting lines has no use. */ | |
| 1937 bot_start = 0; | |
| 1938 } | |
| 1939 else | |
| 1940 { | |
| 1941 /* Able to count old number of rows: Count new window | |
| 1942 * rows, and may insert/delete lines */ | |
| 1943 j = idx; | |
| 1944 for (l = lnum; l < mod_bot; ++l) | |
| 1945 { | |
| 1946 #ifdef FEAT_FOLDING | |
| 1947 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1948 ++new_rows; | |
| 1949 else | |
| 1950 #endif | |
| 1951 #ifdef FEAT_DIFF | |
| 1952 if (l == wp->w_topline) | |
| 1953 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1954 + wp->w_topfill; | |
| 1955 else | |
| 1956 #endif | |
| 1957 new_rows += plines_win(wp, l, TRUE); | |
| 1958 ++j; | |
| 1959 if (new_rows > wp->w_height - row - 2) | |
| 1960 { | |
| 1961 /* it's getting too much, must redraw the rest */ | |
| 1962 new_rows = 9999; | |
| 1963 break; | |
| 1964 } | |
| 1965 } | |
| 1966 xtra_rows = new_rows - old_rows; | |
| 1967 if (xtra_rows < 0) | |
| 1968 { | |
| 1969 /* May scroll text up. If there is not enough | |
| 1970 * remaining text or scrolling fails, must redraw the | |
| 1971 * rest. If scrolling works, must redraw the text | |
| 1972 * below the scrolled text. */ | |
| 1973 if (row - xtra_rows >= wp->w_height - 2) | |
| 1974 mod_bot = MAXLNUM; | |
| 1975 else | |
| 1976 { | |
| 1977 check_for_delay(FALSE); | |
| 1978 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
|
1979 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1980 mod_bot = MAXLNUM; |
| 1981 else | |
| 1982 bot_start = wp->w_height + xtra_rows; | |
| 1983 } | |
| 1984 } | |
| 1985 else if (xtra_rows > 0) | |
| 1986 { | |
| 1987 /* May scroll text down. If there is not enough | |
| 1988 * remaining text of scrolling fails, must redraw the | |
| 1989 * rest. */ | |
| 1990 if (row + xtra_rows >= wp->w_height - 2) | |
| 1991 mod_bot = MAXLNUM; | |
| 1992 else | |
| 1993 { | |
| 1994 check_for_delay(FALSE); | |
| 1995 if (win_ins_lines(wp, row + old_rows, | |
| 1996 xtra_rows, FALSE, FALSE) == FAIL) | |
| 1997 mod_bot = MAXLNUM; | |
| 1998 else if (top_end > row + old_rows) | |
| 1999 /* Scrolled the part at the top that requires | |
| 2000 * updating down. */ | |
| 2001 top_end += xtra_rows; | |
| 2002 } | |
| 2003 } | |
| 2004 | |
| 2005 /* When not updating the rest, may need to move w_lines[] | |
| 2006 * entries. */ | |
| 2007 if (mod_bot != MAXLNUM && i != j) | |
| 2008 { | |
| 2009 if (j < i) | |
| 2010 { | |
| 2011 int x = row + new_rows; | |
| 2012 | |
| 2013 /* move entries in w_lines[] upwards */ | |
| 2014 for (;;) | |
| 2015 { | |
| 2016 /* stop at last valid entry in w_lines[] */ | |
| 2017 if (i >= wp->w_lines_valid) | |
| 2018 { | |
| 2019 wp->w_lines_valid = j; | |
| 2020 break; | |
| 2021 } | |
| 2022 wp->w_lines[j] = wp->w_lines[i]; | |
| 2023 /* stop at a line that won't fit */ | |
| 2024 if (x + (int)wp->w_lines[j].wl_size | |
| 2025 > wp->w_height) | |
| 2026 { | |
| 2027 wp->w_lines_valid = j + 1; | |
| 2028 break; | |
| 2029 } | |
| 2030 x += wp->w_lines[j++].wl_size; | |
| 2031 ++i; | |
| 2032 } | |
| 2033 if (bot_start > x) | |
| 2034 bot_start = x; | |
| 2035 } | |
| 2036 else /* j > i */ | |
| 2037 { | |
| 2038 /* move entries in w_lines[] downwards */ | |
| 2039 j -= i; | |
| 2040 wp->w_lines_valid += j; | |
| 2041 if (wp->w_lines_valid > wp->w_height) | |
| 2042 wp->w_lines_valid = wp->w_height; | |
| 2043 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2044 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2045 | |
| 2046 /* The w_lines[] entries for inserted lines are | |
| 2047 * now invalid, but wl_size may be used above. | |
| 2048 * Reset to zero. */ | |
| 2049 while (i >= idx) | |
| 2050 { | |
| 2051 wp->w_lines[i].wl_size = 0; | |
| 2052 wp->w_lines[i--].wl_valid = FALSE; | |
| 2053 } | |
| 2054 } | |
| 2055 } | |
| 2056 } | |
| 2057 } | |
| 2058 | |
| 2059 #ifdef FEAT_FOLDING | |
| 2060 /* | |
| 2061 * When lines are folded, display one line for all of them. | |
| 2062 * Otherwise, display normally (can be several display lines when | |
| 2063 * 'wrap' is on). | |
| 2064 */ | |
| 2065 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2066 if (fold_count != 0) | |
| 2067 { | |
| 2068 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2069 ++row; | |
| 2070 --fold_count; | |
| 2071 wp->w_lines[idx].wl_folded = TRUE; | |
| 2072 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2073 # ifdef FEAT_SYN_HL | |
| 2074 did_update = DID_FOLD; | |
| 2075 # endif | |
| 2076 } | |
| 2077 else | |
| 2078 #endif | |
| 2079 if (idx < wp->w_lines_valid | |
| 2080 && wp->w_lines[idx].wl_valid | |
| 2081 && wp->w_lines[idx].wl_lnum == lnum | |
| 2082 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2083 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2084 && !WIN_IS_POPUP(wp) |
| 7 | 2085 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2086 #ifdef FEAT_DIFF | |
| 2087 && diff_check_fill(wp, lnum) == 0 | |
| 2088 #endif | |
| 2089 ) | |
| 2090 { | |
| 2091 /* This line is not going to fit. Don't draw anything here, | |
| 2092 * will draw "@ " lines below. */ | |
| 2093 row = wp->w_height + 1; | |
| 2094 } | |
| 2095 else | |
| 2096 { | |
| 2097 #ifdef FEAT_SEARCH_EXTRA | |
| 2098 prepare_search_hl(wp, lnum); | |
| 2099 #endif | |
| 2100 #ifdef FEAT_SYN_HL | |
| 2101 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2102 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
|
2103 && syntax_present(wp)) |
| 7 | 2104 syntax_end_parsing(syntax_last_parsed + 1); |
| 2105 #endif | |
| 2106 | |
| 2107 /* | |
| 2108 * Display one line. | |
| 2109 */ | |
|
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 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
|
2111 mod_top == 0, FALSE); |
| 7 | 2112 |
| 2113 #ifdef FEAT_FOLDING | |
| 2114 wp->w_lines[idx].wl_folded = FALSE; | |
| 2115 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2116 #endif | |
| 2117 #ifdef FEAT_SYN_HL | |
| 2118 did_update = DID_LINE; | |
| 2119 syntax_last_parsed = lnum; | |
| 2120 #endif | |
| 2121 } | |
| 2122 | |
| 2123 wp->w_lines[idx].wl_lnum = lnum; | |
| 2124 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
|
2125 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2126 /* 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
|
2127 * 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
|
2128 * 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
|
2129 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2130 { |
| 2131 /* we may need the size of that too long line later on */ | |
| 3318 | 2132 if (dollar_vcol == -1) |
| 7 | 2133 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2134 ++idx; | |
| 2135 break; | |
| 2136 } | |
| 3318 | 2137 if (dollar_vcol == -1) |
| 7 | 2138 wp->w_lines[idx].wl_size = row - srow; |
| 2139 ++idx; | |
| 2140 #ifdef FEAT_FOLDING | |
| 2141 lnum += fold_count + 1; | |
| 2142 #else | |
| 2143 ++lnum; | |
| 2144 #endif | |
| 2145 } | |
| 2146 else | |
| 2147 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2148 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
|
2149 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2150 #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
|
2151 // '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
|
2152 // 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
|
2153 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
|
2154 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
|
2155 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
|
2156 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2157 #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
|
2158 (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
|
2159 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2160 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2161 // This line does not need to be drawn, advance to the next one. |
| 7 | 2162 row += wp->w_lines[idx++].wl_size; |
| 2163 if (row > wp->w_height) /* past end of screen */ | |
| 2164 break; | |
| 2165 #ifdef FEAT_FOLDING | |
| 2166 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2167 #else | |
| 2168 ++lnum; | |
| 2169 #endif | |
| 2170 #ifdef FEAT_SYN_HL | |
| 2171 did_update = DID_NONE; | |
| 2172 #endif | |
| 2173 } | |
| 2174 | |
| 2175 if (lnum > buf->b_ml.ml_line_count) | |
| 2176 { | |
| 2177 eof = TRUE; | |
| 2178 break; | |
| 2179 } | |
| 2180 } | |
| 2181 /* | |
| 2182 * End of loop over all window lines. | |
| 2183 */ | |
| 2184 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2185 #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
|
2186 /* 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
|
2187 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
|
2188 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2189 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
|
2190 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2191 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
|
2192 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
|
2193 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
|
2194 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
|
2195 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
|
2196 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2197 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
|
2198 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2199 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
|
2200 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2201 #endif |
| 7 | 2202 |
| 2203 if (idx > wp->w_lines_valid) | |
| 2204 wp->w_lines_valid = idx; | |
| 2205 | |
| 2206 #ifdef FEAT_SYN_HL | |
| 2207 /* | |
| 2208 * Let the syntax stuff know we stop parsing here. | |
| 2209 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2210 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2211 syntax_end_parsing(syntax_last_parsed + 1); |
| 2212 #endif | |
| 2213 | |
| 2214 /* | |
| 2215 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2216 * line we were working on, then the line didn't fit. | |
| 2217 */ | |
| 2218 wp->w_empty_rows = 0; | |
| 2219 #ifdef FEAT_DIFF | |
| 2220 wp->w_filler_rows = 0; | |
| 2221 #endif | |
| 2222 if (!eof && !didline) | |
| 2223 { | |
| 2224 if (lnum == wp->w_topline) | |
| 2225 { | |
| 2226 /* | |
| 2227 * Single line that does not fit! | |
| 2228 * Don't overwrite it, it can be edited. | |
| 2229 */ | |
| 2230 wp->w_botline = lnum + 1; | |
| 2231 } | |
| 2232 #ifdef FEAT_DIFF | |
| 2233 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2234 { | |
| 2235 /* Window ends in filler lines. */ | |
| 2236 wp->w_botline = lnum; | |
| 2237 wp->w_filler_rows = wp->w_height - srow; | |
| 2238 } | |
| 2239 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2240 #ifdef FEAT_TEXT_PROP |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2241 else if (WIN_IS_POPUP(wp)) |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2242 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2243 // popup line that doesn't fit is left as-is |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2244 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2245 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2246 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2247 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
|
2248 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2249 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
|
2250 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2251 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2252 * 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
|
2253 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2254 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
|
2255 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2256 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
|
2257 (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
|
2258 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2259 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2260 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2261 } |
| 7 | 2262 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2263 { | |
| 2264 /* | |
| 2265 * Last line isn't finished: Display "@@@" at the end. | |
| 2266 */ | |
| 2267 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2268 W_WINROW(wp) + wp->w_height, | |
| 2269 (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
|
2270 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2271 set_empty_rows(wp, srow); |
| 2272 wp->w_botline = lnum; | |
| 2273 } | |
| 2274 else | |
| 2275 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2276 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2277 wp->w_botline = lnum; |
| 2278 } | |
| 2279 } | |
| 2280 else | |
| 2281 { | |
| 2282 draw_vsep_win(wp, row); | |
| 2283 if (eof) /* we hit the end of the file */ | |
| 2284 { | |
| 2285 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2286 #ifdef FEAT_DIFF | |
| 2287 j = diff_check_fill(wp, wp->w_botline); | |
| 2288 if (j > 0 && !wp->w_botfill) | |
| 2289 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2290 // Display filler lines at the end of the file. |
| 7 | 2291 if (char2cells(fill_diff) > 1) |
| 2292 i = '-'; | |
| 2293 else | |
| 2294 i = fill_diff; | |
| 2295 if (row + j > wp->w_height) | |
| 2296 j = wp->w_height - row; | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2297 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2298 row += j; |
| 2299 } | |
| 2300 #endif | |
| 2301 } | |
| 3318 | 2302 else if (dollar_vcol == -1) |
| 7 | 2303 wp->w_botline = lnum; |
| 2304 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2305 // Make sure the rest of the screen is blank |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2306 // put '~'s on rows that aren't part of the file. |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2307 win_draw_end(wp, WIN_IS_POPUP(wp) ? ' ' : '~', |
|
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
2308 ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2309 } |
| 2310 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2311 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2312 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2313 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2314 |
| 7 | 2315 /* Reset the type of redrawing required, the window has been updated. */ |
| 2316 wp->w_redr_type = 0; | |
| 2317 #ifdef FEAT_DIFF | |
| 2318 wp->w_old_topfill = wp->w_topfill; | |
| 2319 wp->w_old_botfill = wp->w_botfill; | |
| 2320 #endif | |
| 2321 | |
| 3318 | 2322 if (dollar_vcol == -1) |
| 7 | 2323 { |
| 2324 /* | |
| 2325 * There is a trick with w_botline. If we invalidate it on each | |
| 2326 * change that might modify it, this will cause a lot of expensive | |
| 2327 * calls to plines() in update_topline() each time. Therefore the | |
| 2328 * value of w_botline is often approximated, and this value is used to | |
| 2329 * compute the value of w_topline. If the value of w_botline was | |
| 2330 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2331 * the visible part of the text). If it's not, we need to redraw | |
| 2332 * again. Mostly this just means scrolling up a few lines, so it | |
| 2333 * doesn't look too bad. Only do this for the current window (where | |
| 2334 * changes are relevant). | |
| 2335 */ | |
| 2336 wp->w_valid |= VALID_BOTLINE; | |
| 2337 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2338 { | |
| 2339 recursive = TRUE; | |
| 2340 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2341 update_topline(); /* may invalidate w_botline again */ | |
| 2342 if (must_redraw != 0) | |
| 2343 { | |
| 2344 /* Don't update for changes in buffer again. */ | |
| 2345 i = curbuf->b_mod_set; | |
| 2346 curbuf->b_mod_set = FALSE; | |
| 2347 win_update(curwin); | |
| 2348 must_redraw = 0; | |
| 2349 curbuf->b_mod_set = i; | |
| 2350 } | |
| 2351 recursive = FALSE; | |
| 2352 } | |
| 2353 } | |
| 2354 | |
| 2355 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2356 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2357 if (!got_int) | |
| 2358 got_int = save_got_int; | |
| 2359 #endif | |
| 2360 } | |
| 2361 | |
| 2362 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2363 * Call screen_fill() with the columns adjusted for 'rightleft' if needed. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2364 * Return the new offset. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2365 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2366 static int |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2367 screen_fill_end( |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2368 win_T *wp, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2369 int c1, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2370 int c2, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2371 int off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2372 int width, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2373 int row, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2374 int endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2375 int attr) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2376 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2377 int nn = off + width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2378 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2379 if (nn > wp->w_width) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2380 nn = wp->w_width; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2381 #ifdef FEAT_RIGHTLEFT |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2382 if (wp->w_p_rl) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2383 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2384 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2385 W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - off, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2386 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2387 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2388 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2389 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2390 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2391 wp->w_wincol + off, (int)wp->w_wincol + nn, |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2392 c1, c2, attr); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2393 return nn; |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2394 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2395 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2396 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2397 * Clear lines near the end the window and mark the unused lines with "c1". |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2398 * use "c2" as the filler character. |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2399 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2400 */ |
| 2401 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2402 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2403 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2404 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2405 int c2, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2406 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2407 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2408 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2409 hlf_T hl) |
| 7 | 2410 { |
| 2411 int n = 0; | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2412 int attr = HL_ATTR(hl); |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2413 int wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2414 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2415 attr = hl_combine_attr(wcr_attr, attr); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2416 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2417 if (draw_margin) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2418 { |
| 6553 | 2419 #ifdef FEAT_FOLDING |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2420 int fdc = compute_foldcolumn(wp, 0); |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2421 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2422 if (fdc > 0) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2423 // draw the fold column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2424 n = screen_fill_end(wp, ' ', ' ', n, fdc, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2425 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2426 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2427 #ifdef FEAT_SIGNS |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2428 if (signcolumn_on(wp)) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2429 // draw the sign column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2430 n = screen_fill_end(wp, ' ', ' ', n, 2, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2431 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2432 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2433 if ((wp->w_p_nu || wp->w_p_rnu) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2434 && vim_strchr(p_cpo, CPO_NUMCOL) == NULL) |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2435 // draw the number column |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2436 n = screen_fill_end(wp, ' ', ' ', n, number_width(wp) + 1, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2437 row, endrow, hl_combine_attr(wcr_attr, HL_ATTR(HLF_N))); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2438 } |
| 7 | 2439 |
| 2440 #ifdef FEAT_RIGHTLEFT | |
| 2441 if (wp->w_p_rl) | |
| 2442 { | |
| 2443 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2444 wp->w_wincol, W_ENDCOL(wp) - 1 - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2445 c2, c2, attr); |
| 7 | 2446 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2447 W_ENDCOL(wp) - 1 - n, W_ENDCOL(wp) - n, |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2448 c1, c2, attr); |
| 7 | 2449 } |
| 2450 else | |
| 2451 #endif | |
| 2452 { | |
| 2453 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow, | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2454 wp->w_wincol + n, (int)W_ENDCOL(wp), |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
2455 c1, c2, attr); |
| 7 | 2456 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2457 |
| 7 | 2458 set_empty_rows(wp, row); |
| 2459 } | |
| 2460 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2461 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2462 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2463 * 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
|
2464 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2465 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2466 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
|
2467 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2468 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2469 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2470 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2471 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2472 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2473 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2474 #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
|
2475 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2476 * 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
|
2477 * 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
|
2478 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2479 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2480 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
|
2481 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2482 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
|
2483 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2484 if (has_mbyte) |
|
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 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2487 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
|
2488 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2489 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2490 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2491 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2492 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2493 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
|
2494 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
|
2495 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2497 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2498 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
|
2499 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2501 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 idx = off + col; |
|
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 /* 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
|
2505 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
|
2506 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 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
|
2508 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
|
2509 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
|
2510 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 - (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
|
2512 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2514 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2515 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 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
|
2519 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
|
2520 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2525 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2526 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2528 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2529 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
|
2530 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2532 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
|
2533 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
|
2534 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 /* 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
|
2537 * 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
|
2538 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
|
2539 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2540 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 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
|
2543 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
|
2544 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 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
|
2548 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2550 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2553 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
|
2554 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2557 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2558 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2559 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 /* Non-BMP character: display as ? or fullwidth ?. */ |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
2561 ScreenLinesUC[idx] = u8c; |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 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
|
2563 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2564 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
|
2565 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
|
2566 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2568 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 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
|
2571 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 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
|
2573 /* 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
|
2574 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
|
2575 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
|
2576 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 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
|
2578 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2581 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2582 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2583 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2585 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
|
2586 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2587 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
|
2588 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
|
2589 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2591 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 if (wp->w_p_rl) |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2593 mch_memmove(current_ScreenLine, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2594 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2595 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2596 mch_memmove(current_ScreenLine + col, text, len); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2598 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2599 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2600 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2601 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2602 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2603 |
| 7 | 2604 #ifdef FEAT_FOLDING |
| 2605 /* | |
| 6553 | 2606 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2607 * space is available for window "wp", minus "col". | |
| 2608 */ | |
| 2609 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2610 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2611 { |
| 2612 int fdc = wp->w_p_fdc; | |
| 2613 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
|
2614 int wwidth = wp->w_width; |
| 6553 | 2615 |
| 2616 if (fdc > wwidth - (col + wmw)) | |
| 2617 fdc = wwidth - (col + wmw); | |
| 2618 return fdc; | |
| 2619 } | |
| 2620 | |
| 2621 /* | |
| 7 | 2622 * Display one folded line. |
| 2623 */ | |
| 2624 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2625 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2626 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2627 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2628 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2629 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2630 int row) |
| 7 | 2631 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2632 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2633 pos_T *top, *bot; |
| 2634 linenr_T lnume = lnum + fold_count - 1; | |
| 2635 int len; | |
| 29 | 2636 char_u *text; |
| 7 | 2637 int fdc; |
| 2638 int col; | |
| 2639 int txtcol; | |
| 2640 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2641 int ri; |
| 7 | 2642 |
| 2643 /* Build the fold line: | |
| 2644 * 1. Add the cmdwin_type for the command-line window | |
| 2645 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2646 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2647 * 4. Compose the text |
| 2648 * 5. Add the text | |
| 2649 * 6. set highlighting for the Visual area an other text | |
| 2650 */ | |
| 2651 col = 0; | |
| 2652 | |
| 2653 /* | |
| 2654 * 1. Add the cmdwin_type for the command-line window | |
| 2655 * Ignores 'rightleft', this window is never right-left. | |
| 2656 */ | |
| 2657 #ifdef FEAT_CMDWIN | |
| 2658 if (cmdwin_type != 0 && wp == curwin) | |
| 2659 { | |
| 2660 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
|
2661 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2662 if (enc_utf8) |
| 2663 ScreenLinesUC[off] = 0; | |
| 2664 ++col; | |
| 2665 } | |
| 2666 #endif | |
| 2667 | |
| 2668 /* | |
| 2669 * 2. Add the 'foldcolumn' | |
| 6553 | 2670 * Reduce the width when there is not enough space. |
| 7 | 2671 */ |
| 6553 | 2672 fdc = compute_foldcolumn(wp, col); |
| 7 | 2673 if (fdc > 0) |
| 2674 { | |
| 2675 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2676 #ifdef FEAT_RIGHTLEFT | |
| 2677 if (wp->w_p_rl) | |
| 2678 { | |
| 2679 int i; | |
| 2680 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2681 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
|
2682 HL_ATTR(HLF_FC)); |
| 7 | 2683 /* reverse the fold column */ |
| 2684 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
|
2685 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2686 } |
| 2687 else | |
| 2688 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2689 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2690 col += fdc; |
| 2691 } | |
| 2692 | |
| 2693 #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
|
2694 # 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
|
2695 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2696 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
|
2697 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
|
2698 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
|
2699 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2700 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
|
2701 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
|
2702 } while (0) |
| 7 | 2703 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2704 # 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
|
2705 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2706 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
|
2707 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
|
2708 } while (0) |
| 7 | 2709 #endif |
| 2710 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2711 /* 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
|
2712 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2713 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2714 |
| 2715 #ifdef FEAT_SIGNS | |
| 2716 /* 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
|
2717 if (signcolumn_on(wp)) |
| 7 | 2718 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2719 len = wp->w_width - col; |
| 7 | 2720 if (len > 0) |
| 2721 { | |
| 2722 if (len > 2) | |
| 2723 len = 2; | |
| 2724 # ifdef FEAT_RIGHTLEFT | |
| 2725 if (wp->w_p_rl) | |
| 2726 /* 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
|
2727 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
|
2728 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2729 else |
| 2730 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2731 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2732 col += len; |
| 2733 } | |
| 2734 } | |
| 2735 #endif | |
| 2736 | |
| 2737 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2738 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2739 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2740 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2741 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2742 len = wp->w_width - col; |
| 7 | 2743 if (len > 0) |
| 2744 { | |
| 13 | 2745 int w = number_width(wp); |
| 5905 | 2746 long num; |
| 2747 char *fmt = "%*ld "; | |
| 13 | 2748 |
| 2749 if (len > w + 1) | |
| 2750 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2751 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2752 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
|
2753 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2754 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2755 else |
| 4065 | 2756 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2757 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2758 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
|
2759 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
|
2760 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2761 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2762 * line number */ |
| 4065 | 2763 num = lnum; |
| 2764 fmt = "%-*ld "; | |
| 2765 } | |
| 2766 } | |
| 2767 | |
| 2768 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2769 #ifdef FEAT_RIGHTLEFT |
| 2770 if (wp->w_p_rl) | |
| 2771 /* 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
|
2772 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
|
2773 HL_ATTR(HLF_FL)); |
| 7 | 2774 else |
| 2775 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2776 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2777 col += len; |
| 2778 } | |
| 2779 } | |
| 2780 | |
| 2781 /* | |
| 2782 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2783 */ | |
| 29 | 2784 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2785 |
| 2786 txtcol = col; /* remember where text starts */ | |
| 2787 | |
| 2788 /* | |
| 2789 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2790 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2791 * in columns number-col - window-width. | |
| 2792 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2793 col = text_to_screenline(wp, text, col); |
| 7 | 2794 |
| 2795 /* Fill the rest of the line with the fold filler */ | |
| 2796 #ifdef FEAT_RIGHTLEFT | |
| 2797 if (wp->w_p_rl) | |
| 2798 col -= txtcol; | |
| 2799 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2800 while (col < wp->w_width |
| 7 | 2801 #ifdef FEAT_RIGHTLEFT |
| 2802 - (wp->w_p_rl ? txtcol : 0) | |
| 2803 #endif | |
| 2804 ) | |
| 2805 { | |
| 2806 if (enc_utf8) | |
| 2807 { | |
| 2808 if (fill_fold >= 0x80) | |
| 2809 { | |
| 2810 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2811 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
|
2812 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2813 } |
| 2814 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2815 { |
| 7 | 2816 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2817 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2818 } |
|
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
|
2819 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
|
2820 } |
|
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
|
2821 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
|
2822 ScreenLines[off + col++] = fill_fold; |
| 7 | 2823 } |
| 2824 | |
| 2825 if (text != buf) | |
| 2826 vim_free(text); | |
| 2827 | |
| 2828 /* | |
| 2829 * 6. set highlighting for the Visual area an other text. | |
| 2830 * If all folded lines are in the Visual area, highlight the line. | |
| 2831 */ | |
| 2832 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2833 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2834 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2835 { |
| 2836 /* Visual is after curwin->w_cursor */ | |
| 2837 top = &curwin->w_cursor; | |
| 2838 bot = &VIsual; | |
| 2839 } | |
| 2840 else | |
| 2841 { | |
| 2842 /* Visual is before curwin->w_cursor */ | |
| 2843 top = &VIsual; | |
| 2844 bot = &curwin->w_cursor; | |
| 2845 } | |
| 2846 if (lnum >= top->lnum | |
| 2847 && lnume <= bot->lnum | |
| 2848 && (VIsual_mode != 'v' | |
| 2849 || ((lnum > top->lnum | |
| 2850 || (lnum == top->lnum | |
| 2851 && top->col == 0)) | |
| 2852 && (lnume < bot->lnum | |
| 2853 || (lnume == bot->lnum | |
| 2854 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2855 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2856 { |
| 2857 if (VIsual_mode == Ctrl_V) | |
| 2858 { | |
| 2859 /* 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
|
2860 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2861 { |
| 3040 | 2862 if (wp->w_old_cursor_lcol != MAXCOL |
| 2863 && 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
|
2864 < (colnr_T)wp->w_width) |
| 7 | 2865 len = wp->w_old_cursor_lcol; |
| 2866 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2867 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
|
2868 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2869 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2870 } |
| 2871 } | |
| 2872 else | |
| 216 | 2873 { |
| 7 | 2874 /* 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
|
2875 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2876 } |
| 7 | 2877 } |
| 2878 } | |
| 2879 | |
| 743 | 2880 #ifdef FEAT_SYN_HL |
| 6685 | 2881 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2882 if (wp->w_p_cc_cols) | |
| 2883 { | |
| 2884 int i = 0; | |
| 2885 int j = wp->w_p_cc_cols[i]; | |
| 2886 int old_txtcol = txtcol; | |
| 2887 | |
| 2888 while (j > -1) | |
| 2889 { | |
| 2890 txtcol += j; | |
| 2891 if (wp->w_p_wrap) | |
| 2892 txtcol -= wp->w_skipcol; | |
| 2893 else | |
| 2894 txtcol -= wp->w_leftcol; | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2895 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2896 ScreenAttrs[off + txtcol] = hl_combine_attr( |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2897 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2898 txtcol = old_txtcol; |
| 2899 j = wp->w_p_cc_cols[++i]; | |
| 2900 } | |
| 2901 } | |
| 2902 | |
| 743 | 2903 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2904 if (wp->w_p_cuc) |
| 2905 { | |
| 2906 txtcol += wp->w_virtcol; | |
| 2907 if (wp->w_p_wrap) | |
| 2908 txtcol -= wp->w_skipcol; | |
| 2909 else | |
| 2910 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
|
2911 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2912 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
|
2913 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2914 } |
| 743 | 2915 #endif |
| 7 | 2916 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2917 screen_line(row + W_WINROW(wp), wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
2918 (int)wp->w_width, 0); |
| 7 | 2919 |
| 2920 /* | |
| 2921 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2922 * updated (saves a call to plines() later). | |
| 2923 */ | |
| 2924 if (wp == curwin | |
| 2925 && lnum <= curwin->w_cursor.lnum | |
| 2926 && lnume >= curwin->w_cursor.lnum) | |
| 2927 { | |
| 2928 curwin->w_cline_row = row; | |
| 2929 curwin->w_cline_height = 1; | |
| 2930 curwin->w_cline_folded = TRUE; | |
| 2931 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2932 } | |
| 2933 } | |
| 2934 | |
| 2935 /* | |
| 2936 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2937 */ | |
| 2938 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2939 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2940 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2941 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2942 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2943 int attr) |
| 7 | 2944 { |
| 216 | 2945 int i; |
| 2946 | |
| 7 | 2947 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2948 if (enc_utf8) | |
| 2949 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2950 for (i = 0; i < len; ++i) |
| 2951 ScreenAttrs[off + i] = attr; | |
| 7 | 2952 } |
| 2953 | |
| 2954 /* | |
| 2955 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2956 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2957 */ |
| 2958 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2960 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2961 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2962 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2963 linenr_T lnum) /* current line number */ |
| 7 | 2964 { |
| 2965 int i = 0; | |
| 2966 int level; | |
| 2967 int first_level; | |
| 519 | 2968 int empty; |
| 6553 | 2969 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2970 |
| 2971 /* Init to all spaces. */ | |
| 6929 | 2972 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2973 |
| 2974 level = win_foldinfo.fi_level; | |
| 2975 if (level > 0) | |
| 2976 { | |
| 519 | 2977 /* If there is only one column put more info in it. */ |
| 6553 | 2978 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2979 |
| 7 | 2980 /* If the column is too narrow, we start at the lowest level that |
| 2981 * fits and use numbers to indicated the depth. */ | |
| 6553 | 2982 first_level = level - fdc - closed + 1 + empty; |
| 7 | 2983 if (first_level < 1) |
| 2984 first_level = 1; | |
| 2985 | |
| 6553 | 2986 for (i = 0; i + empty < fdc; ++i) |
| 7 | 2987 { |
| 2988 if (win_foldinfo.fi_lnum == lnum | |
| 2989 && first_level + i >= win_foldinfo.fi_low_level) | |
| 2990 p[i] = '-'; | |
| 2991 else if (first_level == 1) | |
| 2992 p[i] = '|'; | |
| 2993 else if (first_level + i <= 9) | |
| 2994 p[i] = '0' + first_level + i; | |
| 2995 else | |
| 2996 p[i] = '>'; | |
| 2997 if (first_level + i == level) | |
| 2998 break; | |
| 2999 } | |
| 3000 } | |
| 3001 if (closed) | |
| 6553 | 3002 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3003 } |
| 3004 #endif /* FEAT_FOLDING */ | |
| 3005 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3006 #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
|
3007 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
|
3008 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
|
3009 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3010 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3011 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
|
3012 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3013 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
|
3014 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
|
3015 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
|
3016 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3017 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
|
3018 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
|
3019 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
|
3020 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
|
3021 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
|
3022 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3023 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
|
3024 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3025 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
|
3026 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3027 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
|
3028 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
|
3029 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
|
3030 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
|
3031 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
|
3032 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3033 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3034 |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3035 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3036 /* |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3037 * Get information needed to display the sign in line 'lnum' in window 'wp'. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3038 * If 'nrcol' is TRUE, the sign is going to be displayed in the number column. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3039 * Otherwise the sign is going to be displayed in the sign column. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3040 */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3041 static void |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3042 get_sign_display_info( |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3043 int nrcol, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3044 win_T *wp, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3045 linenr_T lnum, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3046 int wcr_attr, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3047 int row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3048 int startrow, |
|
17139
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3049 int filler_lines UNUSED, |
|
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3050 int filler_todo UNUSED, |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3051 int *c_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3052 int *c_finalp, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3053 char_u *extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3054 char_u **pp_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3055 int *n_extrap, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3056 int *char_attrp) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3057 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3058 int text_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3059 # ifdef FEAT_SIGN_ICONS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3060 int icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3061 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3062 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3063 // Draw two cells with the sign value or blank. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3064 *c_extrap = ' '; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3065 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3066 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3067 *n_extrap = number_width(wp) + 1; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3068 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3069 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3070 *char_attrp = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3071 *n_extrap = 2; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3072 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3073 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3074 if (row == startrow |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3075 #ifdef FEAT_DIFF |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3076 + filler_lines && filler_todo <= 0 |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3077 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3078 ) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3079 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3080 text_sign = buf_getsigntype(wp->w_buffer, lnum, SIGN_TEXT); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3081 # ifdef FEAT_SIGN_ICONS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3082 icon_sign = buf_getsigntype(wp->w_buffer, lnum, SIGN_ICON); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3083 if (gui.in_use && icon_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3084 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3085 // Use the image in this position. |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3086 if (nrcol) |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3087 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3088 *c_extrap = NUL; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3089 sprintf((char *)extra, "%-*c ", number_width(wp), SIGN_BYTE); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3090 *pp_extra = extra; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3091 *n_extrap = (int)STRLEN(*pp_extra); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3092 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3093 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3094 *c_extrap = SIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3095 # ifdef FEAT_NETBEANS_INTG |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3096 if (buf_signcount(wp->w_buffer, lnum) > 1) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3097 { |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3098 if (nrcol) |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3099 { |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3100 *c_extrap = NUL; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3101 sprintf((char *)extra, "%-*c ", number_width(wp), |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3102 MULTISIGN_BYTE); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3103 *pp_extra = extra; |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3104 *n_extrap = (int)STRLEN(*pp_extra); |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3105 } |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3106 else |
|
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3107 *c_extrap = MULTISIGN_BYTE; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3108 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3109 # endif |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3110 *c_finalp = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3111 *char_attrp = icon_sign; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3112 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3113 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3114 # endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3115 if (text_sign != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3116 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3117 *pp_extra = sign_get_text(text_sign); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3118 if (*pp_extra != NULL) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3119 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3120 if (nrcol) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3121 { |
|
17141
3c0efdd95f8d
patch 8.1.1570: icon signs not displayed properly in the number column
Bram Moolenaar <Bram@vim.org>
parents:
17139
diff
changeset
|
3122 sprintf((char *)extra, "%*s ", number_width(wp), |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3123 *pp_extra); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3124 *pp_extra = extra; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3125 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3126 *c_extrap = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3127 *c_finalp = NUL; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3128 *n_extrap = (int)STRLEN(*pp_extra); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3129 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3130 *char_attrp = sign_get_attr(text_sign, FALSE); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3131 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3132 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3133 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3134 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3135 |
| 7 | 3136 /* |
| 3137 * Display line "lnum" of window 'wp' on the screen. | |
| 3138 * Start at row "startrow", stop when "endrow" is reached. | |
| 3139 * wp->w_virtcol needs to be valid. | |
| 3140 * | |
| 3141 * Return the number of last row the line occupies. | |
| 3142 */ | |
| 3143 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3144 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3145 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3146 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3147 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3148 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
|
3149 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
|
3150 int number_only) // only update the number column |
| 7 | 3151 { |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3152 int col = 0; // visual column on screen |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3153 unsigned off; // offset in ScreenLines/ScreenAttrs |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3154 int c = 0; // init for GCC |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3155 long vcol = 0; // virtual column (for tabs) |
| 6503 | 3156 #ifdef FEAT_LINEBREAK |
|
17229
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3157 long vcol_sbr = -1; // virtual column after showbreak |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3158 #endif |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3159 long vcol_prev = -1; // "vcol" of previous character |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3160 char_u *line; // current line |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3161 char_u *ptr; // current position in "line" |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3162 int row; // row in the window, excl w_winrow |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3163 int screen_row; // row on the screen, incl w_winrow |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3164 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3165 char_u extra[21]; // "%ld " and 'fdc' must fit in here |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3166 int n_extra = 0; // number of extra chars |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3167 char_u *p_extra = NULL; // string of extra chars, plus NUL |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3168 char_u *p_extra_free = NULL; // p_extra needs to be freed |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3169 int c_extra = NUL; // extra chars, all the same |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3170 int c_final = NUL; // final char, mandatory if set |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3171 int extra_attr = 0; // attributes when n_extra != 0 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3172 static char_u *at_end_str = (char_u *)""; // used for p_extra when |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3173 // displaying lcs_eol at end-of-line |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3174 int lcs_eol_one = lcs_eol; // lcs_eol until it's been used |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3175 int lcs_prec_todo = lcs_prec; // lcs_prec until it's been used |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3176 |
|
f1c7b7a4d9e4
patch 8.1.1614: 'numberwidth' can only go up to 10
Bram Moolenaar <Bram@vim.org>
parents:
17225
diff
changeset
|
3177 // saved "extra" items for when draw_state becomes WL_LINE (again) |
| 7 | 3178 int saved_n_extra = 0; |
| 3179 char_u *saved_p_extra = NULL; | |
| 3180 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
|
3181 int saved_c_final = 0; |
| 7 | 3182 int saved_char_attr = 0; |
| 3183 | |
| 3184 int n_attr = 0; /* chars with special attr */ | |
| 3185 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3186 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3187 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3188 | |
| 3189 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3190 | |
| 3191 int fromcol, tocol; /* start/end of inverting */ | |
| 3192 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3193 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3194 pos_T *top, *bot; | |
| 1813 | 3195 int lnum_in_visual_area = FALSE; |
| 7 | 3196 pos_T pos; |
| 3197 long v; | |
| 3198 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3199 int char_attr = 0; // attributes for next character |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3200 int attr_pri = FALSE; // char_attr has priority |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3201 int area_highlighting = FALSE; // Visual or incsearch highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3202 // in this line |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3203 int vi_attr = 0; // attributes for Visual and incsearch |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3204 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3205 int wcr_attr = 0; // attributes from 'wincolor' |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3206 int win_attr = 0; // background for whole window, except |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3207 // margins and "~" lines. |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3208 int area_attr = 0; // attributes desired by highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3209 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3210 #ifdef FEAT_SYN_HL |
| 743 | 3211 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3212 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3213 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3214 int save_did_emsg; | |
| 1437 | 3215 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
|
3216 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3217 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3218 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3219 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3220 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3221 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
|
3222 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3223 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3224 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3225 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
|
3226 int text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
3227 int text_prop_combine = FALSE; |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3228 #endif |
| 743 | 3229 #ifdef FEAT_SPELL |
| 221 | 3230 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3231 # define SPWORDLEN 150 |
| 3232 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3233 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3234 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3235 starts */ |
| 221 | 3236 int spell_attr = 0; /* attributes desired by spelling */ |
| 3237 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3238 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3239 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3240 * there are no spell errors */ |
| 386 | 3241 static int cap_col = -1; /* column to check for Cap word */ |
| 3242 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3243 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3244 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3245 int extra_check = 0; // has extra highlighting |
| 7 | 3246 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3247 int mb_l = 1; /* multi-byte byte length */ | |
| 3248 int mb_c = 0; /* decoded multi-byte character */ | |
| 3249 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3250 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
|
17145
26941c50baf3
patch 8.1.1572: compiler warnings with tiny build
Bram Moolenaar <Bram@vim.org>
parents:
17143
diff
changeset
|
3251 #if defined(FEAT_DIFF) || defined(FEAT_SIGNS) |
|
17139
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3252 int filler_lines = 0; /* nr of filler lines to be drawn */ |
|
03fbad5d6279
patch 8.1.1569: cannot build with signs but without diff feature
Bram Moolenaar <Bram@vim.org>
parents:
17129
diff
changeset
|
3253 int filler_todo = 0; /* nr of filler lines still to do + 1 */ |
|
17145
26941c50baf3
patch 8.1.1572: compiler warnings with tiny build
Bram Moolenaar <Bram@vim.org>
parents:
17143
diff
changeset
|
3254 #endif |
| 7 | 3255 #ifdef FEAT_DIFF |
| 534 | 3256 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3257 int change_start = MAXCOL; /* first col of changed area */ |
| 3258 int change_end = -1; /* last col of changed area */ | |
| 3259 #endif | |
| 3260 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3261 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3262 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
|
3263 chars */ |
| 7 | 3264 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3265 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3266 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3267 # define LINE_ATTR |
| 1536 | 3268 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3269 #endif |
| 3270 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3271 matchitem_T *cur; /* points to the match list */ |
| 3272 match_T *shl; /* points to search_hl or a match */ | |
| 3273 int shl_flag; /* flag to indicate whether search_hl | |
| 3274 has been processed or not */ | |
| 5979 | 3275 int pos_inprogress; /* marks that position match search is |
| 3276 in progress */ | |
| 1326 | 3277 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3278 equals startcol of search_hl or one | |
| 3279 of the matches */ | |
| 7 | 3280 #endif |
| 3281 #ifdef FEAT_ARABIC | |
| 3282 int prev_c = 0; /* previous Arabic character */ | |
| 3283 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3284 #endif | |
| 910 | 3285 #if defined(LINE_ATTR) |
| 867 | 3286 int did_line_attr = 0; |
| 3287 #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
|
3288 #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
|
3289 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3290 #endif |
| 7 | 3291 |
| 3292 /* draw_state: items that are drawn in sequence: */ | |
| 3293 #define WL_START 0 /* nothing done yet */ | |
| 3294 #ifdef FEAT_CMDWIN | |
| 3295 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3296 #else | |
| 3297 # define WL_CMDLINE WL_START | |
| 3298 #endif | |
| 3299 #ifdef FEAT_FOLDING | |
| 3300 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3301 #else | |
| 3302 # define WL_FOLD WL_CMDLINE | |
| 3303 #endif | |
| 3304 #ifdef FEAT_SIGNS | |
| 3305 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3306 #else | |
| 3307 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3308 #endif | |
| 3309 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3310 #ifdef FEAT_LINEBREAK |
| 3311 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3312 #else | |
| 3313 # define WL_BRI WL_NR | |
| 3314 #endif | |
| 7 | 3315 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3316 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3317 #else |
| 5995 | 3318 # define WL_SBR WL_BRI |
| 7 | 3319 #endif |
| 3320 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3321 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3322 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3323 int feedback_col = 0; |
| 3324 int feedback_old_attr = -1; | |
| 3325 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3326 int screen_line_flags = 0; |
| 7 | 3327 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3328 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3329 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
|
3330 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
|
3331 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
|
3332 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
|
3333 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3334 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
|
3335 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3336 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
|
3337 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3338 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3339 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3340 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3341 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3342 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3343 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3344 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3345 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3346 col -= boguscols; \ |
| 6520 | 3347 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3348 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3349 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3350 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3351 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3352 #endif |
| 7 | 3353 |
| 3354 if (startrow > endrow) /* past the end already! */ | |
| 3355 return startrow; | |
| 3356 | |
| 3357 row = startrow; | |
| 3358 screen_row = row + W_WINROW(wp); | |
| 3359 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3360 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
|
3361 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3362 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 * 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
|
3364 * 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
|
3365 */ |
| 7 | 3366 #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
|
3367 extra_check = wp->w_p_lbr; |
| 7 | 3368 #endif |
| 3369 #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
|
3370 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
|
3371 # 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
|
3372 && !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
|
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 /* 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
|
3377 * 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
|
3378 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
|
3379 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
|
3380 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
|
3381 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
|
3382 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
|
3383 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3384 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3385 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
|
3386 #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
|
3387 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
|
3388 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3389 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3390 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
|
3391 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
|
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 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3396 /* 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
|
3397 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
|
3398 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
|
3399 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3400 #endif |
| 3401 | |
|
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
|
3402 #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
|
3403 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
|
3404 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3405 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
|
3406 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3407 win_attr = term_get_attr(wp->w_buffer, lnum, -1); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3408 } |
|
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
|
3409 #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
|
3410 |
| 743 | 3411 #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
|
3412 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
|
3413 && *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
|
3414 && 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
|
3415 && *(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
|
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 /* 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
|
3418 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
|
3419 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
|
3420 |
|
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
|
3421 /* 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
|
3422 * 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
|
3423 * 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
|
3424 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
|
3425 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
|
3426 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 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
|
3428 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
|
3429 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3430 |
|
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
|
3431 /* 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
|
3432 * 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
|
3433 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
|
3434 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
|
3435 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
|
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 /* 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
|
3438 * 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
|
3439 * 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
|
3440 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
|
3441 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
|
3442 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
|
3443 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
|
3444 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
|
3445 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3446 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3447 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3448 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3449 * 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
|
3450 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3451 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
|
3452 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
|
3453 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
|
3454 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3455 /* 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
|
3456 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
|
3457 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3458 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
|
3459 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
|
3460 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3461 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
|
3462 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3463 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
|
3464 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
|
3465 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3466 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
|
3467 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
|
3468 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3469 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
|
3470 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3471 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
|
3472 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
|
3473 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3474 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3475 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
|
3476 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3477 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3478 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
|
3479 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
|
3480 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3481 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
|
3482 fromcol = 0; |
| 7 | 3483 else |
| 3484 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3485 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
|
3486 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
|
3487 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
|
3488 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3489 } |
|
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 (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
|
3491 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3492 if (*p_sel == 'e' && bot->col == 0 && bot->coladd == 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
|
3493 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3494 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
|
3495 tocol = MAXCOL; |
| 7 | 3496 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3497 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
|
3498 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
|
3499 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3500 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3501 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
|
3502 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
|
3503 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
|
3504 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3505 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3506 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
|
3507 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3508 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3509 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3510 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3511 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3512 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3513 /* 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
|
3514 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
|
3515 #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
|
3516 && !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
|
3517 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3518 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3519 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
|
3520 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3521 /* 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
|
3522 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
|
3523 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3524 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3525 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3526 #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
|
3527 if ((clip_star.available && !clip_star.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3528 && clip_isautosel_star()) |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3529 || (clip_plus.available && !clip_plus.owned |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3530 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3531 vi_attr = HL_ATTR(HLF_VNC); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3532 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3533 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3534 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3535 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3536 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3537 * 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
|
3538 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3539 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
|
3540 && 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
|
3541 && 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
|
3542 && 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
|
3543 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3544 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
|
3545 getvcol(curwin, &(curwin->w_cursor), |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
3546 (colnr_T *)&fromcol, NULL, NULL); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3547 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3548 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
|
3549 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
|
3550 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3551 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
|
3552 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
|
3553 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
|
3554 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3555 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3556 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
|
3557 /* 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
|
3558 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
|
3559 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
|
3560 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3561 vi_attr = HL_ATTR(HLF_I); |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3562 } |
| 7 | 3563 } |
| 3564 | |
| 3565 #ifdef FEAT_DIFF | |
| 3566 filler_lines = diff_check(wp, lnum); | |
| 3567 if (filler_lines < 0) | |
| 3568 { | |
| 3569 if (filler_lines == -1) | |
| 3570 { | |
| 3571 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3572 diff_hlf = HLF_ADD; /* added line */ | |
| 3573 else if (change_start == 0) | |
| 3574 diff_hlf = HLF_TXD; /* changed text */ | |
| 3575 else | |
| 3576 diff_hlf = HLF_CHD; /* changed line */ | |
| 3577 } | |
| 3578 else | |
| 3579 diff_hlf = HLF_ADD; /* added line */ | |
| 3580 filler_lines = 0; | |
| 3581 area_highlighting = TRUE; | |
| 3582 } | |
| 3583 if (lnum == wp->w_topline) | |
| 3584 filler_lines = wp->w_topfill; | |
| 3585 filler_todo = filler_lines; | |
| 3586 #endif | |
| 3587 | |
| 3588 #ifdef LINE_ATTR | |
| 3589 # ifdef FEAT_SIGNS | |
| 3590 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3591 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3592 if (v != 0) | |
| 3593 line_attr = sign_get_attr((int)v, TRUE); | |
| 3594 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3595 # if defined(FEAT_QUICKFIX) |
| 7 | 3596 /* Highlight the current line in the quickfix window. */ |
| 644 | 3597 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
|
3598 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3599 # endif |
| 3600 if (line_attr != 0) | |
| 3601 area_highlighting = TRUE; | |
| 3602 #endif | |
| 3603 | |
| 3604 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3605 ptr = line; | |
| 3606 | |
| 743 | 3607 #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
|
3608 if (has_spell && !number_only) |
| 348 | 3609 { |
| 386 | 3610 /* For checking first word with a capital skip white space. */ |
| 3611 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
|
3612 cap_col = getwhitecols(line); |
| 386 | 3613 |
| 348 | 3614 /* To be able to spell-check over line boundaries copy the end of the |
| 3615 * current line into nextline[]. Above the start of the next line was | |
| 3616 * copied to nextline[SPWORDLEN]. */ | |
| 3617 if (nextline[SPWORDLEN] == NUL) | |
| 3618 { | |
| 3619 /* No next line or it is empty. */ | |
| 3620 nextlinecol = MAXCOL; | |
| 3621 nextline_idx = 0; | |
| 3622 } | |
| 3623 else | |
| 3624 { | |
| 835 | 3625 v = (long)STRLEN(line); |
| 348 | 3626 if (v < SPWORDLEN) |
| 3627 { | |
| 3628 /* Short line, use it completely and append the start of the | |
| 3629 * next line. */ | |
| 3630 nextlinecol = 0; | |
| 3631 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3632 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3633 nextline_idx = v + 1; |
| 3634 } | |
| 3635 else | |
| 3636 { | |
| 3637 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3638 nextlinecol = v - SPWORDLEN; | |
| 3639 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3640 nextline_idx = SPWORDLEN + 1; | |
| 3641 } | |
| 3642 } | |
| 3643 } | |
| 3644 #endif | |
| 3645 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3646 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3647 { |
|
15715
52930462eec4
patch 8.1.0865: when 'listchars' only contains "nbsp:X" it does not work
Bram Moolenaar <Bram@vim.org>
parents:
15683
diff
changeset
|
3648 if (lcs_space || lcs_trail || lcs_nbsp) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3649 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3650 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3651 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3652 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3653 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
|
3654 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
|
3655 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3656 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3657 } |
| 7 | 3658 } |
| 3659 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3660 wcr_attr = get_wcr_attr(wp); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3661 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3662 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3663 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3664 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3665 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3666 #ifdef FEAT_TEXT_PROP |
|
17225
09fa437d33d8
patch 8.1.1612: cannot show an existing buffer in a popup window
Bram Moolenaar <Bram@vim.org>
parents:
17208
diff
changeset
|
3667 if (WIN_IS_POPUP(wp)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3668 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3669 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3670 |
| 7 | 3671 /* |
| 3672 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3673 * first character to be displayed. | |
| 3674 */ | |
| 3675 if (wp->w_p_wrap) | |
| 3676 v = wp->w_skipcol; | |
| 3677 else | |
| 3678 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
|
3679 if (v > 0 && !number_only) |
| 7 | 3680 { |
| 3681 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3682 |
| 7 | 3683 while (vcol < v && *ptr != NUL) |
| 3684 { | |
| 5995 | 3685 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3686 vcol += c; |
| 3687 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3688 MB_PTR_ADV(ptr); |
| 7 | 3689 } |
| 3690 | |
| 1984 | 3691 /* When: |
| 3692 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3693 * - 'colorcolumn' is set, or |
| 1984 | 3694 * - 'virtualedit' is set, or |
| 3695 * - the visual mode is active, | |
| 3696 * the end of the line may be before the start of the displayed part. | |
| 3697 */ | |
| 3698 if (vcol < v && ( | |
| 5735 | 3699 #ifdef FEAT_SYN_HL |
| 3700 wp->w_p_cuc || draw_color_col || | |
| 3701 #endif | |
| 3702 virtual_active() || | |
| 3703 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3704 vcol = v; |
| 3705 | |
| 3706 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3707 * that character but skip the first few screen characters. */ | |
| 3708 if (vcol > v) | |
| 3709 { | |
| 3710 vcol -= c; | |
| 3711 ptr = prev_ptr; | |
|
11010
c004e17fa36b
patch 8.0.0394: tabs are not aligned when scrolling horizontally
Christian Brabandt <cb@256bit.org>
parents:
10988
diff
changeset
|
3712 /* 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
|
3713 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3714 if (( (*mb_ptr2cells)(ptr) >= c || *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
|
3715 n_skip = v - vcol; |
| 7 | 3716 } |
| 3717 | |
| 3718 /* | |
| 3719 * Adjust for when the inverted text is before the screen, | |
| 3720 * and when the start of the inverted text is before the screen. | |
| 3721 */ | |
| 3722 if (tocol <= vcol) | |
| 3723 fromcol = 0; | |
| 3724 else if (fromcol >= 0 && fromcol < vcol) | |
| 3725 fromcol = vcol; | |
| 3726 | |
| 3727 #ifdef FEAT_LINEBREAK | |
| 3728 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3729 if (wp->w_p_wrap) | |
| 3730 need_showbreak = TRUE; | |
| 3731 #endif | |
| 743 | 3732 #ifdef FEAT_SPELL |
| 499 | 3733 /* When spell checking a word we need to figure out the start of the |
| 3734 * word and if it's badly spelled or not. */ | |
| 3735 if (has_spell) | |
| 3736 { | |
| 3737 int len; | |
| 1536 | 3738 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3739 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3740 |
| 3741 pos = wp->w_cursor; | |
| 3742 wp->w_cursor.lnum = lnum; | |
| 1536 | 3743 wp->w_cursor.col = linecol; |
| 534 | 3744 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3745 |
| 3746 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3747 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3748 ptr = line + linecol; | |
| 3749 | |
| 530 | 3750 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3751 { |
| 3752 /* no bad word found at line start, don't check until end of a | |
| 3753 * word */ | |
| 534 | 3754 spell_hlf = HLF_COUNT; |
| 3572 | 3755 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3756 } |
| 3757 else | |
| 534 | 3758 { |
| 499 | 3759 /* bad word found, use attributes until end of word */ |
| 3760 word_end = wp->w_cursor.col + len + 1; | |
| 3761 | |
| 534 | 3762 /* Turn index into actual attributes. */ |
| 3763 if (spell_hlf != HLF_COUNT) | |
| 3764 spell_attr = highlight_attr[spell_hlf]; | |
| 3765 } | |
| 499 | 3766 wp->w_cursor = pos; |
| 501 | 3767 |
| 743 | 3768 # ifdef FEAT_SYN_HL |
| 501 | 3769 /* Need to restart syntax highlighting for this line. */ |
| 3770 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3771 syntax_start(wp, lnum); |
| 743 | 3772 # endif |
| 499 | 3773 } |
| 3774 #endif | |
| 7 | 3775 } |
| 3776 | |
| 3777 /* | |
| 3778 * Correct highlighting for cursor that can't be disabled. | |
| 3779 * Avoids having to check this for each character. | |
| 3780 */ | |
| 3781 if (fromcol >= 0) | |
| 3782 { | |
| 3783 if (noinvcur) | |
| 3784 { | |
| 3785 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3786 { | |
| 3787 /* highlighting starts at cursor, let it start just after the | |
| 3788 * cursor */ | |
| 3789 fromcol_prev = fromcol; | |
| 3790 fromcol = -1; | |
| 3791 } | |
| 3792 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3793 /* restart highlighting after the cursor */ | |
| 3794 fromcol_prev = wp->w_virtcol; | |
| 3795 } | |
| 3796 if (fromcol >= tocol) | |
| 3797 fromcol = -1; | |
| 3798 } | |
| 3799 | |
| 3800 #ifdef FEAT_SEARCH_EXTRA | |
| 3801 /* | |
| 1326 | 3802 * Handle highlighting the last used search pattern and matches. |
| 3803 * Do this for both search_hl and the match list. | |
|
17022
79c3a52fdb07
patch 8.1.1511: matches in a popup window are not displayed properly
Bram Moolenaar <Bram@vim.org>
parents:
16998
diff
changeset
|
3804 * Do not use search_hl in a popup window. |
| 7 | 3805 */ |
| 1326 | 3806 cur = wp->w_match_head; |
|
17022
79c3a52fdb07
patch 8.1.1511: matches in a popup window are not displayed properly
Bram Moolenaar <Bram@vim.org>
parents:
16998
diff
changeset
|
3807 shl_flag = (screen_line_flags & SLF_POPUP); |
|
79c3a52fdb07
patch 8.1.1511: matches in a popup window are not displayed properly
Bram Moolenaar <Bram@vim.org>
parents:
16998
diff
changeset
|
3808 while ((cur != NULL || shl_flag == FALSE) && !number_only) |
| 1326 | 3809 { |
| 3810 if (shl_flag == FALSE) | |
| 3811 { | |
| 3812 shl = &search_hl; | |
| 3813 shl_flag = TRUE; | |
| 3814 } | |
| 3815 else | |
| 3816 shl = &cur->hl; | |
| 36 | 3817 shl->startcol = MAXCOL; |
| 3818 shl->endcol = MAXCOL; | |
| 7 | 3819 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3820 shl->is_addpos = FALSE; |
| 5979 | 3821 v = (long)(ptr - line); |
| 3822 if (cur != NULL) | |
| 3823 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3824 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
|
3825 shl == &search_hl ? NULL : cur); |
| 5979 | 3826 |
| 3827 /* Need to get the line again, a multi-line regexp may have made it | |
| 3828 * invalid. */ | |
| 3829 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3830 ptr = line + v; | |
| 3831 | |
| 3832 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3833 { | |
| 3834 if (shl->lnum == lnum) | |
| 3835 shl->startcol = shl->rm.startpos[0].col; | |
| 3836 else | |
| 3837 shl->startcol = 0; | |
| 3838 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3839 - shl->rm.startpos[0].lnum) | |
| 3840 shl->endcol = shl->rm.endpos[0].col; | |
| 3841 else | |
| 3842 shl->endcol = MAXCOL; | |
| 3843 /* Highlight one character for an empty match. */ | |
| 3844 if (shl->startcol == shl->endcol) | |
| 3845 { | |
| 3846 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3847 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3848 else |
| 5979 | 3849 ++shl->endcol; |
| 3850 } | |
| 3851 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3852 { | |
| 3853 shl->attr_cur = shl->attr; | |
| 3854 search_attr = shl->attr; | |
| 3855 } | |
| 3856 area_highlighting = TRUE; | |
| 7 | 3857 } |
| 1326 | 3858 if (shl != &search_hl && cur != NULL) |
| 3859 cur = cur->next; | |
| 7 | 3860 } |
| 3861 #endif | |
| 3862 | |
| 743 | 3863 #ifdef FEAT_SYN_HL |
|
15991
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3864 // Cursor line highlighting for 'cursorline' in the current window. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3865 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3866 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3867 // Do not show the cursor line when Visual mode is active, because it's |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3868 // not clear what is selected then. Do update w_last_cursorline. |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3869 if (!(wp == curwin && VIsual_active)) |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3870 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3871 line_attr = HL_ATTR(HLF_CUL); |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3872 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3873 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3874 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3875 } |
| 3876 #endif | |
| 3877 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3878 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3879 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3880 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3881 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3882 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
|
3883 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3884 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3885 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3886 // 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
|
3887 // aligned. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
3888 text_props = ALLOC_MULT(textprop_T, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3889 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3890 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
|
3891 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
|
3892 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3893 // Allocate an array for the indexes. |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
3894 text_prop_idxs = ALLOC_MULT(int, text_prop_count); |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3895 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3896 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3897 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3898 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3899 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3900 |
| 504 | 3901 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3902 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3903 |
| 7 | 3904 #ifdef FEAT_RIGHTLEFT |
| 3905 if (wp->w_p_rl) | |
| 3906 { | |
| 3907 /* Rightleft window: process the text in the normal direction, but put | |
| 3908 * it in current_ScreenLine[] from right to left. Start at the | |
| 3909 * 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
|
3910 col = wp->w_width - 1; |
| 7 | 3911 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3912 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3913 } |
| 3914 #endif | |
| 3915 | |
| 3916 /* | |
| 3917 * Repeat for the whole displayed line. | |
| 3918 */ | |
| 3919 for (;;) | |
| 3920 { | |
| 6947 | 3921 #ifdef FEAT_CONCEAL |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
3922 int has_match_conc = 0; // match wants to conceal |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
3923 int did_decrement_ptr = FALSE; |
| 6947 | 3924 #endif |
| 7 | 3925 /* Skip this quickly when working on the text. */ |
| 3926 if (draw_state != WL_LINE) | |
| 3927 { | |
| 3928 #ifdef FEAT_CMDWIN | |
| 3929 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3930 { | |
| 3931 draw_state = WL_CMDLINE; | |
| 3932 if (cmdwin_type != 0 && wp == curwin) | |
| 3933 { | |
| 3934 /* Draw the cmdline character. */ | |
| 3935 n_extra = 1; | |
| 1340 | 3936 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
|
3937 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3938 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3939 } |
| 3940 } | |
| 3941 #endif | |
| 3942 | |
| 3943 #ifdef FEAT_FOLDING | |
| 3944 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3945 { | |
| 6553 | 3946 int fdc = compute_foldcolumn(wp, 0); |
| 3947 | |
| 7 | 3948 draw_state = WL_FOLD; |
| 6553 | 3949 if (fdc > 0) |
| 7 | 3950 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3951 /* 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
|
3952 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3953 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3954 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3955 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3956 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3957 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3958 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
|
3959 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3960 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3961 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3962 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
|
3963 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3964 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_FC)); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3965 } |
| 7 | 3966 } |
| 3967 } | |
| 3968 #endif | |
| 3969 | |
| 3970 #ifdef FEAT_SIGNS | |
| 3971 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3972 { | |
| 3973 draw_state = WL_SIGN; | |
| 3974 /* Show the sign column when there are any signs in this | |
| 3975 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3976 if (signcolumn_on(wp)) |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3977 get_sign_display_info(FALSE, wp, lnum, wcr_attr, row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3978 startrow, filler_lines, filler_todo, &c_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3979 &c_final, extra, &p_extra, &n_extra, &char_attr); |
| 7 | 3980 } |
| 3981 #endif | |
| 3982 | |
| 3983 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3984 { | |
| 3985 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3986 /* 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
|
3987 * 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
|
3988 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3989 && (row == startrow |
| 3990 #ifdef FEAT_DIFF | |
| 3991 + filler_lines | |
| 3992 #endif | |
| 3993 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3994 { | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3995 #ifdef FEAT_SIGNS |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3996 // If 'signcolumn' is set to 'number' and a sign is present |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3997 // in 'lnum', then display the sign instead of the line |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3998 // number. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
3999 if ((*wp->w_p_scl == 'n' && *(wp->w_p_scl + 1) == 'u') |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4000 && buf_findsign_id(wp->w_buffer, lnum, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4001 (char_u *)"*") != 0) |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4002 get_sign_display_info(TRUE, wp, lnum, wcr_attr, row, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4003 startrow, filler_lines, filler_todo, &c_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4004 &c_final, extra, &p_extra, &n_extra, |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4005 &char_attr); |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4006 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4007 #endif |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4008 { |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4009 /* Draw the line number (empty space after wrapping). */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4010 if (row == startrow |
| 7 | 4011 #ifdef FEAT_DIFF |
| 4012 + filler_lines | |
| 4013 #endif | |
| 4014 ) | |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4015 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4016 long num; |
| 4065 | 4017 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4018 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4019 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
|
4020 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4021 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4022 else |
| 4065 | 4023 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4024 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 4025 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
|
4026 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 4027 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4028 /* 'number' + 'relativenumber' */ |
| 4065 | 4029 num = lnum; |
| 4030 fmt = "%-*ld "; | |
| 4031 } | |
| 4032 } | |
| 4033 | |
| 4034 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4035 number_width(wp), num); |
| 7 | 4036 if (wp->w_skipcol > 0) |
| 4037 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 4038 *p_extra = '-'; | |
| 4039 #ifdef FEAT_RIGHTLEFT | |
| 4040 if (wp->w_p_rl) /* reverse line numbers */ | |
|
16137
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4041 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4042 char_u *p1, *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4043 int t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4044 |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4045 // like rl_mirror(), but keep the space at the end |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4046 p2 = skiptowhite(extra) - 1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4047 for (p1 = extra; p1 < p2; ++p1, --p2) |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4048 { |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4049 t = *p1; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4050 *p1 = *p2; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4051 *p2 = t; |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4052 } |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4053 } |
| 7 | 4054 #endif |
| 4055 p_extra = extra; | |
| 4056 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
|
4057 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4058 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4059 else |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4060 { |
| 7 | 4061 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4062 c_final = NUL; |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4063 } |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4064 n_extra = number_width(wp) + 1; |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4065 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4066 #ifdef FEAT_SYN_HL |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4067 /* When 'cursorline' is set highlight the line number of |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4068 * the current line differently. |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4069 * TODO: Can we use CursorLine instead of CursorLineNr |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4070 * when CursorLineNr isn't set? */ |
|
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4071 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4072 && lnum == wp->w_cursor.lnum) |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4073 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4074 #endif |
|
17129
4fb68abc770f
patch 8.1.1564: sign column takes up space
Bram Moolenaar <Bram@vim.org>
parents:
17117
diff
changeset
|
4075 } |
| 7 | 4076 } |
| 4077 } | |
| 4078 | |
| 5995 | 4079 #ifdef FEAT_LINEBREAK |
| 4080 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4081 && n_extra == 0 && *p_sbr != NUL) | |
| 4082 /* draw indent after showbreak value */ | |
| 4083 draw_state = WL_BRI; | |
| 4084 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4085 /* After the showbreak, draw the breakindent */ | |
| 4086 draw_state = WL_BRI - 1; | |
| 4087 | |
| 4088 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4089 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4090 { | |
| 4091 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4092 /* 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
|
4093 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
|
4094 && (row != startrow || need_showbreak) |
| 5995 | 4095 # ifdef FEAT_DIFF |
| 4096 && filler_lines == 0 | |
| 6834 | 4097 # endif |
| 5995 | 4098 ) |
| 4099 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4100 char_attr = 0; |
| 6834 | 4101 # ifdef FEAT_DIFF |
| 5995 | 4102 if (diff_hlf != (hlf_T)0) |
| 6106 | 4103 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4104 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4105 # ifdef FEAT_SYN_HL |
| 6106 | 4106 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4107 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
|
4108 HL_ATTR(HLF_CUL)); |
| 6834 | 4109 # endif |
| 6106 | 4110 } |
| 6834 | 4111 # endif |
| 6028 | 4112 p_extra = NULL; |
| 5995 | 4113 c_extra = ' '; |
| 4114 n_extra = get_breakindent_win(wp, | |
| 4115 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4116 /* Correct end of highlighted area for 'breakindent', | |
| 4117 * required when 'linebreak' is also set. */ | |
| 4118 if (tocol == vcol) | |
| 4119 tocol += n_extra; | |
| 4120 } | |
| 4121 } | |
| 4122 #endif | |
| 4123 | |
| 7 | 4124 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4125 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4126 { | |
| 4127 draw_state = WL_SBR; | |
| 4128 # ifdef FEAT_DIFF | |
| 4129 if (filler_todo > 0) | |
| 4130 { | |
| 4131 /* Draw "deleted" diff line(s). */ | |
| 4132 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
|
4133 { |
| 7 | 4134 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4135 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4136 } |
| 7 | 4137 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4138 { |
| 7 | 4139 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
|
4140 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4141 } |
| 7 | 4142 # ifdef FEAT_RIGHTLEFT |
| 4143 if (wp->w_p_rl) | |
| 4144 n_extra = col + 1; | |
| 4145 else | |
| 4146 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4147 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
|
4148 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4149 } |
| 4150 # endif | |
| 4151 # ifdef FEAT_LINEBREAK | |
| 4152 if (*p_sbr != NUL && need_showbreak) | |
| 4153 { | |
| 4154 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4155 p_extra = p_sbr; | |
| 4156 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
|
4157 c_final = NUL; |
| 7 | 4158 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
|
4159 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4160 need_showbreak = FALSE; |
| 6503 | 4161 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4162 /* Correct end of highlighted area for 'showbreak', |
| 4163 * required when 'linebreak' is also set. */ | |
| 4164 if (tocol == vcol) | |
| 4165 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4166 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4167 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4168 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4169 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
|
4170 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4171 #endif |
| 7 | 4172 } |
| 4173 # endif | |
| 4174 } | |
| 4175 #endif | |
| 4176 | |
| 4177 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4178 { | |
| 4179 draw_state = WL_LINE; | |
| 4180 if (saved_n_extra) | |
| 4181 { | |
| 4182 /* Continue item from end of wrapped line. */ | |
| 4183 n_extra = saved_n_extra; | |
| 4184 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
|
4185 c_final = saved_c_final; |
| 7 | 4186 p_extra = saved_p_extra; |
| 4187 char_attr = saved_char_attr; | |
| 4188 } | |
| 4189 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4190 char_attr = win_attr; |
| 7 | 4191 } |
| 4192 } | |
| 4193 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4194 // 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
|
4195 // 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
|
4196 // 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
|
4197 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4198 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4199 #ifdef FEAT_DIFF |
| 4200 && filler_todo <= 0 | |
| 4201 #endif | |
| 4202 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4203 || (number_only && draw_state > WL_NR)) |
| 7 | 4204 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4205 screen_line(screen_row, wp->w_wincol, col, -(int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4206 screen_line_flags); |
| 819 | 4207 /* Pretend we have finished updating the window. Except when |
| 4208 * 'cursorcolumn' is set. */ | |
| 4209 #ifdef FEAT_SYN_HL | |
| 4210 if (wp->w_p_cuc) | |
| 4211 row = wp->w_cline_row + wp->w_cline_height; | |
| 4212 else | |
| 4213 #endif | |
| 4214 row = wp->w_height; | |
| 7 | 4215 break; |
| 4216 } | |
| 4217 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4218 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
|
4219 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4220 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4221 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4222 )) |
| 7 | 4223 { |
| 4224 /* handle Visual or match highlighting in this line */ | |
| 4225 if (vcol == fromcol | |
| 4226 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4227 && (*mb_ptr2cells)(ptr) > 1) | |
| 4228 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4229 && vcol_prev < vcol /* not at margin */ |
| 7 | 4230 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4231 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4232 else if (area_attr != 0 |
| 4233 && (vcol == tocol | |
| 4234 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4235 area_attr = 0; /* stop highlighting */ | |
| 4236 | |
| 4237 #ifdef FEAT_SEARCH_EXTRA | |
| 4238 if (!n_extra) | |
| 4239 { | |
| 4240 /* | |
| 4241 * Check for start/end of search pattern match. | |
| 4242 * After end, check for start/end of next match. | |
| 4243 * When another match, have to check for start again. | |
| 4244 * Watch out for matching an empty string! | |
| 1326 | 4245 * Do this for 'search_hl' and the match list (ordered by |
| 4246 * priority). | |
| 7 | 4247 */ |
| 36 | 4248 v = (long)(ptr - line); |
| 1326 | 4249 cur = wp->w_match_head; |
|
17117
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4250 shl_flag = FALSE; |
| 1326 | 4251 while (cur != NULL || shl_flag == FALSE) |
| 4252 { | |
| 4253 if (shl_flag == FALSE | |
| 4254 && ((cur != NULL | |
| 4255 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4256 || cur == NULL)) | |
| 4257 { | |
| 4258 shl = &search_hl; | |
| 4259 shl_flag = TRUE; | |
|
17117
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4260 if (screen_line_flags & SLF_POPUP) |
|
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4261 continue; // do not use search_hl |
| 1326 | 4262 } |
| 4263 else | |
| 4264 shl = &cur->hl; | |
| 5979 | 4265 if (cur != NULL) |
| 4266 cur->pos.cur = 0; | |
| 4267 pos_inprogress = TRUE; | |
| 4268 while (shl->rm.regprog != NULL | |
| 4269 || (cur != NULL && pos_inprogress)) | |
| 7 | 4270 { |
| 36 | 4271 if (shl->startcol != MAXCOL |
| 4272 && v >= (long)shl->startcol | |
| 4273 && v < (long)shl->endcol) | |
| 7 | 4274 { |
| 6430 | 4275 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4276 | |
| 4277 if (shl->endcol < tmp_col) | |
| 4278 shl->endcol = tmp_col; | |
| 7 | 4279 shl->attr_cur = shl->attr; |
| 6947 | 4280 #ifdef FEAT_CONCEAL |
|
16154
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4281 // Match with the "Conceal" group results in hiding |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4282 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4283 if (cur != NULL |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4284 && shl != &search_hl |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4285 && syn_name2id((char_u *)"Conceal") |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4286 == cur->hlg_id) |
| 6947 | 4287 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4288 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4289 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4290 match_conc = cur->conceal_char; |
| 4291 } | |
| 4292 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4293 has_match_conc = match_conc = 0; |
| 6947 | 4294 #endif |
| 7 | 4295 } |
| 6430 | 4296 else if (v == (long)shl->endcol) |
| 7 | 4297 { |
| 4298 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4299 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
|
4300 shl == &search_hl ? NULL : cur); |
| 5979 | 4301 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4302 ? FALSE : TRUE; |
| 7 | 4303 |
| 4304 /* Need to get the line again, a multi-line regexp | |
| 4305 * may have made it invalid. */ | |
| 4306 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4307 ptr = line + v; | |
| 4308 | |
| 4309 if (shl->lnum == lnum) | |
| 4310 { | |
| 36 | 4311 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4312 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4313 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4314 else |
| 36 | 4315 shl->endcol = MAXCOL; |
| 4316 | |
| 4317 if (shl->startcol == shl->endcol) | |
| 7 | 4318 { |
| 4319 /* highlight empty match, try again after | |
| 4320 * it */ | |
| 4321 if (has_mbyte) | |
| 474 | 4322 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4323 + shl->endcol); |
| 7 | 4324 else |
| 36 | 4325 ++shl->endcol; |
| 7 | 4326 } |
| 4327 | |
| 4328 /* Loop to check if the match starts at the | |
| 4329 * current position */ | |
| 4330 continue; | |
| 4331 } | |
| 4332 } | |
| 4333 break; | |
| 4334 } | |
| 1326 | 4335 if (shl != &search_hl && cur != NULL) |
| 4336 cur = cur->next; | |
| 4337 } | |
| 4338 | |
| 4339 /* Use attributes from match with highest priority among | |
| 4340 * 'search_hl' and the match list. */ | |
| 4341 cur = wp->w_match_head; | |
| 4342 shl_flag = FALSE; | |
|
17117
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4343 search_attr = 0; |
| 1326 | 4344 while (cur != NULL || shl_flag == FALSE) |
| 4345 { | |
| 4346 if (shl_flag == FALSE | |
| 4347 && ((cur != NULL | |
| 4348 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4349 || cur == NULL)) | |
| 699 | 4350 { |
| 1326 | 4351 shl = &search_hl; |
| 4352 shl_flag = TRUE; | |
|
17117
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4353 if (screen_line_flags & SLF_POPUP) |
|
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
4354 continue; // do not use search_hl |
| 699 | 4355 } |
| 1326 | 4356 else |
| 4357 shl = &cur->hl; | |
| 4358 if (shl->attr_cur != 0) | |
| 4359 search_attr = shl->attr_cur; | |
| 4360 if (shl != &search_hl && cur != NULL) | |
| 4361 cur = cur->next; | |
| 4362 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4363 /* 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
|
4364 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
|
4365 || (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
|
4366 search_attr = 0; |
| 7 | 4367 } |
| 4368 #endif | |
| 4369 | |
| 4370 #ifdef FEAT_DIFF | |
| 674 | 4371 if (diff_hlf != (hlf_T)0) |
| 7 | 4372 { |
| 1295 | 4373 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4374 && n_extra == 0) | |
| 7 | 4375 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4376 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4377 && n_extra == 0) | |
| 7 | 4378 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
|
4379 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4380 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
|
4381 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4382 } |
| 4383 #endif | |
| 4384 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4385 #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
|
4386 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
|
4387 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4388 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4389 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
|
4390 |
|
17143
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4391 if (n_extra > 0) |
|
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4392 --bcol; // still working on the previous char, e.g. Tab |
|
ee090ecd70f6
patch 8.1.1571: textprop highlight starts too early if just after a tab
Bram Moolenaar <Bram@vim.org>
parents:
17141
diff
changeset
|
4393 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4394 // 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
|
4395 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
|
4396 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4397 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
|
4398 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4399 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
|
4400 + 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
|
4401 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4402 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
|
4403 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
|
4404 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
|
4405 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4406 * (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
|
4407 --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
|
4408 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4409 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4410 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4411 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4412 // 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
|
4413 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
|
4414 && 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
|
4415 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
|
4416 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4417 text_prop_attr = 0; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4418 text_prop_combine = FALSE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4419 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
|
4420 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4421 // 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
|
4422 // 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
|
4423 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
|
4424 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
|
4425 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
|
4426 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
|
4427 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4428 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
|
4429 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4430 int tpi = text_prop_idxs[pi]; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4431 proptype_T *pt = text_prop_type_by_id( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4432 wp->w_buffer, text_props[tpi].tp_type); |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4433 |
|
17208
13d0753511fe
patch 8.1.1603: crash when using unknown highlighting in text property
Bram Moolenaar <Bram@vim.org>
parents:
17196
diff
changeset
|
4434 if (pt != NULL && pt->pt_hl_id > 0) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4435 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4436 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
|
4437 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4438 text_prop_type = pt; |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4439 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4440 hl_combine_attr(text_prop_attr, pt_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4441 text_prop_combine = pt->pt_flags & PT_FLAG_COMBINE; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4442 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4443 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4444 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4445 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4446 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4447 |
| 674 | 4448 /* Decide which of the highlight attributes to use. */ |
| 4449 attr_pri = TRUE; | |
| 6717 | 4450 #ifdef LINE_ATTR |
| 674 | 4451 if (area_attr != 0) |
| 6717 | 4452 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4453 else if (search_attr != 0) |
| 6717 | 4454 char_attr = hl_combine_attr(line_attr, search_attr); |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4455 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4456 else if (text_prop_type != NULL) |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4457 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4458 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4459 line_attr != 0 ? line_attr : win_attr, text_prop_attr); |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4460 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4461 # endif |
| 674 | 4462 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4463 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4464 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4465 // Use line_attr when not in the Visual or 'incsearch' area |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4466 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4467 char_attr = line_attr; |
| 6717 | 4468 #else |
| 4469 if (area_attr != 0) | |
| 4470 char_attr = area_attr; | |
| 4471 else if (search_attr != 0) | |
| 4472 char_attr = search_attr; | |
| 674 | 4473 #endif |
| 4474 else | |
| 4475 { | |
| 4476 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4477 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4478 if (text_prop_type != NULL) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4479 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4480 if (text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4481 char_attr = hl_combine_attr( |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4482 syntax_attr, text_prop_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4483 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4484 char_attr = hl_combine_attr( |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4485 win_attr, text_prop_attr); |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4486 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4487 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4488 #endif |
| 674 | 4489 #ifdef FEAT_SYN_HL |
| 4490 if (has_syntax) | |
| 4491 char_attr = syntax_attr; | |
| 4492 else | |
| 4493 #endif | |
| 4494 char_attr = 0; | |
| 4495 } | |
| 7 | 4496 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4497 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4498 char_attr = win_attr; |
| 7 | 4499 |
| 4500 /* | |
| 4501 * Get the next character to put on the screen. | |
| 4502 */ | |
| 4503 /* | |
| 1340 | 4504 * The "p_extra" points to the extra stuff that is inserted to |
| 4505 * represent special characters (non-printable stuff) and other | |
| 4506 * 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
|
4507 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4508 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4509 * "p_extra[n_extra]". | |
| 7 | 4510 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4511 */ | |
| 4512 if (n_extra > 0) | |
| 4513 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4514 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
|
4515 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4516 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4517 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
|
4518 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4519 { |
| 4520 mb_utf8 = TRUE; | |
| 714 | 4521 u8cc[0] = 0; |
| 819 | 4522 c = 0xc0; |
| 7 | 4523 } |
| 4524 else | |
| 4525 mb_utf8 = FALSE; | |
| 4526 } | |
| 4527 else | |
| 4528 { | |
| 4529 c = *p_extra; | |
| 4530 if (has_mbyte) | |
| 4531 { | |
| 4532 mb_c = c; | |
| 4533 if (enc_utf8) | |
| 4534 { | |
| 4535 /* If the UTF-8 character is more than one byte: | |
| 4536 * 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
|
4537 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4538 mb_utf8 = FALSE; |
| 4539 if (mb_l > n_extra) | |
| 4540 mb_l = 1; | |
| 4541 else if (mb_l > 1) | |
| 4542 { | |
| 714 | 4543 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4544 mb_utf8 = TRUE; |
| 819 | 4545 c = 0xc0; |
| 7 | 4546 } |
| 4547 } | |
| 4548 else | |
| 4549 { | |
| 4550 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4551 mb_l = MB_BYTE2LEN(c); | |
| 4552 if (mb_l >= n_extra) | |
| 4553 mb_l = 1; | |
| 4554 else if (mb_l > 1) | |
| 4555 mb_c = (c << 8) + p_extra[1]; | |
| 4556 } | |
| 504 | 4557 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4558 mb_l = 1; | |
| 4559 | |
| 7 | 4560 /* If a double-width char doesn't fit display a '>' in the |
| 4561 * last column. */ | |
| 504 | 4562 if (( |
| 7 | 4563 # ifdef FEAT_RIGHTLEFT |
| 4564 wp->w_p_rl ? (col <= 0) : | |
| 4565 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4566 (col >= wp->w_width - 1)) |
| 7 | 4567 && (*mb_char2cells)(mb_c) == 2) |
| 4568 { | |
| 4569 c = '>'; | |
| 4570 mb_c = c; | |
| 4571 mb_l = 1; | |
| 4572 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
|
4573 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4574 /* put the pointer back to output the double-width |
| 4575 * character at the start of the next line. */ | |
| 4576 ++n_extra; | |
| 4577 --p_extra; | |
| 4578 } | |
| 4579 else | |
| 4580 { | |
| 4581 n_extra -= mb_l - 1; | |
| 4582 p_extra += mb_l - 1; | |
| 4583 } | |
| 4584 } | |
| 4585 ++p_extra; | |
| 4586 } | |
| 4587 --n_extra; | |
| 4588 } | |
| 4589 else | |
| 4590 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4591 #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
|
4592 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4593 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4594 |
| 6026 | 4595 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
|
4596 VIM_CLEAR(p_extra_free); |
| 7 | 4597 /* |
| 4598 * Get a character from the line itself. | |
| 4599 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4600 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4601 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4602 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4603 #endif |
| 7 | 4604 if (has_mbyte) |
| 4605 { | |
| 4606 mb_c = c; | |
| 4607 if (enc_utf8) | |
| 4608 { | |
| 4609 /* If the UTF-8 character is more than one byte: Decode it | |
| 4610 * 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
|
4611 mb_l = utfc_ptr2len(ptr); |
| 7 | 4612 mb_utf8 = FALSE; |
| 4613 if (mb_l > 1) | |
| 4614 { | |
| 714 | 4615 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4616 /* Overlong encoded ASCII or ASCII with composing char |
| 4617 * is displayed normally, except a NUL. */ | |
| 4618 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
|
4619 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4620 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4621 #ifdef FEAT_LINEBREAK |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4622 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4623 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4624 } |
| 7 | 4625 mb_utf8 = TRUE; |
| 507 | 4626 |
| 4627 /* At start of the line we can have a composing char. | |
| 4628 * Draw it as a space with a composing char. */ | |
| 4629 if (utf_iscomposing(mb_c)) | |
| 4630 { | |
| 1326 | 4631 int i; |
| 4632 | |
| 714 | 4633 for (i = Screen_mco - 1; i > 0; --i) |
| 4634 u8cc[i] = u8cc[i - 1]; | |
| 4635 u8cc[0] = mb_c; | |
| 507 | 4636 mb_c = ' '; |
| 4637 } | |
| 7 | 4638 } |
| 4639 | |
| 4640 if ((mb_l == 1 && c >= 0x80) | |
| 4641 || (mb_l >= 1 && mb_c == 0) | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4642 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4643 { |
| 4644 /* | |
| 4645 * Illegal UTF-8 byte: display as <xx>. | |
| 4646 * Non-BMP character : display as ? or fullwidth ?. | |
| 4647 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4648 transchar_hex(extra, mb_c); |
| 714 | 4649 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4650 if (wp->w_p_rl) /* reverse */ |
|
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4651 rl_mirror(extra); |
| 714 | 4652 # endif |
| 7 | 4653 p_extra = extra; |
| 4654 c = *p_extra; | |
| 4655 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4656 mb_utf8 = (c >= 0x80); | |
| 4657 n_extra = (int)STRLEN(p_extra); | |
| 4658 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
|
4659 c_final = NUL; |
| 7 | 4660 if (area_attr == 0 && search_attr == 0) |
| 4661 { | |
| 4662 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
|
4663 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4664 saved_attr2 = char_attr; /* save current attr */ |
| 4665 } | |
| 4666 } | |
| 4667 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4668 mb_l = 1; | |
| 4669 #ifdef FEAT_ARABIC | |
| 4670 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4671 { | |
| 4672 /* Do Arabic shaping. */ | |
| 714 | 4673 int pc, pc1, nc; |
| 4674 int pcc[MAX_MCO]; | |
| 7 | 4675 |
| 4676 /* The idea of what is the previous and next | |
| 4677 * character depends on 'rightleft'. */ | |
| 4678 if (wp->w_p_rl) | |
| 4679 { | |
| 4680 pc = prev_c; | |
| 4681 pc1 = prev_c1; | |
| 4682 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4683 prev_c1 = u8cc[0]; |
| 7 | 4684 } |
| 4685 else | |
| 4686 { | |
| 714 | 4687 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4688 nc = prev_c; |
| 714 | 4689 pc1 = pcc[0]; |
| 7 | 4690 } |
| 4691 prev_c = mb_c; | |
| 4692 | |
| 714 | 4693 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4694 } |
| 4695 else | |
| 4696 prev_c = mb_c; | |
| 4697 #endif | |
| 4698 } | |
| 4699 else /* enc_dbcs */ | |
| 4700 { | |
| 4701 mb_l = MB_BYTE2LEN(c); | |
| 4702 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4703 mb_l = 1; | |
| 4704 else if (mb_l > 1) | |
| 4705 { | |
| 4706 /* We assume a second byte below 32 is illegal. | |
| 4707 * Hopefully this is OK for all double-byte encodings! | |
| 4708 */ | |
| 4709 if (ptr[1] >= 32) | |
| 4710 mb_c = (c << 8) + ptr[1]; | |
| 4711 else | |
| 4712 { | |
| 4713 if (ptr[1] == NUL) | |
| 4714 { | |
| 4715 /* head byte at end of line */ | |
| 4716 mb_l = 1; | |
| 4717 transchar_nonprint(extra, c); | |
| 4718 } | |
| 4719 else | |
| 4720 { | |
| 4721 /* illegal tail byte */ | |
| 4722 mb_l = 2; | |
| 4723 STRCPY(extra, "XX"); | |
| 4724 } | |
| 4725 p_extra = extra; | |
| 4726 n_extra = (int)STRLEN(extra) - 1; | |
| 4727 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
|
4728 c_final = NUL; |
| 7 | 4729 c = *p_extra++; |
| 4730 if (area_attr == 0 && search_attr == 0) | |
| 4731 { | |
| 4732 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
|
4733 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4734 saved_attr2 = char_attr; /* save current attr */ |
| 4735 } | |
| 4736 mb_c = c; | |
| 4737 } | |
| 4738 } | |
| 4739 } | |
| 4740 /* If a double-width char doesn't fit display a '>' in the | |
| 4741 * last column; the character is displayed at the start of the | |
| 4742 * next line. */ | |
| 4743 if (( | |
| 4744 # ifdef FEAT_RIGHTLEFT | |
| 4745 wp->w_p_rl ? (col <= 0) : | |
| 4746 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4747 (col >= wp->w_width - 1)) |
| 7 | 4748 && (*mb_char2cells)(mb_c) == 2) |
| 4749 { | |
| 4750 c = '>'; | |
| 4751 mb_c = c; | |
| 4752 mb_utf8 = FALSE; | |
| 4753 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
|
4754 multi_attr = HL_ATTR(HLF_AT); |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4755 // Put pointer back so that the character will be |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4756 // displayed at the start of the next line. |
| 7 | 4757 --ptr; |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4758 #ifdef FEAT_CONCEAL |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4759 did_decrement_ptr = TRUE; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
4760 #endif |
| 7 | 4761 } |
| 4762 else if (*ptr != NUL) | |
| 4763 ptr += mb_l - 1; | |
| 4764 | |
| 4765 /* 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
|
4766 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4767 * 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
|
4768 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4769 { |
| 4770 n_extra = 1; | |
| 3586 | 4771 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
|
4772 c_final = NUL; |
| 7 | 4773 c = ' '; |
| 4774 if (area_attr == 0 && search_attr == 0) | |
| 4775 { | |
| 4776 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
|
4777 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4778 saved_attr2 = char_attr; /* save current attr */ |
| 4779 } | |
| 4780 mb_c = c; | |
| 4781 mb_utf8 = FALSE; | |
| 4782 mb_l = 1; | |
| 4783 } | |
| 4784 | |
| 4785 } | |
| 4786 ++ptr; | |
| 4787 | |
| 4788 if (extra_check) | |
| 4789 { | |
| 743 | 4790 #ifdef FEAT_SPELL |
| 221 | 4791 int can_spell = TRUE; |
| 743 | 4792 #endif |
| 4793 | |
|
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
|
4794 #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
|
4795 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
|
4796 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4797 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
|
4798 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4799 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
|
4800 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
|
4801 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
|
4802 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
|
4803 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4804 #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
|
4805 |
| 743 | 4806 #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
|
4807 // 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
|
4808 // (double-wide char that doesn't fit). |
| 221 | 4809 v = (long)(ptr - line); |
| 4810 if (has_syntax && v > 0) | |
| 7 | 4811 { |
| 4812 /* Get the syntax attribute for the character. If there | |
| 4813 * is an error, disable syntax highlighting. */ | |
| 4814 save_did_emsg = did_emsg; | |
| 4815 did_emsg = FALSE; | |
| 4816 | |
| 221 | 4817 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4818 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4819 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4820 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4821 NULL, FALSE); |
| 7 | 4822 |
| 4823 if (did_emsg) | |
| 482 | 4824 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4825 wp->w_s->b_syn_error = TRUE; |
| 482 | 4826 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4827 syntax_attr = 0; |
| 482 | 4828 } |
| 7 | 4829 else |
| 4830 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4831 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4832 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4833 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4834 syntax_attr = hl_combine_attr(win_attr, syntax_attr); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4835 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4836 #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
|
4837 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
|
4838 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4839 #endif |
| 7 | 4840 |
| 4841 /* Need to get the line again, a multi-line regexp may | |
| 4842 * have made it invalid. */ | |
| 4843 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4844 ptr = line + v; | |
| 4845 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4846 # ifdef FEAT_TEXT_PROP |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4847 // Text properties overrule syntax highlighting or combine. |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4848 if (text_prop_attr == 0 || text_prop_combine) |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4849 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4850 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4851 int comb_attr = syntax_attr; |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4852 # ifdef FEAT_TEXT_PROP |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4853 comb_attr = hl_combine_attr(text_prop_attr, comb_attr); |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4854 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4855 if (!attr_pri) |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4856 char_attr = comb_attr; |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4857 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4858 char_attr = hl_combine_attr(comb_attr, char_attr); |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4859 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4860 # 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
|
4861 /* 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
|
4862 * 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
|
4863 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
|
4864 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
|
4865 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
|
4866 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
|
4867 # endif |
| 7 | 4868 } |
| 743 | 4869 #endif |
| 4870 | |
| 4871 #ifdef FEAT_SPELL | |
| 301 | 4872 /* Check spelling (unless at the end of the line). |
| 319 | 4873 * Only do this when there is no syntax highlighting, the |
| 4874 * @Spell cluster is not used or the current syntax item | |
| 4875 * contains the @Spell cluster. */ | |
| 348 | 4876 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4877 { |
| 230 | 4878 spell_attr = 0; |
| 743 | 4879 if (c != 0 && ( |
| 4880 # ifdef FEAT_SYN_HL | |
| 4881 !has_syntax || | |
| 4882 # endif | |
| 4883 can_spell)) | |
| 221 | 4884 { |
| 348 | 4885 char_u *prev_ptr, *p; |
| 4886 int len; | |
| 534 | 4887 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4888 if (has_mbyte) |
| 4889 { | |
| 4890 prev_ptr = ptr - mb_l; | |
| 4891 v -= mb_l - 1; | |
| 4892 } | |
| 4893 else | |
| 4894 prev_ptr = ptr - 1; | |
| 348 | 4895 |
| 4896 /* Use nextline[] if possible, it has the start of the | |
| 4897 * next line concatenated. */ | |
| 4898 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4899 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4900 else | |
| 4901 p = prev_ptr; | |
| 835 | 4902 cap_col -= (int)(prev_ptr - line); |
| 625 | 4903 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4904 nochange); | |
| 348 | 4905 word_end = v + len; |
| 301 | 4906 |
| 4907 /* In Insert mode only highlight a word that | |
| 4908 * doesn't touch the cursor. */ | |
| 534 | 4909 if (spell_hlf != HLF_COUNT |
| 301 | 4910 && (State & INSERT) != 0 |
| 4911 && wp->w_cursor.lnum == lnum | |
| 4912 && wp->w_cursor.col >= | |
| 4913 (colnr_T)(prev_ptr - line) | |
| 4914 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4915 { |
| 534 | 4916 spell_hlf = HLF_COUNT; |
| 301 | 4917 spell_redraw_lnum = lnum; |
| 221 | 4918 } |
| 348 | 4919 |
| 534 | 4920 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4921 && (p - nextline) + len > nextline_idx) |
| 4922 { | |
| 4923 /* Remember that the good word continues at the | |
| 4924 * start of the next line. */ | |
| 4925 checked_lnum = lnum + 1; | |
| 835 | 4926 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4927 } |
| 386 | 4928 |
| 534 | 4929 /* Turn index into actual attributes. */ |
| 4930 if (spell_hlf != HLF_COUNT) | |
| 4931 spell_attr = highlight_attr[spell_hlf]; | |
| 4932 | |
| 386 | 4933 if (cap_col > 0) |
| 4934 { | |
| 4935 if (p != prev_ptr | |
| 4936 && (p - nextline) + cap_col >= nextline_idx) | |
| 4937 { | |
| 4938 /* Remember that the word in the next line | |
| 4939 * must start with a capital. */ | |
| 4940 capcol_lnum = lnum + 1; | |
| 835 | 4941 cap_col = (int)((p - nextline) + cap_col |
| 4942 - nextline_idx); | |
| 386 | 4943 } |
| 4944 else | |
| 4945 /* Compute the actual column. */ | |
| 835 | 4946 cap_col += (int)(prev_ptr - line); |
| 386 | 4947 } |
| 221 | 4948 } |
| 4949 } | |
| 4950 if (spell_attr != 0) | |
| 348 | 4951 { |
| 674 | 4952 if (!attr_pri) |
| 348 | 4953 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4954 else | |
| 4955 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4956 } | |
| 7 | 4957 #endif |
| 4958 #ifdef FEAT_LINEBREAK | |
| 4959 /* | |
| 221 | 4960 * Found last space before word: check for line break. |
| 7 | 4961 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4962 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
|
4963 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4964 { |
| 6693 | 4965 int mb_off = has_mbyte ? (*mb_head_off)(line, ptr - 1) : 0; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4966 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4967 |
| 5995 | 4968 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4969 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4970 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4971 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
|
4972 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4973 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
|
4974 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
|
4975 # else |
| 6371 | 4976 n_extra = (int)wp->w_buffer->b_p_ts |
| 4977 - 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
|
4978 # endif |
| 6371 | 4979 |
| 6693 | 4980 c_extra = mb_off > 0 ? 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
|
4981 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4982 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4983 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4984 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4985 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4986 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4987 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4988 #endif |
| 6026 | 4989 if (!wp->w_p_list) |
| 4990 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4991 } |
| 7 | 4992 } |
| 4993 #endif | |
| 4994 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4995 // 'list': Change char 160 to lcs_nbsp and space to lcs_space. |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4996 // But not when the character is followed by a composing |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4997 // character (use mb_l to check that). |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4998 if (wp->w_p_list |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4999 && ((((c == 160 && mb_l == 1) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5000 || (mb_utf8 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5001 && ((mb_c == 160 && mb_l == 2) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5002 || (mb_c == 0x202f && mb_l == 3)))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5003 && lcs_nbsp) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5004 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5005 && mb_l == 1 |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5006 && lcs_space |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5007 && ptr - line <= trailcol))) |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5008 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5009 c = (c == ' ') ? lcs_space : lcs_nbsp; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5010 if (area_attr == 0 && search_attr == 0) |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5011 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5012 n_attr = 1; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5013 extra_attr = HL_ATTR(HLF_8); |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5014 saved_attr2 = char_attr; /* save current attr */ |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5015 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5016 mb_c = c; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5017 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
|
5018 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5019 mb_utf8 = TRUE; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5020 u8cc[0] = 0; |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5021 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5022 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5023 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5024 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5025 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5026 |
| 7 | 5027 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 5028 { | |
| 5029 c = lcs_trail; | |
| 674 | 5030 if (!attr_pri) |
| 7 | 5031 { |
| 5032 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
|
5033 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5034 saved_attr2 = char_attr; /* save current attr */ |
| 5035 } | |
| 5036 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
|
5037 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5038 { |
| 5039 mb_utf8 = TRUE; | |
| 714 | 5040 u8cc[0] = 0; |
| 819 | 5041 c = 0xc0; |
| 7 | 5042 } |
| 5043 else | |
| 5044 mb_utf8 = FALSE; | |
| 5045 } | |
| 5046 } | |
| 5047 | |
| 5048 /* | |
| 5049 * Handling of non-printable characters. | |
| 5050 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5051 if (!vim_isprintc(c)) |
| 7 | 5052 { |
| 5053 /* | |
| 5054 * when getting a character from the file, we may have to | |
| 5055 * turn it into something else on the way to putting it | |
| 5056 * into "ScreenLines". | |
| 5057 */ | |
| 5058 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5059 { | |
| 6026 | 5060 int tab_len = 0; |
| 6503 | 5061 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5062 #ifdef FEAT_LINEBREAK | |
| 5063 /* only adjust the tab_len, when at the first column | |
| 5064 * after the showbreak value was drawn */ | |
| 5065 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5066 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5067 #endif | |
| 7 | 5068 /* 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
|
5069 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5070 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
|
5071 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
|
5072 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
|
5073 #else |
| 6026 | 5074 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
|
5075 - 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
|
5076 #endif |
| 6503 | 5077 |
| 6026 | 5078 #ifdef FEAT_LINEBREAK |
| 6100 | 5079 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5080 #endif |
| 5081 /* tab amount depends on current column */ | |
| 5082 n_extra = tab_len; | |
| 5083 #ifdef FEAT_LINEBREAK | |
| 5084 else | |
| 5085 { | |
| 5086 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5087 int len; |
| 6026 | 5088 int i; |
| 5089 int saved_nextra = n_extra; | |
| 5090 | |
| 6172 | 5091 #ifdef FEAT_CONCEAL |
| 6627 | 5092 if (vcol_off > 0) |
| 6172 | 5093 /* there are characters to conceal */ |
| 5094 tab_len += vcol_off; | |
| 6520 | 5095 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5096 */ | |
| 5097 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5098 && n_extra > tab_len) | |
| 5099 tab_len += n_extra - tab_len; | |
| 5100 #endif | |
| 5101 | |
| 6026 | 5102 /* if n_extra > 0, it gives the number of chars, to |
| 5103 * use for a tab, else we need to calculate the width | |
| 5104 * for a tab */ | |
| 5105 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5106 if (n_extra > 0) | |
| 5107 len += n_extra - tab_len; | |
| 5108 c = lcs_tab1; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
5109 p = alloc(len + 1); |
| 6026 | 5110 vim_memset(p, ' ', len); |
| 5111 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5112 vim_free(p_extra_free); |
| 6026 | 5113 p_extra_free = p; |
| 5114 for (i = 0; i < tab_len; i++) | |
| 5115 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5116 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5117 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5118 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5119 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5120 } |
| 6026 | 5121 mb_char2bytes(lcs_tab2, p); |
| 5122 p += mb_char2len(lcs_tab2); | |
| 5123 n_extra += mb_char2len(lcs_tab2) | |
| 5124 - (saved_nextra > 0 ? 1 : 0); | |
| 5125 } | |
| 5126 p_extra = p_extra_free; | |
| 6172 | 5127 #ifdef FEAT_CONCEAL |
| 5128 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5129 * macro below, so need to adjust for that here */ | |
| 6627 | 5130 if (vcol_off > 0) |
| 6172 | 5131 n_extra -= vcol_off; |
| 5132 #endif | |
| 6026 | 5133 } |
| 5134 #endif | |
| 3984 | 5135 #ifdef FEAT_CONCEAL |
| 6627 | 5136 { |
| 5137 int vc_saved = vcol_off; | |
| 5138 | |
| 5139 /* Tab alignment should be identical regardless of | |
| 5140 * 'conceallevel' value. So tab compensates of all | |
| 5141 * previous concealed characters, and thus resets | |
| 5142 * vcol_off and boguscols accumulated so far in the | |
| 5143 * line. Note that the tab can be longer than | |
| 5144 * 'tabstop' when there are concealed characters. */ | |
| 5145 FIX_FOR_BOGUSCOLS; | |
| 5146 | |
| 5147 /* Make sure, the highlighting for the tab char will be | |
| 5148 * correctly set further below (effectively reverts the | |
| 5149 * FIX_FOR_BOGSUCOLS macro */ | |
| 5150 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5151 && lcs_tab1) |
| 6627 | 5152 tab_len += vc_saved; |
| 5153 } | |
| 3984 | 5154 #endif |
| 7 | 5155 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5156 if (wp->w_p_list) | |
| 5157 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5158 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5159 #ifdef FEAT_LINEBREAK |
| 5160 if (wp->w_p_lbr) | |
| 5161 c_extra = NUL; /* using p_extra from above */ | |
| 5162 else | |
| 5163 #endif | |
| 5164 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
|
5165 c_final = lcs_tab3; |
| 6026 | 5166 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
|
5167 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5168 saved_attr2 = char_attr; /* save current attr */ |
| 5169 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
|
5170 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5171 { |
| 5172 mb_utf8 = TRUE; | |
| 714 | 5173 u8cc[0] = 0; |
| 819 | 5174 c = 0xc0; |
| 7 | 5175 } |
| 5176 } | |
| 5177 else | |
| 5178 { | |
|
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; |
| 7 | 5180 c_extra = ' '; |
| 5181 c = ' '; | |
| 5182 } | |
| 5183 } | |
| 36 | 5184 else if (c == NUL |
| 6799 | 5185 && (wp->w_p_list |
| 36 | 5186 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5187 && tocol > vcol | |
| 5188 && VIsual_mode != Ctrl_V | |
| 5189 && ( | |
| 5190 # ifdef FEAT_RIGHTLEFT | |
| 5191 wp->w_p_rl ? (col >= 0) : | |
| 5192 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5193 (col < wp->w_width)) |
| 36 | 5194 && !(noinvcur |
| 1850 | 5195 && lnum == wp->w_cursor.lnum |
| 36 | 5196 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5197 && lcs_eol_one > 0) |
| 7 | 5198 { |
| 36 | 5199 /* Display a '$' after the line or highlight an extra |
| 5200 * character if the line break is included. */ | |
| 7 | 5201 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5202 /* For a diff line the highlighting continues after the | |
| 5203 * "$". */ | |
| 5204 if ( | |
| 5205 # ifdef FEAT_DIFF | |
| 534 | 5206 diff_hlf == (hlf_T)0 |
| 7 | 5207 # ifdef LINE_ATTR |
| 5208 && | |
| 5209 # endif | |
| 5210 # endif | |
| 5211 # ifdef LINE_ATTR | |
| 5212 line_attr == 0 | |
| 5213 # endif | |
| 5214 ) | |
| 5215 #endif | |
| 5216 { | |
| 5217 /* In virtualedit, visual selections may extend | |
| 5218 * beyond end of line. */ | |
| 5219 if (area_highlighting && virtual_active() | |
| 5220 && tocol != MAXCOL && vcol < tocol) | |
| 5221 n_extra = 0; | |
| 5222 else | |
| 5223 { | |
| 5224 p_extra = at_end_str; | |
| 5225 n_extra = 1; | |
| 5226 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
|
5227 c_final = NUL; |
| 7 | 5228 } |
| 5229 } | |
| 6799 | 5230 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5231 c = lcs_eol; |
| 5232 else | |
| 5233 c = ' '; | |
| 7 | 5234 lcs_eol_one = -1; |
| 5235 --ptr; /* put it back at the NUL */ | |
| 674 | 5236 if (!attr_pri) |
| 7 | 5237 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5238 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5239 n_attr = 1; |
| 5240 } | |
| 5241 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
|
5242 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5243 { |
| 5244 mb_utf8 = TRUE; | |
| 714 | 5245 u8cc[0] = 0; |
| 819 | 5246 c = 0xc0; |
| 7 | 5247 } |
| 5248 else | |
| 5249 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5250 } | |
| 5251 else if (c != NUL) | |
| 5252 { | |
| 5253 p_extra = transchar(c); | |
| 6064 | 5254 if (n_extra == 0) |
| 5255 n_extra = byte2cells(c) - 1; | |
| 7 | 5256 #ifdef FEAT_RIGHTLEFT |
| 5257 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5258 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5259 #endif | |
| 5260 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
|
5261 c_final = NUL; |
| 6026 | 5262 #ifdef FEAT_LINEBREAK |
| 5263 if (wp->w_p_lbr) | |
| 5264 { | |
| 5265 char_u *p; | |
| 5266 | |
| 5267 c = *p_extra; | |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
5268 p = alloc(n_extra + 1); |
| 6026 | 5269 vim_memset(p, ' ', n_extra); |
| 5270 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5271 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5272 vim_free(p_extra_free); |
| 6026 | 5273 p_extra_free = p_extra = p; |
| 5274 } | |
| 5275 else | |
| 5276 #endif | |
| 5277 { | |
| 5278 n_extra = byte2cells(c) - 1; | |
| 5279 c = *p_extra++; | |
| 5280 } | |
| 674 | 5281 if (!attr_pri) |
| 7 | 5282 { |
| 5283 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
|
5284 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5285 saved_attr2 = char_attr; /* save current attr */ |
| 5286 } | |
| 5287 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5288 } | |
| 5289 else if (VIsual_active | |
| 5290 && (VIsual_mode == Ctrl_V | |
| 5291 || VIsual_mode == 'v') | |
| 5292 && virtual_active() | |
| 5293 && tocol != MAXCOL | |
| 5294 && vcol < tocol | |
| 5295 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5296 #ifdef FEAT_RIGHTLEFT |
| 7 | 5297 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5298 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5299 (col < wp->w_width))) |
| 7 | 5300 { |
| 5301 c = ' '; | |
| 5302 --ptr; /* put it back at the NUL */ | |
| 5303 } | |
| 910 | 5304 #if defined(LINE_ATTR) |
| 7 | 5305 else if (( |
| 5306 # ifdef FEAT_DIFF | |
| 910 | 5307 diff_hlf != (hlf_T)0 || |
| 7 | 5308 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5309 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5310 win_attr != 0 || |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5311 # endif |
| 7 | 5312 line_attr != 0 |
| 5313 ) && ( | |
| 5314 # ifdef FEAT_RIGHTLEFT | |
| 5315 wp->w_p_rl ? (col >= 0) : | |
| 5316 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5317 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5318 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5319 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5320 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5321 < wp->w_width))) |
| 7 | 5322 { |
| 5323 /* Highlight until the right side of the window */ | |
| 5324 c = ' '; | |
| 5325 --ptr; /* put it back at the NUL */ | |
| 867 | 5326 |
| 5327 /* Remember we do the char for line highlighting. */ | |
| 5328 ++did_line_attr; | |
| 5329 | |
| 5330 /* 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
|
5331 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
|
5332 && (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
|
5333 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5334 char_attr = line_attr; |
| 7 | 5335 # ifdef FEAT_DIFF |
| 5336 if (diff_hlf == HLF_TXD) | |
| 5337 { | |
| 5338 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5339 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5340 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5341 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5342 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5343 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
|
5344 HL_ATTR(HLF_CUL)); |
| 6106 | 5345 } |
| 7 | 5346 } |
| 5347 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5348 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5349 if (win_attr != 0) |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5350 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5351 char_attr = win_attr; |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5352 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
|
5353 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
|
5354 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
|
5355 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5356 # endif |
| 7 | 5357 } |
| 5358 #endif | |
| 5359 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5360 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5361 #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
|
5362 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
|
5363 && (wp != curwin || lnum != wp->w_cursor.lnum || |
|
16154
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5364 conceal_cursor_line(wp)) |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
5365 && ((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
|
5366 && !(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
|
5367 && 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
|
5368 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5369 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5370 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5371 && (syn_get_sub_char() != NUL || match_conc |
| 5372 || 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
|
5373 && 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
|
5374 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5375 /* 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
|
5376 * character. */ |
| 6947 | 5377 if (match_conc) |
| 5378 c = match_conc; | |
| 5379 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
|
5380 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5381 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5382 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5383 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5384 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5385 |
|
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
|
5386 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5387 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5388 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5389 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5390 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5391 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
|
5392 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5393 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5394 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5395 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5396 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5397 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5398 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5399 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5400 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5401 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5402 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5403 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5404 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5405 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5406 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5407 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5408 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5409 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5410 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5411 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5412 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5413 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5414 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
|
5415 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
|
5416 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5417 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5418 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5419 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5420 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5421 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5422 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
|
5423 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5424 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5425 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5426 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
|
5427 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5428 } |
|
16672
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5429 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5430 if (n_skip > 0 && did_decrement_ptr) |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5431 // not showing the '>', put pointer back to avoid getting stuck |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5432 ++ptr; |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5433 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5434 #endif // FEAT_CONCEAL |
| 7 | 5435 } |
| 5436 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5437 #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
|
5438 /* 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
|
5439 * 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
|
5440 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
|
5441 && 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
|
5442 && 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
|
5443 && (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
|
5444 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5445 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5446 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
|
5447 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
|
5448 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5449 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5450 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
|
5451 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
|
5452 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
|
5453 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5454 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5455 |
| 7 | 5456 /* Don't override visual selection highlighting. */ |
| 5457 if (n_attr > 0 | |
| 5458 && draw_state == WL_LINE | |
| 674 | 5459 && !attr_pri) |
| 7 | 5460 char_attr = extra_attr; |
| 5461 | |
| 42 | 5462 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5463 /* XIM don't send preedit_start and preedit_end, but they send |
| 5464 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5465 * 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
|
5466 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
|
5467 && xic != NULL |
| 1850 | 5468 && lnum == wp->w_cursor.lnum |
| 7 | 5469 && (State & INSERT) |
| 5470 && !p_imdisable | |
| 5471 && im_is_preediting() | |
| 5472 && draw_state == WL_LINE) | |
| 5473 { | |
| 5474 colnr_T tcol; | |
| 5475 | |
| 5476 if (preedit_end_col == MAXCOL) | |
| 1850 | 5477 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5478 else |
| 5479 tcol = preedit_end_col; | |
| 5480 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5481 { | |
| 5482 if (feedback_old_attr < 0) | |
| 5483 { | |
| 5484 feedback_col = 0; | |
| 5485 feedback_old_attr = char_attr; | |
| 5486 } | |
| 5487 char_attr = im_get_feedback_attr(feedback_col); | |
| 5488 if (char_attr < 0) | |
| 5489 char_attr = feedback_old_attr; | |
| 5490 feedback_col++; | |
| 5491 } | |
| 5492 else if (feedback_old_attr >= 0) | |
| 5493 { | |
| 5494 char_attr = feedback_old_attr; | |
| 5495 feedback_old_attr = -1; | |
| 5496 feedback_col = 0; | |
| 5497 } | |
| 5498 } | |
| 5499 #endif | |
| 5500 /* | |
| 5501 * Handle the case where we are in column 0 but not on the first | |
| 5502 * character of the line and the user wants us to show us a | |
| 5503 * special character (via 'listchars' option "precedes:<char>". | |
| 5504 */ | |
| 5505 if (lcs_prec_todo != NUL | |
| 6276 | 5506 && wp->w_p_list |
| 7 | 5507 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5508 #ifdef FEAT_DIFF | |
| 5509 && filler_todo <= 0 | |
| 5510 #endif | |
| 5511 && draw_state > WL_NR | |
| 5512 && c != NUL) | |
| 5513 { | |
| 5514 c = lcs_prec; | |
| 5515 lcs_prec_todo = NUL; | |
| 3586 | 5516 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5517 { | |
| 5518 /* Double-width character being overwritten by the "precedes" | |
| 5519 * character, need to fill up half the character. */ | |
| 5520 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
|
5521 c_final = NUL; |
| 3586 | 5522 n_extra = 1; |
| 5523 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
|
5524 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5525 } |
| 7 | 5526 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
|
5527 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5528 { |
| 5529 mb_utf8 = TRUE; | |
| 714 | 5530 u8cc[0] = 0; |
| 819 | 5531 c = 0xc0; |
| 7 | 5532 } |
| 5533 else | |
| 5534 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5535 if (!attr_pri) |
| 7 | 5536 { |
| 5537 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
|
5538 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5539 n_attr3 = 1; |
| 5540 } | |
| 5541 } | |
| 5542 | |
| 5543 /* | |
| 867 | 5544 * At end of the text line or just after the last character. |
| 7 | 5545 */ |
| 867 | 5546 if (c == NUL |
| 910 | 5547 #if defined(LINE_ATTR) |
| 867 | 5548 || did_line_attr == 1 |
| 5549 #endif | |
| 5550 ) | |
| 5551 { | |
| 5552 #ifdef FEAT_SEARCH_EXTRA | |
| 5553 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5554 |
| 5555 /* we're not really at that column when skipping some text */ | |
| 1439 | 5556 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5557 ++prevcol; |
| 867 | 5558 #endif |
| 5559 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5560 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5561 * highlight match at end of line. If it's beyond the last |
| 5562 * char on the screen, just overwrite that one (tricky!) Not | |
| 5563 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5564 #ifdef FEAT_SEARCH_EXTRA |
| 5565 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5566 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5567 prevcol_hl_flag = TRUE; |
| 5568 else | |
| 5569 { | |
| 5570 cur = wp->w_match_head; | |
| 5571 while (cur != NULL) | |
| 5572 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5573 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5574 { |
| 5575 prevcol_hl_flag = TRUE; | |
| 5576 break; | |
| 5577 } | |
| 5578 cur = cur->next; | |
| 5579 } | |
| 5580 } | |
| 5581 #endif | |
| 7 | 5582 if (lcs_eol == lcs_eol_one |
| 1850 | 5583 && ((area_attr != 0 && vcol == fromcol |
| 5584 && (VIsual_mode != Ctrl_V | |
| 5585 || lnum == VIsual.lnum | |
| 5586 || lnum == curwin->w_cursor.lnum) | |
| 5587 && c == NUL) | |
| 7 | 5588 #ifdef FEAT_SEARCH_EXTRA |
| 5589 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5590 || (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
|
5591 # 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
|
5592 && !(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
|
5593 && !(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
|
5594 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5595 # 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
|
5596 && 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
|
5597 # endif |
| 910 | 5598 # if defined(LINE_ATTR) |
| 867 | 5599 && did_line_attr <= 1 |
| 5600 # endif | |
| 5601 ) | |
| 7 | 5602 #endif |
| 5603 )) | |
| 5604 { | |
| 5605 int n = 0; | |
| 5606 | |
| 5607 #ifdef FEAT_RIGHTLEFT | |
| 5608 if (wp->w_p_rl) | |
| 5609 { | |
| 5610 if (col < 0) | |
| 5611 n = 1; | |
| 5612 } | |
| 5613 else | |
| 5614 #endif | |
| 5615 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5616 if (col >= wp->w_width) |
| 7 | 5617 n = -1; |
| 5618 } | |
| 5619 if (n != 0) | |
| 5620 { | |
| 5621 /* At the window boundary, highlight the last character | |
| 5622 * instead (better than nothing). */ | |
| 5623 off += n; | |
| 5624 col += n; | |
| 5625 } | |
| 5626 else | |
| 5627 { | |
| 5628 /* Add a blank character to highlight. */ | |
| 5629 ScreenLines[off] = ' '; | |
| 5630 if (enc_utf8) | |
| 5631 ScreenLinesUC[off] = 0; | |
| 5632 } | |
| 5633 #ifdef FEAT_SEARCH_EXTRA | |
| 5634 if (area_attr == 0) | |
| 5635 { | |
| 1326 | 5636 /* Use attributes from match with highest priority among |
| 5637 * 'search_hl' and the match list. */ | |
| 5638 cur = wp->w_match_head; | |
| 5639 shl_flag = FALSE; | |
| 5640 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5641 { |
| 1326 | 5642 if (shl_flag == FALSE |
| 5643 && ((cur != NULL | |
| 5644 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5645 || cur == NULL)) | |
| 699 | 5646 { |
| 1326 | 5647 shl = &search_hl; |
| 5648 shl_flag = TRUE; | |
|
17117
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
5649 if (screen_line_flags & SLF_POPUP) |
|
7ef5283ace3c
patch 8.1.1558: popup_menu() and popup_filter_menu() are not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
17055
diff
changeset
|
5650 continue; // do not use search_hl |
| 699 | 5651 } |
| 1326 | 5652 else |
| 5653 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5654 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
|
5655 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5656 char_attr = shl->attr; |
| 5657 if (shl != &search_hl && cur != NULL) | |
| 5658 cur = cur->next; | |
| 699 | 5659 } |
| 7 | 5660 } |
| 5661 #endif | |
| 5662 ScreenAttrs[off] = char_attr; | |
| 5663 #ifdef FEAT_RIGHTLEFT | |
| 5664 if (wp->w_p_rl) | |
| 1437 | 5665 { |
| 7 | 5666 --col; |
| 1437 | 5667 --off; |
| 5668 } | |
| 7 | 5669 else |
| 5670 #endif | |
| 1437 | 5671 { |
| 7 | 5672 ++col; |
| 1437 | 5673 ++off; |
| 5674 } | |
| 743 | 5675 ++vcol; |
| 1437 | 5676 #ifdef FEAT_SYN_HL |
| 5677 eol_hl_off = 1; | |
| 5678 #endif | |
| 743 | 5679 } |
| 867 | 5680 } |
| 5681 | |
| 5682 /* | |
| 5683 * At end of the text line. | |
| 5684 */ | |
| 5685 if (c == NUL) | |
| 5686 { | |
| 743 | 5687 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5688 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5689 if (wp->w_p_wrap) |
| 5690 v = wp->w_skipcol; | |
| 5691 else | |
| 5692 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5693 |
| 820 | 5694 /* check if line ends before left margin */ |
| 5695 if (vcol < v + col - win_col_off(wp)) | |
| 5696 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
|
5697 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5698 // Get rid of the boguscols now, we want to draw until the right |
|
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5699 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5700 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5701 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5702 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5703 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5704 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5705 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
|
5706 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5707 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5708 && (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
|
5709 && (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
|
5710 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
|
5711 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5712 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5713 || win_attr != 0) |
| 743 | 5714 # ifdef FEAT_RIGHTLEFT |
| 5715 && !wp->w_p_rl | |
| 5716 # endif | |
| 5717 ) | |
| 5718 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5719 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5720 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5721 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5722 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5723 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5724 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5725 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5726 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
|
5727 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5728 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5729 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5730 while (col < wp->w_width) |
| 743 | 5731 { |
| 5732 ScreenLines[off] = ' '; | |
| 5733 if (enc_utf8) | |
| 5734 ScreenLinesUC[off] = 0; | |
| 5735 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5736 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5737 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
|
5738 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5739 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5740 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
|
5741 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
|
5742 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
|
5743 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5744 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5745 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5746 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5747 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5748 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5749 |
| 743 | 5750 ++vcol; |
| 5751 } | |
| 5752 } | |
| 5753 #endif | |
| 7 | 5754 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5755 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5756 (int)wp->w_width, screen_line_flags); |
| 7 | 5757 row++; |
| 5758 | |
| 5759 /* | |
| 5760 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5761 * updated (saves a call to plines() later). | |
| 5762 */ | |
| 5763 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5764 { | |
| 5765 curwin->w_cline_row = startrow; | |
| 5766 curwin->w_cline_height = row - startrow; | |
| 5767 #ifdef FEAT_FOLDING | |
| 5768 curwin->w_cline_folded = FALSE; | |
| 5769 #endif | |
| 5770 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5771 } | |
| 5772 | |
| 5773 break; | |
| 5774 } | |
| 5775 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5776 // Show "extends" character from 'listchars' if beyond the line end and |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5777 // 'list' is set. |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5778 if (lcs_ext != NUL |
|
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5779 && wp->w_p_list |
| 7 | 5780 && !wp->w_p_wrap |
| 5781 #ifdef FEAT_DIFF | |
| 5782 && filler_todo <= 0 | |
| 5783 #endif | |
| 5784 && ( | |
| 5785 #ifdef FEAT_RIGHTLEFT | |
| 5786 wp->w_p_rl ? col == 0 : | |
| 5787 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5788 col == wp->w_width - 1) |
| 7 | 5789 && (*ptr != NUL |
| 1555 | 5790 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5791 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5792 { | |
| 5793 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
|
5794 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5795 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
|
5796 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5797 { |
| 5798 mb_utf8 = TRUE; | |
| 714 | 5799 u8cc[0] = 0; |
| 819 | 5800 c = 0xc0; |
| 7 | 5801 } |
| 5802 else | |
| 5803 mb_utf8 = FALSE; | |
| 5804 } | |
| 5805 | |
| 743 | 5806 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5807 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5808 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5809 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
|
5810 |
| 743 | 5811 /* 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
|
5812 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5813 * 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
|
5814 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5815 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
|
5816 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
|
5817 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5818 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5819 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
|
5820 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5821 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5822 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
|
5823 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
|
5824 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5825 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
|
5826 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5827 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
|
5828 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
|
5829 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5830 } |
| 743 | 5831 #endif |
| 5832 | |
| 7 | 5833 /* |
| 5834 * Store character to be displayed. | |
| 5835 * Skip characters that are left of the screen for 'nowrap'. | |
| 5836 */ | |
| 5837 vcol_prev = vcol; | |
| 5838 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5839 { | |
| 5840 /* | |
| 5841 * Store the character. | |
| 5842 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5843 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5844 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5845 { | |
| 5846 /* A double-wide character is: put first halve in left cell. */ | |
| 5847 --off; | |
| 5848 --col; | |
| 5849 } | |
| 5850 #endif | |
| 5851 ScreenLines[off] = c; | |
| 5852 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5853 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5854 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5855 ScreenLines[off] = 0x8e; |
| 7 | 5856 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5857 } |
| 7 | 5858 else if (enc_utf8) |
| 5859 { | |
| 5860 if (mb_utf8) | |
| 5861 { | |
| 1326 | 5862 int i; |
| 5863 | |
| 7 | 5864 ScreenLinesUC[off] = mb_c; |
| 819 | 5865 if ((c & 0xff) == 0) |
| 5866 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5867 for (i = 0; i < Screen_mco; ++i) |
| 5868 { | |
| 5869 ScreenLinesC[i][off] = u8cc[i]; | |
| 5870 if (u8cc[i] == 0) | |
| 5871 break; | |
| 5872 } | |
| 7 | 5873 } |
| 5874 else | |
| 5875 ScreenLinesUC[off] = 0; | |
| 5876 } | |
| 5877 if (multi_attr) | |
| 5878 { | |
| 5879 ScreenAttrs[off] = multi_attr; | |
| 5880 multi_attr = 0; | |
| 5881 } | |
| 5882 else | |
| 5883 ScreenAttrs[off] = char_attr; | |
| 5884 | |
| 5885 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5886 { | |
| 5887 /* Need to fill two screen columns. */ | |
| 5888 ++off; | |
| 5889 ++col; | |
| 5890 if (enc_utf8) | |
| 5891 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5892 ScreenLines[off] = 0; | |
| 5893 else | |
| 5894 /* DBCS: Put second byte in the second screen char. */ | |
| 5895 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5896 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5897 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5898 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5899 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5900 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5901 ++vcol; |
| 7 | 5902 /* When "tocol" is halfway a character, set it to the end of |
| 5903 * the character, otherwise highlighting won't stop. */ | |
| 5904 if (tocol == vcol) | |
| 5905 ++tocol; | |
| 5906 #ifdef FEAT_RIGHTLEFT | |
| 5907 if (wp->w_p_rl) | |
| 5908 { | |
| 5909 /* now it's time to backup one cell */ | |
| 5910 --off; | |
| 5911 --col; | |
| 5912 } | |
| 5913 #endif | |
| 5914 } | |
| 5915 #ifdef FEAT_RIGHTLEFT | |
| 5916 if (wp->w_p_rl) | |
| 5917 { | |
| 5918 --off; | |
| 5919 --col; | |
| 5920 } | |
| 5921 else | |
| 5922 #endif | |
| 5923 { | |
| 5924 ++off; | |
| 5925 ++col; | |
| 5926 } | |
| 5927 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 #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
|
5929 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
|
5930 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5932 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5933 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5934 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 if (wp->w_p_wrap) |
|
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 * Special voodoo required if 'wrap' is on. |
|
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 * 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
|
5941 * 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
|
5942 * 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
|
5943 * 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
|
5944 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5945 * 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
|
5946 * 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
|
5947 * 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
|
5948 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5949 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5950 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5951 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5952 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5953 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5954 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5955 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5956 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5957 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5958 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5959 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5960 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5961 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5962 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5963 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5964 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5965 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5966 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5967 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5968 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5969 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5970 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
|
5971 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5972 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5973 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5974 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5975 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5976 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5977 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5978 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5979 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5980 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5981 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5982 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5983 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5984 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5985 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5986 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5987 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5988 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5989 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5990 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5991 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5992 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5993 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5994 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5995 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5996 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5997 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5998 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5999 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6000 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6001 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6002 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6003 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6004 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6005 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6006 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6007 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6008 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6009 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6010 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6011 #endif /* FEAT_CONCEAL */ |
| 7 | 6012 else |
| 6013 --n_skip; | |
| 6014 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
6015 /* 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
|
6016 * column. */ |
| 1849 | 6017 if (draw_state > WL_NR |
| 7 | 6018 #ifdef FEAT_DIFF |
| 6019 && filler_todo <= 0 | |
| 6020 #endif | |
| 6021 ) | |
| 6022 ++vcol; | |
| 6023 | |
| 743 | 6024 #ifdef FEAT_SYN_HL |
| 6025 if (vcol_save_attr >= 0) | |
| 6026 char_attr = vcol_save_attr; | |
| 6027 #endif | |
| 6028 | |
| 7 | 6029 /* restore attributes after "predeces" in 'listchars' */ |
| 6030 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 6031 char_attr = saved_attr3; | |
| 6032 | |
| 6033 /* restore attributes after last 'listchars' or 'number' char */ | |
| 6034 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 6035 char_attr = saved_attr2; | |
| 6036 | |
| 6037 /* | |
| 6038 * At end of screen line and there is more to come: Display the line | |
| 1378 | 6039 * so far. If there is no more to display it is caught above. |
| 7 | 6040 */ |
| 6041 if (( | |
| 6042 #ifdef FEAT_RIGHTLEFT | |
| 6043 wp->w_p_rl ? (col < 0) : | |
| 6044 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6045 (col >= wp->w_width)) |
| 7 | 6046 && (*ptr != NUL |
| 6047 #ifdef FEAT_DIFF | |
| 6048 || filler_todo > 0 | |
| 6049 #endif | |
| 2724 | 6050 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6051 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6052 ) | |
| 6053 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6054 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6055 screen_line(screen_row, wp->w_wincol, col - boguscols, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6056 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6057 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6058 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6059 screen_line(screen_row, wp->w_wincol, col, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6060 (int)wp->w_width, screen_line_flags); |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6061 #endif |
| 7 | 6062 ++row; |
| 6063 ++screen_row; | |
| 6064 | |
| 6065 /* When not wrapping and finished diff lines, or when displayed | |
| 6066 * '$' and highlighting until last column, break here. */ | |
| 6067 if ((!wp->w_p_wrap | |
| 6068 #ifdef FEAT_DIFF | |
| 6069 && filler_todo <= 0 | |
| 6070 #endif | |
| 6071 ) || lcs_eol_one == -1) | |
| 6072 break; | |
| 6073 | |
| 6074 /* When the window is too narrow draw all "@" lines. */ | |
| 6075 if (draw_state != WL_LINE | |
| 6076 #ifdef FEAT_DIFF | |
| 6077 && filler_todo <= 0 | |
| 6078 #endif | |
| 6079 ) | |
| 6080 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6081 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6082 draw_vsep_win(wp, row); |
| 6083 row = endrow; | |
| 6084 } | |
| 6085 | |
| 6086 /* When line got too long for screen break here. */ | |
| 6087 if (row == endrow) | |
| 6088 { | |
| 6089 ++row; | |
| 6090 break; | |
| 6091 } | |
| 6092 | |
| 6093 if (screen_cur_row == screen_row - 1 | |
| 6094 #ifdef FEAT_DIFF | |
| 6095 && filler_todo <= 0 | |
| 6096 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6097 && wp->w_width == Columns) |
| 7 | 6098 { |
| 6099 /* Remember that the line wraps, used for modeless copy. */ | |
| 6100 LineWraps[screen_row - 1] = TRUE; | |
| 6101 | |
| 6102 /* | |
| 6103 * Special trick to make copy/paste of wrapped lines work with | |
| 6104 * xterm/screen: write an extra character beyond the end of | |
| 6105 * the line. This will work with all terminal types | |
| 6106 * (regardless of the xn,am settings). | |
| 6107 * Only do this on a fast tty. | |
| 6108 * Only do this if the cursor is on the current line | |
| 6109 * (something has been written in it). | |
| 6110 * Don't do this for the GUI. | |
| 6111 * Don't do this for double-width characters. | |
| 6112 * Don't do this for a window not at the right screen border. | |
| 6113 */ | |
| 6114 if (p_tf | |
| 6115 #ifdef FEAT_GUI | |
| 6116 && !gui.in_use | |
| 6117 #endif | |
| 6118 && !(has_mbyte | |
| 1378 | 6119 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6120 LineOffset[screen_row] + screen_Columns) | |
| 6121 == 2 | |
| 7 | 6122 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6123 + (int)Columns - 2, |
| 6124 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6125 == 2))) |
| 7 | 6126 { |
| 6127 /* First make sure we are at the end of the screen line, | |
| 6128 * then output the same character again to let the | |
| 6129 * terminal know about the wrap. If the terminal doesn't | |
| 6130 * 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
|
6131 if (screen_cur_col != wp->w_width) |
| 7 | 6132 screen_char(LineOffset[screen_row - 1] |
| 6133 + (unsigned)Columns - 1, | |
| 6134 screen_row - 1, (int)(Columns - 1)); | |
| 6135 | |
| 6136 /* When there is a multi-byte character, just output a | |
| 6137 * space to keep it simple. */ | |
| 148 | 6138 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6139 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6140 out_char(' '); |
| 6141 else | |
| 6142 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6143 + (Columns - 1)]); | |
| 6144 /* force a redraw of the first char on the next line */ | |
| 6145 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6146 screen_start(); /* don't know where cursor is now */ | |
| 6147 } | |
| 6148 } | |
| 6149 | |
| 6150 col = 0; | |
| 6151 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6152 #ifdef FEAT_RIGHTLEFT | |
| 6153 if (wp->w_p_rl) | |
| 6154 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6155 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6156 off += col; |
| 6157 } | |
| 6158 #endif | |
| 6159 | |
| 6160 /* reset the drawing state for the start of a wrapped line */ | |
| 6161 draw_state = WL_START; | |
| 6162 saved_n_extra = n_extra; | |
| 6163 saved_p_extra = p_extra; | |
| 6164 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
|
6165 saved_c_final = c_final; |
| 7 | 6166 saved_char_attr = char_attr; |
| 6167 n_extra = 0; | |
| 6168 lcs_prec_todo = lcs_prec; | |
| 6169 #ifdef FEAT_LINEBREAK | |
| 6170 # ifdef FEAT_DIFF | |
| 6171 if (filler_todo <= 0) | |
| 6172 # endif | |
| 6173 need_showbreak = TRUE; | |
| 6174 #endif | |
| 6175 #ifdef FEAT_DIFF | |
| 6176 --filler_todo; | |
| 6177 /* When the filler lines are actually below the last line of the | |
| 6178 * file, don't draw the line itself, break here. */ | |
| 6179 if (filler_todo == 0 && wp->w_botfill) | |
| 6180 break; | |
| 6181 #endif | |
| 6182 } | |
| 6183 | |
| 6184 } /* for every character in the line */ | |
| 6185 | |
| 743 | 6186 #ifdef FEAT_SPELL |
| 386 | 6187 /* After an empty line check first word for capital. */ |
| 6188 if (*skipwhite(line) == NUL) | |
| 6189 { | |
| 6190 capcol_lnum = lnum + 1; | |
| 6191 cap_col = 0; | |
| 6192 } | |
| 6193 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6194 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6195 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6196 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6197 #endif |
| 386 | 6198 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6199 vim_free(p_extra_free); |
| 7 | 6200 return row; |
| 6201 } | |
| 6202 | |
| 714 | 6203 /* |
| 6204 * 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
|
6205 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6206 */ |
| 6207 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6208 comp_char_differs(int off_from, int off_to) |
| 714 | 6209 { |
| 6210 int i; | |
| 6211 | |
| 6212 for (i = 0; i < Screen_mco; ++i) | |
| 6213 { | |
| 6214 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6215 return TRUE; | |
| 6216 if (ScreenLinesC[i][off_from] == 0) | |
| 6217 break; | |
| 6218 } | |
| 6219 return FALSE; | |
| 6220 } | |
| 6221 | |
| 7 | 6222 /* |
| 6223 * Check whether the given character needs redrawing: | |
| 6224 * - the (first byte of the) character is different | |
| 6225 * - the attributes are different | |
| 6226 * - the character is multi-byte and the next byte is different | |
| 1616 | 6227 * - the character is two cells wide and the second cell differs. |
| 7 | 6228 */ |
| 6229 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6230 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6231 { |
| 6232 if (cols > 0 | |
| 6233 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6234 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6235 || (enc_dbcs != 0 | |
| 6236 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6237 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6238 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6239 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6240 != ScreenLines[off_to + 1]))) | |
| 6241 || (enc_utf8 | |
| 6242 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6243 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6244 && comp_char_differs(off_from, off_to)) |
| 3759 | 6245 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6246 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6247 != ScreenLines[off_to + 1]))))) |
| 7 | 6248 return TRUE; |
| 6249 return FALSE; | |
| 6250 } | |
| 6251 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6252 #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
|
6253 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6254 * 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
|
6255 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6256 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6257 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
|
6258 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6259 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
|
6260 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6261 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6262 |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6263 #ifdef FEAT_TEXT_PROP |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6264 /* |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6265 * Return TRUE if this position has a higher level popup or this cell is |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6266 * transparent in the current popup. |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6267 */ |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6268 static int |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6269 blocked_by_popup(int row, int col) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6270 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6271 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6272 |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6273 if (!popup_visible) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6274 return FALSE; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6275 off = row * screen_Columns + col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6276 return popup_mask[off] > screen_zindex || popup_transparent[off]; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6277 } |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6278 #endif |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6279 |
| 7 | 6280 /* |
| 6281 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6282 * have actually changed. Handle insert/delete character. | |
| 6283 * "coloff" gives the first column on the screen for this line. | |
| 6284 * "endcol" gives the columns where valid characters are. | |
| 6285 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6286 * needs to be cleared, negative otherwise. | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6287 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6288 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6289 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6290 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6291 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6292 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6293 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6294 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6295 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6296 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6297 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
|
6298 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6299 int flags UNUSED) |
| 7 | 6300 { |
| 6301 unsigned off_from; | |
| 6302 unsigned off_to; | |
| 1378 | 6303 unsigned max_off_from; |
| 6304 unsigned max_off_to; | |
| 7 | 6305 int col = 0; |
| 6306 int hl; | |
| 6307 int force = FALSE; /* force update rest of the line */ | |
| 6308 int redraw_this /* bool: does character need redraw? */ | |
| 6309 #ifdef FEAT_GUI | |
| 6310 = TRUE /* For GUI when while-loop empty */ | |
| 6311 #endif | |
| 6312 ; | |
| 6313 int redraw_next; /* redraw_this for next character */ | |
| 6314 int clear_next = FALSE; | |
| 6315 int char_cells; /* 1: normal char */ | |
| 6316 /* 2: occupies two display cells */ | |
| 6317 # define CHAR_CELLS char_cells | |
| 6318 | |
| 3413 | 6319 /* Check for illegal row and col, just in case. */ |
| 6320 if (row >= Rows) | |
| 6321 row = Rows - 1; | |
| 6322 if (endcol > Columns) | |
| 6323 endcol = Columns; | |
| 6324 | |
| 7 | 6325 # ifdef FEAT_CLIPBOARD |
| 6326 clip_may_clear_selection(row, row); | |
| 6327 # endif | |
| 6328 | |
| 6329 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6330 off_to = LineOffset[row] + coloff; | |
| 1378 | 6331 max_off_from = off_from + screen_Columns; |
| 6332 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6333 |
| 6334 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6335 if (flags & SLF_RIGHTLEFT) |
| 7 | 6336 { |
| 6337 /* Clear rest first, because it's left of the text. */ | |
| 6338 if (clear_width > 0) | |
| 6339 { | |
| 6340 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6341 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6342 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6343 { |
| 6344 ++off_to; | |
| 6345 ++col; | |
| 6346 } | |
| 6347 if (col <= endcol) | |
| 6348 screen_fill(row, row + 1, col + coloff, | |
| 6349 endcol + coloff + 1, ' ', ' ', 0); | |
| 6350 } | |
| 6351 col = endcol + 1; | |
| 6352 off_to = LineOffset[row] + col + coloff; | |
| 6353 off_from += col; | |
| 6354 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6355 } | |
| 6356 #endif /* FEAT_RIGHTLEFT */ | |
| 6357 | |
| 6358 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6359 | |
| 6360 while (col < endcol) | |
| 6361 { | |
| 6362 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6363 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6364 else |
| 6365 char_cells = 1; | |
| 6366 | |
| 6367 redraw_this = redraw_next; | |
| 6368 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6369 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6370 | |
| 6371 #ifdef FEAT_GUI | |
| 6372 /* If the next character was bold, then redraw the current character to | |
| 6373 * remove any pixels that might have spilt over into us. This only | |
| 6374 * happens in the GUI. | |
| 6375 */ | |
| 6376 if (redraw_next && gui.in_use) | |
| 6377 { | |
| 6378 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6379 if (hl > HL_ALL) |
| 6380 hl = syn_attr2attr(hl); | |
| 6381 if (hl & HL_BOLD) | |
| 7 | 6382 redraw_this = TRUE; |
| 6383 } | |
| 6384 #endif | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6385 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6386 if (blocked_by_popup(row, col + coloff)) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6387 redraw_this = FALSE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
6388 #endif |
| 7 | 6389 if (redraw_this) |
| 6390 { | |
| 6391 /* | |
| 6392 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6393 * Attributes for characters are stored at the position where the | |
| 6394 * cursor is when writing the highlighting code. The | |
| 6395 * start-highlighting code must be written with the cursor on the | |
| 6396 * first highlighted character. The stop-highlighting code must | |
| 6397 * be written with the cursor just after the last highlighted | |
| 6398 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6399 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6400 * to clear the rest of the line, and force redrawing it |
| 6401 * completely. | |
| 6402 */ | |
| 6403 if ( p_wiv | |
| 6404 && !force | |
| 6405 #ifdef FEAT_GUI | |
| 6406 && !gui.in_use | |
| 6407 #endif | |
| 6408 && ScreenAttrs[off_to] != 0 | |
| 6409 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6410 { | |
| 6411 /* | |
| 6412 * Need to remove highlighting attributes here. | |
| 6413 */ | |
| 6414 windgoto(row, col + coloff); | |
| 6415 out_str(T_CE); /* clear rest of this screen line */ | |
| 6416 screen_start(); /* don't know where cursor is now */ | |
| 6417 force = TRUE; /* force redraw of rest of the line */ | |
| 6418 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6419 | |
| 6420 /* | |
| 6421 * If the previous character was highlighted, need to stop | |
| 6422 * highlighting at this character. | |
| 6423 */ | |
| 6424 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6425 { | |
| 6426 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6427 term_windgoto(row, col + coloff); | |
| 6428 screen_stop_highlight(); | |
| 6429 } | |
| 6430 else | |
| 6431 screen_attr = 0; /* highlighting has stopped */ | |
| 6432 } | |
| 6433 if (enc_dbcs != 0) | |
| 6434 { | |
| 6435 /* Check if overwriting a double-byte with a single-byte or | |
| 6436 * the other way around requires another character to be | |
| 6437 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6438 * ScreenLinesUC[] is sufficient. */ | |
| 6439 if (char_cells == 1 | |
| 6440 && col + 1 < endcol | |
| 1378 | 6441 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6442 { |
| 6443 /* Writing a single-cell character over a double-cell | |
| 6444 * character: need to redraw the next cell. */ | |
| 6445 ScreenLines[off_to + 1] = 0; | |
| 6446 redraw_next = TRUE; | |
| 6447 } | |
| 6448 else if (char_cells == 2 | |
| 6449 && col + 2 < endcol | |
| 1378 | 6450 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6451 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6452 { |
| 6453 /* Writing the second half of a double-cell character over | |
| 6454 * a double-cell character: need to redraw the second | |
| 6455 * cell. */ | |
| 6456 ScreenLines[off_to + 2] = 0; | |
| 6457 redraw_next = TRUE; | |
| 6458 } | |
| 6459 | |
| 6460 if (enc_dbcs == DBCS_JPNU) | |
| 6461 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6462 } | |
| 6463 /* When writing a single-width character over a double-width | |
| 6464 * character and at the end of the redrawn text, need to clear out | |
| 6465 * the right halve of the old character. | |
| 6466 * Also required when writing the right halve of a double-width | |
| 6467 * char over the left halve of an existing one. */ | |
| 6468 if (has_mbyte && col + char_cells == endcol | |
| 6469 && ((char_cells == 1 | |
| 1378 | 6470 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6471 || (char_cells == 2 |
| 1378 | 6472 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6473 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6474 clear_next = TRUE; |
| 6475 | |
| 6476 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6477 if (enc_utf8) | |
| 6478 { | |
| 6479 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6480 if (ScreenLinesUC[off_from] != 0) | |
| 6481 { | |
| 714 | 6482 int i; |
| 6483 | |
| 6484 for (i = 0; i < Screen_mco; ++i) | |
| 6485 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6486 } |
| 6487 } | |
| 6488 if (char_cells == 2) | |
| 6489 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6490 | |
| 6491 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6492 /* The bold trick makes a single column of pixels appear in the |
| 6493 * next character. When a bold character is removed, the next | |
| 7 | 6494 * character should be redrawn too. This happens for our own GUI |
| 6495 * and for some xterms. */ | |
| 6496 if ( | |
| 6497 # ifdef FEAT_GUI | |
| 6498 gui.in_use | |
| 6499 # endif | |
| 6500 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6501 || | |
| 6502 # endif | |
| 6503 # ifdef UNIX | |
| 6504 term_is_xterm | |
| 6505 # endif | |
| 6506 ) | |
| 6507 { | |
| 6508 hl = ScreenAttrs[off_to]; | |
| 743 | 6509 if (hl > HL_ALL) |
| 6510 hl = syn_attr2attr(hl); | |
| 6511 if (hl & HL_BOLD) | |
| 7 | 6512 redraw_next = TRUE; |
| 6513 } | |
| 6514 #endif | |
| 6515 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6516 |
| 819 | 6517 /* For simplicity set the attributes of second half of a |
| 6518 * double-wide character equal to the first half. */ | |
| 6519 if (char_cells == 2) | |
| 6520 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6521 | |
| 7 | 6522 if (enc_dbcs != 0 && char_cells == 2) |
| 6523 screen_char_2(off_to, row, col + coloff); | |
| 6524 else | |
| 6525 screen_char(off_to, row, col + coloff); | |
| 6526 } | |
| 6527 else if ( p_wiv | |
| 6528 #ifdef FEAT_GUI | |
| 6529 && !gui.in_use | |
| 6530 #endif | |
| 6531 && col + coloff > 0) | |
| 6532 { | |
| 6533 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6534 { | |
| 6535 /* | |
| 6536 * Don't output stop-highlight when moving the cursor, it will | |
| 6537 * stop the highlighting when it should continue. | |
| 6538 */ | |
| 6539 screen_attr = 0; | |
| 6540 } | |
| 6541 else if (screen_attr != 0) | |
| 6542 screen_stop_highlight(); | |
| 6543 } | |
| 6544 | |
| 6545 off_to += CHAR_CELLS; | |
| 6546 off_from += CHAR_CELLS; | |
| 6547 col += CHAR_CELLS; | |
| 6548 } | |
| 6549 | |
| 6550 if (clear_next) | |
| 6551 { | |
| 6552 /* Clear the second half of a double-wide character of which the left | |
| 6553 * half was overwritten with a single-wide character. */ | |
| 6554 ScreenLines[off_to] = ' '; | |
| 6555 if (enc_utf8) | |
| 6556 ScreenLinesUC[off_to] = 0; | |
| 6557 screen_char(off_to, row, col + coloff); | |
| 6558 } | |
| 6559 | |
| 6560 if (clear_width > 0 | |
| 6561 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6562 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6563 #endif |
| 6564 ) | |
| 6565 { | |
| 6566 #ifdef FEAT_GUI | |
| 6567 int startCol = col; | |
| 6568 #endif | |
| 6569 | |
| 6570 /* blank out the rest of the line */ | |
| 6571 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6572 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6573 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6574 { |
| 6575 ++off_to; | |
| 6576 ++col; | |
| 6577 } | |
| 6578 if (col < clear_width) | |
| 6579 { | |
| 6580 #ifdef FEAT_GUI | |
| 6581 /* | |
| 6582 * In the GUI, clearing the rest of the line may leave pixels | |
| 6583 * behind if the first character cleared was bold. Some bold | |
| 6584 * fonts spill over the left. In this case we redraw the previous | |
| 6585 * character too. If we didn't skip any blanks above, then we | |
| 6586 * only redraw if the character wasn't already redrawn anyway. | |
| 6587 */ | |
| 996 | 6588 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6589 { |
| 6590 hl = ScreenAttrs[off_to]; | |
| 6591 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6592 { |
| 6593 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6594 |
| 996 | 6595 if (enc_utf8) |
| 6596 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6597 * that its width is 2. */ | |
| 6598 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6599 else if (enc_dbcs != 0) | |
| 6600 { | |
| 6601 /* find previous character by counting from first | |
| 6602 * column and get its width. */ | |
| 6603 unsigned off = LineOffset[row]; | |
| 1378 | 6604 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6605 |
| 6606 while (off < off_to) | |
| 6607 { | |
| 1378 | 6608 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6609 off += prev_cells; |
| 6610 } | |
| 6611 } | |
| 6612 | |
| 6613 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6614 screen_char_2(off_to - prev_cells, row, | |
| 6615 col + coloff - prev_cells); | |
| 6616 else | |
| 6617 screen_char(off_to - prev_cells, row, | |
| 6618 col + coloff - prev_cells); | |
| 6619 } | |
| 7 | 6620 } |
| 6621 #endif | |
| 6622 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6623 ' ', ' ', 0); | |
| 6624 off_to += clear_width - col; | |
| 6625 col = clear_width; | |
| 6626 } | |
| 6627 } | |
| 6628 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6629 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6630 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6631 && !(flags & SLF_POPUP) // no separator for popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6632 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6633 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6634 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6635 // For a window that has a right neighbor, draw the separator char |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6636 // right of the window contents. But not on top of a popup window. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6637 if (coloff + col < Columns) |
| 7 | 6638 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6639 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
6640 if (!blocked_by_popup(row, col + coloff)) |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6641 #endif |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6642 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6643 int c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6644 |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6645 c = fillchar_vsep(&hl); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6646 if (ScreenLines[off_to] != (schar_T)c |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6647 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6648 != (c >= 0x80 ? c : 0)) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6649 || ScreenAttrs[off_to] != hl) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6650 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6651 ScreenLines[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6652 ScreenAttrs[off_to] = hl; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6653 if (enc_utf8) |
| 7 | 6654 { |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6655 if (c >= 0x80) |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6656 { |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6657 ScreenLinesUC[off_to] = c; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6658 ScreenLinesC[0][off_to] = 0; |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6659 } |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6660 else |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6661 ScreenLinesUC[off_to] = 0; |
| 7 | 6662 } |
|
16994
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6663 screen_char(off_to, row, col + coloff); |
|
9c4cf27deb87
patch 8.1.1497: accessing memory beyond allocated space
Bram Moolenaar <Bram@vim.org>
parents:
16990
diff
changeset
|
6664 } |
| 7 | 6665 } |
| 6666 } | |
| 6667 else | |
| 6668 LineWraps[row] = FALSE; | |
| 6669 } | |
| 6670 } | |
| 6671 | |
| 474 | 6672 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6673 /* |
| 474 | 6674 * Mirror text "str" for right-left displaying. |
| 6675 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6676 */ |
| 474 | 6677 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6678 rl_mirror(char_u *str) |
| 7 | 6679 { |
| 6680 char_u *p1, *p2; | |
| 6681 int t; | |
| 6682 | |
| 6683 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6684 { | |
| 6685 t = *p1; | |
| 6686 *p1 = *p2; | |
| 6687 *p2 = t; | |
| 6688 } | |
| 6689 } | |
| 6690 #endif | |
| 6691 | |
| 6692 /* | |
| 6693 * mark all status lines for redraw; used after first :cd | |
| 6694 */ | |
| 6695 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6696 status_redraw_all(void) |
| 7 | 6697 { |
| 6698 win_T *wp; | |
| 6699 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6700 FOR_ALL_WINDOWS(wp) |
| 7 | 6701 if (wp->w_status_height) |
| 6702 { | |
| 6703 wp->w_redr_status = TRUE; | |
| 6704 redraw_later(VALID); | |
| 6705 } | |
| 6706 } | |
| 6707 | |
| 6708 /* | |
| 6709 * mark all status lines of the current buffer for redraw | |
| 6710 */ | |
| 6711 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6712 status_redraw_curbuf(void) |
| 7 | 6713 { |
| 6714 win_T *wp; | |
| 6715 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6716 FOR_ALL_WINDOWS(wp) |
| 7 | 6717 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6718 { | |
| 6719 wp->w_redr_status = TRUE; | |
| 6720 redraw_later(VALID); | |
| 6721 } | |
| 6722 } | |
| 6723 | |
| 6724 /* | |
| 6725 * Redraw all status lines that need to be redrawn. | |
| 6726 */ | |
| 6727 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6728 redraw_statuslines(void) |
| 7 | 6729 { |
| 6730 win_T *wp; | |
| 6731 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6732 FOR_ALL_WINDOWS(wp) |
| 7 | 6733 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
|
6734 win_redr_status(wp, FALSE); |
| 673 | 6735 if (redraw_tabline) |
| 677 | 6736 draw_tabline(); |
| 7 | 6737 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6738 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6739 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6740 /* |
| 6741 * Redraw all status lines at the bottom of frame "frp". | |
| 6742 */ | |
| 6743 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6744 win_redraw_last_status(frame_T *frp) |
| 7 | 6745 { |
| 6746 if (frp->fr_layout == FR_LEAF) | |
| 6747 frp->fr_win->w_redr_status = TRUE; | |
| 6748 else if (frp->fr_layout == FR_ROW) | |
| 6749 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6750 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6751 win_redraw_last_status(frp); |
| 6752 } | |
| 6753 else /* frp->fr_layout == FR_COL */ | |
| 6754 { | |
| 6755 frp = frp->fr_child; | |
| 6756 while (frp->fr_next != NULL) | |
| 6757 frp = frp->fr_next; | |
| 6758 win_redraw_last_status(frp); | |
| 6759 } | |
| 6760 } | |
| 6761 #endif | |
| 6762 | |
| 6763 /* | |
| 6764 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6765 */ | |
| 6766 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6767 draw_vsep_win(win_T *wp, int row) |
| 7 | 6768 { |
| 6769 int hl; | |
| 6770 int c; | |
| 6771 | |
| 6772 if (wp->w_vsep_width) | |
| 6773 { | |
| 6774 /* draw the vertical separator right of this window */ | |
| 6775 c = fillchar_vsep(&hl); | |
| 6776 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6777 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6778 c, ' ', hl); | |
| 6779 } | |
| 6780 } | |
| 6781 | |
| 6782 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6783 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6784 |
| 6785 /* | |
| 1378 | 6786 * Get the length of an item as it will be shown in the status line. |
| 7 | 6787 */ |
| 6788 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6789 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6790 { |
| 6791 int len = 0; | |
| 6792 | |
| 6793 #ifdef FEAT_MENU | |
| 6794 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6795 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6796 | |
| 6797 /* Check for menu separators - replace with '|'. */ | |
| 6798 if (emenu && menu_is_separator(s)) | |
| 6799 return 1; | |
| 6800 #endif | |
| 6801 | |
| 6802 while (*s != NUL) | |
| 6803 { | |
| 1685 | 6804 s += skip_status_match_char(xp, s); |
| 42 | 6805 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6806 MB_PTR_ADV(s); |
| 7 | 6807 } |
| 6808 | |
| 6809 return len; | |
| 6810 } | |
| 6811 | |
| 6812 /* | |
| 1685 | 6813 * Return the number of characters that should be skipped in a status match. |
| 277 | 6814 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6815 */ | |
| 6816 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6817 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6818 { |
| 1685 | 6819 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6820 #ifdef FEAT_MENU |
| 6821 || ((xp->xp_context == EXPAND_MENUS | |
| 6822 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6823 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6824 #endif | |
| 1685 | 6825 ) |
| 6826 { | |
| 6827 #ifndef BACKSLASH_IN_FILENAME | |
| 6828 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6829 return 2; | |
| 6830 #endif | |
| 6831 return 1; | |
| 6832 } | |
| 6833 return 0; | |
| 277 | 6834 } |
| 6835 | |
| 6836 /* | |
| 7 | 6837 * Show wildchar matches in the status line. |
| 6838 * Show at least the "match" item. | |
| 6839 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6840 * | |
| 6841 * If inversion is possible we use it. Else '=' characters are used. | |
| 6842 */ | |
| 6843 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6844 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6845 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6846 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6847 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6848 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6849 int showtail) |
| 7 | 6850 { |
| 6851 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6852 int row; | |
| 6853 char_u *buf; | |
| 6854 int len; | |
| 1378 | 6855 int clen; /* length in screen cells */ |
| 7 | 6856 int fillchar; |
| 6857 int attr; | |
| 6858 int i; | |
| 6859 int highlight = TRUE; | |
| 6860 char_u *selstart = NULL; | |
| 6861 int selstart_col = 0; | |
| 6862 char_u *selend = NULL; | |
| 6863 static int first_match = 0; | |
| 6864 int add_left = FALSE; | |
| 6865 char_u *s; | |
| 6866 #ifdef FEAT_MENU | |
| 6867 int emenu; | |
| 6868 #endif | |
| 6869 int l; | |
| 6870 | |
| 6871 if (matches == NULL) /* interrupted completion? */ | |
| 6872 return; | |
| 6873 | |
| 39 | 6874 if (has_mbyte) |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6875 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6876 else |
|
16764
ef00b6bc186b
patch 8.1.1384: using "int" for alloc() often results in compiler warnings
Bram Moolenaar <Bram@vim.org>
parents:
16676
diff
changeset
|
6877 buf = alloc(Columns + 1); |
| 7 | 6878 if (buf == NULL) |
| 6879 return; | |
| 6880 | |
| 6881 if (match == -1) /* don't show match but original text */ | |
| 6882 { | |
| 6883 match = 0; | |
| 6884 highlight = FALSE; | |
| 6885 } | |
| 6886 /* count 1 for the ending ">" */ | |
| 6887 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6888 if (match == 0) | |
| 6889 first_match = 0; | |
| 6890 else if (match < first_match) | |
| 6891 { | |
| 6892 /* jumping left, as far as we can go */ | |
| 6893 first_match = match; | |
| 6894 add_left = TRUE; | |
| 6895 } | |
| 6896 else | |
| 6897 { | |
| 6898 /* check if match fits on the screen */ | |
| 6899 for (i = first_match; i < match; ++i) | |
| 6900 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6901 if (first_match > 0) | |
| 6902 clen += 2; | |
| 6903 /* jumping right, put match at the left */ | |
| 6904 if ((long)clen > Columns) | |
| 6905 { | |
| 6906 first_match = match; | |
| 6907 /* if showing the last match, we can add some on the left */ | |
| 6908 clen = 2; | |
| 6909 for (i = match; i < num_matches; ++i) | |
| 6910 { | |
| 6911 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6912 if ((long)clen >= Columns) | |
| 6913 break; | |
| 6914 } | |
| 6915 if (i == num_matches) | |
| 6916 add_left = TRUE; | |
| 6917 } | |
| 6918 } | |
| 6919 if (add_left) | |
| 6920 while (first_match > 0) | |
| 6921 { | |
| 6922 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6923 if ((long)clen >= Columns) | |
| 6924 break; | |
| 6925 --first_match; | |
| 6926 } | |
| 6927 | |
|
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
|
6928 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6929 |
| 6930 if (first_match == 0) | |
| 6931 { | |
| 6932 *buf = NUL; | |
| 6933 len = 0; | |
| 6934 } | |
| 6935 else | |
| 6936 { | |
| 6937 STRCPY(buf, "< "); | |
| 6938 len = 2; | |
| 6939 } | |
| 6940 clen = len; | |
| 6941 | |
| 6942 i = first_match; | |
| 6943 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6944 { | |
| 6945 if (i == match) | |
| 6946 { | |
| 6947 selstart = buf + len; | |
| 6948 selstart_col = clen; | |
| 6949 } | |
| 6950 | |
| 6951 s = L_MATCH(i); | |
| 6952 /* Check for menu separators - replace with '|' */ | |
| 6953 #ifdef FEAT_MENU | |
| 6954 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6955 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6956 if (emenu && menu_is_separator(s)) | |
| 6957 { | |
| 6958 STRCPY(buf + len, transchar('|')); | |
| 6959 l = (int)STRLEN(buf + len); | |
| 6960 len += l; | |
| 6961 clen += l; | |
| 6962 } | |
| 6963 else | |
| 6964 #endif | |
| 6965 for ( ; *s != NUL; ++s) | |
| 6966 { | |
| 1685 | 6967 s += skip_status_match_char(xp, s); |
| 7 | 6968 clen += ptr2cells(s); |
| 474 | 6969 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6970 { |
| 6971 STRNCPY(buf + len, s, l); | |
| 6972 s += l - 1; | |
| 6973 len += l; | |
| 6974 } | |
| 6975 else | |
| 6976 { | |
| 6977 STRCPY(buf + len, transchar_byte(*s)); | |
| 6978 len += (int)STRLEN(buf + len); | |
| 6979 } | |
| 6980 } | |
| 6981 if (i == match) | |
| 6982 selend = buf + len; | |
| 6983 | |
| 6984 *(buf + len++) = ' '; | |
| 6985 *(buf + len++) = ' '; | |
| 6986 clen += 2; | |
| 6987 if (++i == num_matches) | |
| 6988 break; | |
| 6989 } | |
| 6990 | |
| 6991 if (i != num_matches) | |
| 6992 { | |
| 6993 *(buf + len++) = '>'; | |
| 6994 ++clen; | |
| 6995 } | |
| 6996 | |
| 6997 buf[len] = NUL; | |
| 6998 | |
| 6999 row = cmdline_row - 1; | |
| 7000 if (row >= 0) | |
| 7001 { | |
| 7002 if (wild_menu_showing == 0) | |
| 7003 { | |
| 7004 if (msg_scrolled > 0) | |
| 7005 { | |
| 7006 /* Put the wildmenu just above the command line. If there is | |
| 7007 * no room, scroll the screen one line up. */ | |
| 7008 if (cmdline_row == Rows - 1) | |
| 7009 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
7010 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 7011 ++msg_scrolled; |
| 7012 } | |
| 7013 else | |
| 7014 { | |
| 7015 ++cmdline_row; | |
| 7016 ++row; | |
| 7017 } | |
| 7018 wild_menu_showing = WM_SCROLLED; | |
| 7019 } | |
| 7020 else | |
| 7021 { | |
| 7022 /* Create status line if needed by setting 'laststatus' to 2. | |
| 7023 * Set 'winminheight' to zero to avoid that the window is | |
| 7024 * resized. */ | |
| 7025 if (lastwin->w_status_height == 0) | |
| 7026 { | |
| 7027 save_p_ls = p_ls; | |
| 7028 save_p_wmh = p_wmh; | |
| 7029 p_ls = 2; | |
| 7030 p_wmh = 0; | |
| 7031 last_status(FALSE); | |
| 7032 } | |
| 7033 wild_menu_showing = WM_SHOWN; | |
| 7034 } | |
| 7035 } | |
| 7036 | |
| 7037 screen_puts(buf, row, 0, attr); | |
| 7038 if (selstart != NULL && highlight) | |
| 7039 { | |
| 7040 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7041 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 7042 } |
| 7043 | |
| 7044 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 7045 } | |
| 7046 | |
| 7047 win_redraw_last_status(topframe); | |
| 7048 vim_free(buf); | |
| 7049 } | |
| 7050 #endif | |
| 7051 | |
| 7052 /* | |
| 7053 * Redraw the status line of window wp. | |
| 7054 * | |
| 7055 * 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
|
7056 * 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
|
7057 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7058 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7059 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7060 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7061 { |
| 7062 int row; | |
| 7063 char_u *p; | |
| 7064 int len; | |
| 7065 int fillchar; | |
| 7066 int attr; | |
| 7067 int this_ru_col; | |
| 1910 | 7068 static int busy = FALSE; |
| 7069 | |
| 7070 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7071 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7072 if (busy) | |
| 7073 return; | |
| 7074 busy = TRUE; | |
| 7 | 7075 |
| 7076 wp->w_redr_status = FALSE; | |
| 7077 if (wp->w_status_height == 0) | |
| 7078 { | |
| 7079 /* no status line, can only be last window */ | |
| 7080 redraw_cmdline = TRUE; | |
| 7081 } | |
| 540 | 7082 else if (!redrawing() |
| 7083 #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
|
7084 // 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
|
7085 // 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
|
7086 || (!ignore_pum && pum_visible()) |
| 540 | 7087 #endif |
| 7088 ) | |
| 7 | 7089 { |
| 7090 /* Don't redraw right now, do it later. */ | |
| 7091 wp->w_redr_status = TRUE; | |
| 7092 } | |
| 7093 #ifdef FEAT_STL_OPT | |
| 40 | 7094 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7095 { |
| 7096 /* redraw custom status line */ | |
| 1983 | 7097 redraw_custom_statusline(wp); |
| 7 | 7098 } |
| 7099 #endif | |
| 7100 else | |
| 7101 { | |
|
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
|
7102 fillchar = fillchar_status(&attr, wp); |
| 7 | 7103 |
| 685 | 7104 get_trans_bufname(wp->w_buffer); |
| 7 | 7105 p = NameBuff; |
| 7106 len = (int)STRLEN(p); | |
| 7107 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7108 if (bt_help(wp->w_buffer) |
| 7 | 7109 #ifdef FEAT_QUICKFIX |
| 7110 || wp->w_p_pvw | |
| 7111 #endif | |
| 7112 || bufIsChanged(wp->w_buffer) | |
| 7113 || wp->w_buffer->b_p_ro) | |
| 7114 *(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
|
7115 if (bt_help(wp->w_buffer)) |
| 7 | 7116 { |
| 809 | 7117 STRCPY(p + len, _("[Help]")); |
| 7 | 7118 len += (int)STRLEN(p + len); |
| 7119 } | |
| 7120 #ifdef FEAT_QUICKFIX | |
| 7121 if (wp->w_p_pvw) | |
| 7122 { | |
| 7123 STRCPY(p + len, _("[Preview]")); | |
| 7124 len += (int)STRLEN(p + len); | |
| 7125 } | |
| 7126 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7127 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
|
7128 #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
|
7129 && !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
|
7130 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7131 ) |
| 7 | 7132 { |
| 7133 STRCPY(p + len, "[+]"); | |
| 7134 len += 3; | |
| 7135 } | |
| 7136 if (wp->w_buffer->b_p_ro) | |
| 7137 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7138 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
|
7139 len += (int)STRLEN(p + len); |
| 7 | 7140 } |
| 7141 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7142 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
|
7143 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
|
7144 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7145 if (this_ru_col <= 1) |
| 7146 { | |
| 7147 p = (char_u *)"<"; /* No room for file name! */ | |
| 7148 len = 1; | |
| 7149 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7150 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7151 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7152 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7153 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7154 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7155 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7156 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7157 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7158 * Going from start to end is much faster for DBCS. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7159 for (i = 0; p[i] != NUL && clen >= this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7160 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7161 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7162 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7163 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7164 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7165 p = p + i - 1; |
| 7 | 7166 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7167 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7168 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7169 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7170 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7171 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7172 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7173 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7174 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7175 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7176 } |
| 7 | 7177 |
| 7178 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
|
7179 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
|
7180 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
|
7181 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7182 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7183 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7184 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7185 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
|
7186 - 1 + wp->w_wincol), attr); |
| 7 | 7187 |
| 7188 #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
|
7189 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7190 #endif |
| 7191 } | |
| 7192 | |
| 7193 /* | |
| 7194 * May need to draw the character below the vertical separator. | |
| 7195 */ | |
| 7196 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7197 { | |
| 7198 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
|
7199 fillchar = fillchar_status(&attr, wp); |
| 7 | 7200 else |
| 7201 fillchar = fillchar_vsep(&attr); | |
| 7202 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7203 attr); | |
| 7204 } | |
| 1910 | 7205 busy = FALSE; |
| 7 | 7206 } |
| 7207 | |
| 680 | 7208 #ifdef FEAT_STL_OPT |
| 7209 /* | |
| 7210 * Redraw the status line according to 'statusline' and take care of any | |
| 7211 * errors encountered. | |
| 7212 */ | |
| 7213 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7214 redraw_custom_statusline(win_T *wp) |
| 680 | 7215 { |
| 1983 | 7216 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7217 int saved_did_emsg = did_emsg; |
| 1983 | 7218 |
| 7219 /* When called recursively return. This can happen when the statusline | |
| 7220 * contains an expression that triggers a redraw. */ | |
| 7221 if (entered) | |
| 7222 return; | |
| 7223 entered = TRUE; | |
| 680 | 7224 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7225 did_emsg = FALSE; |
| 680 | 7226 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7227 if (did_emsg) |
| 1983 | 7228 { |
| 7229 /* When there is an error disable the statusline, otherwise the | |
| 7230 * display is messed up with errors and a redraw triggers the problem | |
| 7231 * again and again. */ | |
| 680 | 7232 set_string_option_direct((char_u *)"statusline", -1, |
| 7233 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7234 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7235 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7236 did_emsg |= saved_did_emsg; |
| 1983 | 7237 entered = FALSE; |
| 680 | 7238 } |
| 7239 #endif | |
| 7240 | |
| 7 | 7241 /* |
| 7242 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7243 * line of the window right of it. If not, then it's a vertical separator. | |
| 7244 * Only call if (wp->w_vsep_width != 0). | |
| 7245 */ | |
| 7246 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7247 stl_connected(win_T *wp) |
| 7 | 7248 { |
| 7249 frame_T *fr; | |
| 7250 | |
| 7251 fr = wp->w_frame; | |
| 7252 while (fr->fr_parent != NULL) | |
| 7253 { | |
| 7254 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7255 { | |
| 7256 if (fr->fr_next != NULL) | |
| 7257 break; | |
| 7258 } | |
| 7259 else | |
| 7260 { | |
| 7261 if (fr->fr_next != NULL) | |
| 7262 return TRUE; | |
| 7263 } | |
| 7264 fr = fr->fr_parent; | |
| 7265 } | |
| 7266 return FALSE; | |
| 7267 } | |
| 7268 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7269 |
| 7 | 7270 /* |
| 7271 * Get the value to show for the language mappings, active 'keymap'. | |
| 7272 */ | |
| 7273 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7274 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7275 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7276 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
|
7277 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
|
7278 int len) /* length of buffer */ |
| 7 | 7279 { |
| 7280 char_u *p; | |
| 7281 | |
| 7282 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7283 return FALSE; | |
| 7284 | |
| 7285 { | |
| 7286 #ifdef FEAT_EVAL | |
| 7287 buf_T *old_curbuf = curbuf; | |
| 7288 win_T *old_curwin = curwin; | |
| 7289 char_u *s; | |
| 7290 | |
| 7291 curbuf = wp->w_buffer; | |
| 7292 curwin = wp; | |
| 7293 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7294 ++emsg_skip; | |
| 714 | 7295 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7296 --emsg_skip; |
| 7297 curbuf = old_curbuf; | |
| 7298 curwin = old_curwin; | |
| 7299 if (p == NULL || *p == NUL) | |
| 7300 #endif | |
| 7301 { | |
| 7302 #ifdef FEAT_KEYMAP | |
| 7303 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7304 p = wp->w_buffer->b_p_keymap; | |
| 7305 else | |
| 7306 #endif | |
| 7307 p = (char_u *)"lang"; | |
| 7308 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7309 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7310 buf[0] = NUL; |
| 7311 #ifdef FEAT_EVAL | |
| 7312 vim_free(s); | |
| 7313 #endif | |
| 7314 } | |
| 7315 return buf[0] != NUL; | |
| 7316 } | |
| 7317 | |
| 7318 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7319 /* | |
| 677 | 7320 * Redraw the status line or ruler of window "wp". |
| 7321 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7322 */ |
| 7323 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7324 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7325 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7326 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7327 { |
| 5539 | 7328 static int entered = FALSE; |
| 7 | 7329 int attr; |
| 7330 int curattr; | |
| 7331 int row; | |
| 7332 int col = 0; | |
| 7333 int maxwidth; | |
| 7334 int width; | |
| 7335 int n; | |
| 7336 int len; | |
| 7337 int fillchar; | |
| 7338 char_u buf[MAXPATHL]; | |
| 1983 | 7339 char_u *stl; |
| 7 | 7340 char_u *p; |
| 681 | 7341 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7342 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7343 int use_sandbox = FALSE; |
| 2693 | 7344 win_T *ewp; |
| 7345 int p_crb_save; | |
| 7 | 7346 |
| 5539 | 7347 /* There is a tiny chance that this gets called recursively: When |
| 7348 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7349 * Avoid trouble by not allowing recursion. */ | |
| 7350 if (entered) | |
| 7351 return; | |
| 7352 entered = TRUE; | |
| 7353 | |
| 7 | 7354 /* setup environment for the task at hand */ |
| 677 | 7355 if (wp == NULL) |
| 7356 { | |
| 7357 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7358 stl = p_tal; |
| 677 | 7359 row = 0; |
| 707 | 7360 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7361 attr = HL_ATTR(HLF_TPF); |
| 677 | 7362 maxwidth = Columns; |
| 7363 # ifdef FEAT_EVAL | |
| 681 | 7364 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7365 # endif |
| 7366 } | |
| 40 | 7367 else |
| 677 | 7368 { |
| 7369 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
|
7370 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
|
7371 maxwidth = wp->w_width; |
| 677 | 7372 |
| 7373 if (draw_ruler) | |
| 7374 { | |
| 1983 | 7375 stl = p_ruf; |
| 677 | 7376 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7377 if (*stl == '%') |
| 7378 { | |
| 7379 if (*++stl == '-') | |
| 7380 stl++; | |
| 7381 if (atoi((char *)stl)) | |
| 7382 while (VIM_ISDIGIT(*stl)) | |
| 7383 stl++; | |
| 7384 if (*stl++ != '(') | |
| 7385 stl = p_ruf; | |
| 677 | 7386 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7387 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
|
7388 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
|
7389 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
|
7390 maxwidth = wp->w_width - col; |
| 677 | 7391 if (!wp->w_status_height) |
| 7392 { | |
| 7393 row = Rows - 1; | |
| 7394 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7395 fillchar = ' '; | |
| 7396 attr = 0; | |
| 7397 } | |
| 7398 | |
| 7399 # ifdef FEAT_EVAL | |
| 681 | 7400 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7401 # endif |
| 7402 } | |
| 7403 else | |
| 7404 { | |
| 7405 if (*wp->w_p_stl != NUL) | |
| 1983 | 7406 stl = wp->w_p_stl; |
| 677 | 7407 else |
| 1983 | 7408 stl = p_stl; |
| 677 | 7409 # ifdef FEAT_EVAL |
| 681 | 7410 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7411 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7412 # endif |
| 7413 } | |
| 7414 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7415 col += wp->w_wincol; |
| 677 | 7416 } |
| 7417 | |
| 7 | 7418 if (maxwidth <= 0) |
| 5539 | 7419 goto theend; |
| 677 | 7420 |
| 2693 | 7421 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7422 * the cursor away and back. */ | |
| 7423 ewp = wp == NULL ? curwin : wp; | |
| 7424 p_crb_save = ewp->w_p_crb; | |
| 7425 ewp->w_p_crb = FALSE; | |
| 7426 | |
| 1983 | 7427 /* Make a copy, because the statusline may include a function call that |
| 7428 * might change the option value and free the memory. */ | |
| 7429 stl = vim_strsave(stl); | |
| 2693 | 7430 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7431 stl, use_sandbox, |
| 681 | 7432 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7433 vim_free(stl); |
| 2693 | 7434 ewp->w_p_crb = p_crb_save; |
| 2661 | 7435 |
| 7436 /* Make all characters printable. */ | |
| 7437 p = transstr(buf); | |
| 7438 if (p != NULL) | |
| 7439 { | |
| 7440 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7441 vim_free(p); | |
| 7442 } | |
| 7443 | |
| 7444 /* fill up with "fillchar" */ | |
| 835 | 7445 len = (int)STRLEN(buf); |
| 1883 | 7446 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7447 { |
| 7448 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7449 ++width; | |
| 7450 } | |
| 7451 buf[len] = NUL; | |
| 7452 | |
| 681 | 7453 /* |
| 7454 * Draw each snippet with the specified highlighting. | |
| 7455 */ | |
| 7 | 7456 curattr = attr; |
| 7457 p = buf; | |
| 681 | 7458 for (n = 0; hltab[n].start != NULL; n++) |
| 7459 { | |
| 7460 len = (int)(hltab[n].start - p); | |
| 7 | 7461 screen_puts_len(p, len, row, col, curattr); |
| 7462 col += vim_strnsize(p, len); | |
| 681 | 7463 p = hltab[n].start; |
| 7464 | |
| 7465 if (hltab[n].userhl == 0) | |
| 7 | 7466 curattr = attr; |
| 681 | 7467 else if (hltab[n].userhl < 0) |
| 7468 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
|
7469 #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
|
7470 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
|
7471 && 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
|
7472 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
|
7473 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
|
7474 && 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
|
7475 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
|
7476 #endif |
| 680 | 7477 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7478 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7479 else |
| 681 | 7480 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7481 } |
| 7482 screen_puts(p, row, col, curattr); | |
| 681 | 7483 |
| 7484 if (wp == NULL) | |
| 7485 { | |
| 7486 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7487 col = 0; | |
| 7488 len = 0; | |
| 7489 p = buf; | |
| 7490 fillchar = 0; | |
| 7491 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7492 { | |
| 7493 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7494 while (col < len) | |
| 7495 TabPageIdxs[col++] = fillchar; | |
| 7496 p = tabtab[n].start; | |
| 7497 fillchar = tabtab[n].userhl; | |
| 7498 } | |
| 7499 while (col < Columns) | |
| 7500 TabPageIdxs[col++] = fillchar; | |
| 7501 } | |
| 5539 | 7502 |
| 7503 theend: | |
| 7504 entered = FALSE; | |
| 7 | 7505 } |
| 7506 | |
| 7507 #endif /* FEAT_STL_OPT */ | |
| 7508 | |
| 7509 /* | |
| 7510 * Output a single character directly to the screen and update ScreenLines. | |
| 7511 */ | |
| 7512 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7513 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7514 { |
| 3549 | 7515 char_u buf[MB_MAXBYTES + 1]; |
| 7516 | |
| 7517 if (has_mbyte) | |
| 7518 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7519 else | |
| 7520 { | |
| 7521 buf[0] = c; | |
| 7522 buf[1] = NUL; | |
| 7523 } | |
| 7 | 7524 screen_puts(buf, row, col, attr); |
| 7525 } | |
| 7526 | |
| 7527 /* | |
| 7528 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7529 * Also return its attribute in *attrp; | |
| 7530 */ | |
| 7531 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7532 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7533 { |
| 7534 unsigned off; | |
| 7535 | |
| 7536 /* safety check */ | |
| 7537 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7538 { | |
| 7539 off = LineOffset[row] + col; | |
| 7540 *attrp = ScreenAttrs[off]; | |
| 7541 bytes[0] = ScreenLines[off]; | |
| 7542 bytes[1] = NUL; | |
| 7543 | |
| 7544 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7545 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7546 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7547 { | |
| 7548 bytes[0] = ScreenLines[off]; | |
| 7549 bytes[1] = ScreenLines2[off]; | |
| 7550 bytes[2] = NUL; | |
| 7551 } | |
| 7552 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7553 { | |
| 7554 bytes[1] = ScreenLines[off + 1]; | |
| 7555 bytes[2] = NUL; | |
| 7556 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7557 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7558 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7559 |
| 714 | 7560 /* |
| 7561 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7562 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7563 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7564 */ |
| 7565 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7566 screen_comp_differs(int off, int *u8cc) |
| 714 | 7567 { |
| 7568 int i; | |
| 7569 | |
| 7570 for (i = 0; i < Screen_mco; ++i) | |
| 7571 { | |
| 7572 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7573 return TRUE; | |
| 7574 if (u8cc[i] == 0) | |
| 7575 break; | |
| 7576 } | |
| 7577 return FALSE; | |
| 7578 } | |
| 7579 | |
| 7 | 7580 /* |
| 7581 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7582 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7583 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7584 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7585 */ | |
| 7586 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7587 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7588 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7589 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7590 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7591 int attr) |
| 7 | 7592 { |
| 7593 screen_puts_len(text, -1, row, col, attr); | |
| 7594 } | |
| 7595 | |
| 7596 /* | |
| 7597 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7598 * a NUL. | |
| 7599 */ | |
| 7600 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7601 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7602 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7603 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7604 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7605 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7606 int attr) |
| 7 | 7607 { |
| 7608 unsigned off; | |
| 7609 char_u *ptr = text; | |
| 5923 | 7610 int len = textlen; |
| 7 | 7611 int c; |
| 1378 | 7612 unsigned max_off; |
| 7 | 7613 int mbyte_blen = 1; |
| 7614 int mbyte_cells = 1; | |
| 7615 int u8c = 0; | |
| 714 | 7616 int u8cc[MAX_MCO]; |
| 7 | 7617 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7618 #ifdef FEAT_ARABIC |
| 7 | 7619 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7620 int pc, nc, nc1; |
| 7621 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7622 #endif |
| 1843 | 7623 int force_redraw_this; |
| 7624 int force_redraw_next = FALSE; | |
| 7625 int need_redraw; | |
| 7 | 7626 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7627 // Safety check. The check for negative row and column is to fix issue |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7628 // #4102. TODO: find out why row/col could be negative. |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7629 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7630 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7631 || col >= screen_Columns || col < 0) |
| 7 | 7632 return; |
| 1843 | 7633 off = LineOffset[row] + col; |
| 7 | 7634 |
| 1668 | 7635 /* When drawing over the right halve of a double-wide char clear out the |
| 7636 * left halve. Only needed in a terminal. */ | |
| 1685 | 7637 if (has_mbyte && col > 0 && col < screen_Columns |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7638 #ifdef FEAT_GUI |
| 1668 | 7639 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7640 #endif |
| 1668 | 7641 && mb_fix_col(col, row) != col) |
| 1843 | 7642 { |
| 7643 ScreenLines[off - 1] = ' '; | |
| 7644 ScreenAttrs[off - 1] = 0; | |
| 7645 if (enc_utf8) | |
| 7646 { | |
| 7647 ScreenLinesUC[off - 1] = 0; | |
| 7648 ScreenLinesC[0][off - 1] = 0; | |
| 7649 } | |
| 7650 /* redraw the previous cell, make it empty */ | |
| 7651 screen_char(off - 1, row, col - 1); | |
| 7652 /* force the cell at "col" to be redrawn */ | |
| 7653 force_redraw_next = TRUE; | |
| 7654 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7655 |
| 1378 | 7656 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7657 while (col < screen_Columns |
| 7658 && (len < 0 || (int)(ptr - text) < len) | |
| 7659 && *ptr != NUL) | |
| 7 | 7660 { |
| 7661 c = *ptr; | |
| 7662 /* check if this is the first byte of a multibyte */ | |
| 7663 if (has_mbyte) | |
| 7664 { | |
| 7665 if (enc_utf8 && len > 0) | |
| 474 | 7666 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7667 else |
| 474 | 7668 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7669 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7670 mbyte_cells = 1; | |
| 7671 else if (enc_dbcs != 0) | |
| 7672 mbyte_cells = mbyte_blen; | |
| 7673 else /* enc_utf8 */ | |
| 7674 { | |
| 7675 if (len >= 0) | |
| 714 | 7676 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7677 (int)((text + len) - ptr)); |
| 7678 else | |
| 714 | 7679 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7680 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7681 #ifdef FEAT_ARABIC |
| 7 | 7682 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7683 { | |
| 7684 /* Do Arabic shaping. */ | |
| 7685 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7686 { | |
| 7687 /* Past end of string to be displayed. */ | |
| 7688 nc = NUL; | |
| 7689 nc1 = NUL; | |
| 7690 } | |
| 7691 else | |
| 714 | 7692 { |
| 1994 | 7693 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7694 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7695 nc1 = pcc[0]; |
| 7696 } | |
| 7 | 7697 pc = prev_c; |
| 7698 prev_c = u8c; | |
| 714 | 7699 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7700 } |
| 7701 else | |
| 7702 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7703 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7704 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7705 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7706 /* 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
|
7707 * 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
|
7708 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7709 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7710 } |
| 7 | 7711 } |
| 7712 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7713 |
| 1843 | 7714 force_redraw_this = force_redraw_next; |
| 7715 force_redraw_next = FALSE; | |
| 7716 | |
| 7717 need_redraw = ScreenLines[off] != c | |
| 7 | 7718 || (mbyte_cells == 2 |
| 7719 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7720 || (enc_dbcs == DBCS_JPNU | |
| 7721 && c == 0x8e | |
| 7722 && ScreenLines2[off] != ptr[1]) | |
| 7723 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7724 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7725 (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
|
7726 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7727 && screen_comp_differs(off, u8cc)))) |
| 7 | 7728 || ScreenAttrs[off] != attr |
| 1843 | 7729 || exmode_active; |
| 7730 | |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7731 if ((need_redraw || force_redraw_this) |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7732 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
7733 && !blocked_by_popup(row, col) |
|
16998
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7734 #endif |
|
2ec0f953ec3f
patch 8.1.1499: ruler not updated after popup window was removed
Bram Moolenaar <Bram@vim.org>
parents:
16994
diff
changeset
|
7735 ) |
| 7 | 7736 { |
| 7737 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7738 /* The bold trick makes a single row of pixels appear in the next | |
| 7739 * character. When a bold character is removed, the next | |
| 7740 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7741 * and for some xterms. */ |
| 7742 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7743 # ifdef FEAT_GUI |
| 7744 gui.in_use | |
| 7745 # endif | |
| 7746 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7747 || | |
| 7748 # endif | |
| 7749 # ifdef UNIX | |
| 7750 term_is_xterm | |
| 7751 # endif | |
| 1843 | 7752 )) |
| 7753 { | |
| 7754 int n = ScreenAttrs[off]; | |
| 7755 | |
| 7756 if (n > HL_ALL) | |
| 7757 n = syn_attr2attr(n); | |
| 7758 if (n & HL_BOLD) | |
| 7759 force_redraw_next = TRUE; | |
| 7 | 7760 } |
| 7761 #endif | |
| 7762 /* When at the end of the text and overwriting a two-cell | |
| 7763 * character with a one-cell character, need to clear the next | |
| 7764 * cell. Also when overwriting the left halve of a two-cell char | |
| 7765 * with the right halve of a two-cell char. Do this only once | |
| 7766 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7767 if (clear_next_cell) | |
| 7768 clear_next_cell = FALSE; | |
| 7769 else if (has_mbyte | |
| 7770 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7771 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7772 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7773 || (mbyte_cells == 2 |
| 1378 | 7774 && (*mb_off2cells)(off, max_off) == 1 |
| 7775 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7776 clear_next_cell = TRUE; |
| 7777 | |
| 7778 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7779 * it confuses mb_off2cells(). */ | |
| 7780 if (enc_dbcs | |
| 1378 | 7781 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7782 || (mbyte_cells == 2 |
| 1378 | 7783 && (*mb_off2cells)(off, max_off) == 1 |
| 7784 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7785 ScreenLines[off + mbyte_blen] = 0; |
| 7786 ScreenLines[off] = c; | |
| 7787 ScreenAttrs[off] = attr; | |
| 7788 if (enc_utf8) | |
| 7789 { | |
| 714 | 7790 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7791 ScreenLinesUC[off] = 0; |
| 7792 else | |
| 7793 { | |
| 714 | 7794 int i; |
| 7795 | |
| 7 | 7796 ScreenLinesUC[off] = u8c; |
| 714 | 7797 for (i = 0; i < Screen_mco; ++i) |
| 7798 { | |
| 7799 ScreenLinesC[i][off] = u8cc[i]; | |
| 7800 if (u8cc[i] == 0) | |
| 7801 break; | |
| 7802 } | |
| 7 | 7803 } |
| 7804 if (mbyte_cells == 2) | |
| 7805 { | |
| 7806 ScreenLines[off + 1] = 0; | |
| 7807 ScreenAttrs[off + 1] = attr; | |
| 7808 } | |
| 7809 screen_char(off, row, col); | |
| 7810 } | |
| 7811 else if (mbyte_cells == 2) | |
| 7812 { | |
| 7813 ScreenLines[off + 1] = ptr[1]; | |
| 7814 ScreenAttrs[off + 1] = attr; | |
| 7815 screen_char_2(off, row, col); | |
| 7816 } | |
| 7817 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7818 { | |
| 7819 ScreenLines2[off] = ptr[1]; | |
| 7820 screen_char(off, row, col); | |
| 7821 } | |
| 7822 else | |
| 7823 screen_char(off, row, col); | |
| 7824 } | |
| 7825 if (has_mbyte) | |
| 7826 { | |
| 7827 off += mbyte_cells; | |
| 7828 col += mbyte_cells; | |
| 7829 ptr += mbyte_blen; | |
| 7830 if (clear_next_cell) | |
| 5923 | 7831 { |
| 7832 /* This only happens at the end, display one space next. */ | |
| 7 | 7833 ptr = (char_u *)" "; |
| 5923 | 7834 len = -1; |
| 7835 } | |
| 7 | 7836 } |
| 7837 else | |
| 7838 { | |
| 7839 ++off; | |
| 7840 ++col; | |
| 7841 ++ptr; | |
| 7842 } | |
| 7843 } | |
| 1843 | 7844 |
| 7845 /* If we detected the next character needs to be redrawn, but the text | |
| 7846 * doesn't extend up to there, update the character here. */ | |
| 7847 if (force_redraw_next && col < screen_Columns) | |
| 7848 { | |
| 7849 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7850 screen_char_2(off, row, col); | |
| 7851 else | |
| 7852 screen_char(off, row, col); | |
| 7853 } | |
| 7 | 7854 } |
| 7855 | |
| 7856 #ifdef FEAT_SEARCH_EXTRA | |
| 7857 /* | |
| 1326 | 7858 * Prepare for 'hlsearch' highlighting. |
| 7 | 7859 */ |
| 7860 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7861 start_search_hl(void) |
| 7 | 7862 { |
| 7863 if (p_hls && !no_hlsearch) | |
| 7864 { | |
| 7865 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
|
7866 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7867 # ifdef FEAT_RELTIME |
| 7868 /* Set the time limit to 'redrawtime'. */ | |
| 7869 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7870 # endif | |
| 7 | 7871 } |
| 7872 } | |
| 7873 | |
| 7874 /* | |
| 1326 | 7875 * Clean up for 'hlsearch' highlighting. |
| 7 | 7876 */ |
| 7877 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7878 end_search_hl(void) |
| 7 | 7879 { |
| 7880 if (search_hl.rm.regprog != NULL) | |
| 7881 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7882 vim_regfree(search_hl.rm.regprog); |
| 7 | 7883 search_hl.rm.regprog = NULL; |
| 7884 } | |
| 7885 } | |
| 7886 | |
| 7887 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7888 * 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
|
7889 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7890 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7891 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
|
7892 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7893 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7894 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7895 /* 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
|
7896 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7897 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7898 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7899 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7900 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7901 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7902 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7903 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7904 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
|
7905 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
|
7906 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7907 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7908 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7909 /* 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
|
7910 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
|
7911 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7912 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7913 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7914 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
|
7915 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7916 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7917 /* 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
|
7918 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7919 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7920 /* |
| 7 | 7921 * Advance to the match in window "wp" line "lnum" or past it. |
| 7922 */ | |
| 7923 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7924 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7925 { |
| 1326 | 7926 matchitem_T *cur; /* points to the match list */ |
| 7927 match_T *shl; /* points to search_hl or a match */ | |
| 7928 int shl_flag; /* flag to indicate whether search_hl | |
| 7929 has been processed or not */ | |
| 5979 | 7930 int pos_inprogress; /* marks that position match search is |
| 7931 in progress */ | |
| 7 | 7932 int n; |
| 7933 | |
| 7934 /* | |
| 7935 * When using a multi-line pattern, start searching at the top | |
| 7936 * of the window or just after a closed fold. | |
| 1326 | 7937 * Do this both for search_hl and the match list. |
| 7 | 7938 */ |
| 1326 | 7939 cur = wp->w_match_head; |
| 7940 shl_flag = FALSE; | |
| 7941 while (cur != NULL || shl_flag == FALSE) | |
| 7942 { | |
| 7943 if (shl_flag == FALSE) | |
| 7944 { | |
| 7945 shl = &search_hl; | |
| 7946 shl_flag = TRUE; | |
| 7947 } | |
| 7948 else | |
| 7949 shl = &cur->hl; | |
| 7 | 7950 if (shl->rm.regprog != NULL |
| 7951 && shl->lnum == 0 | |
| 7952 && re_multiline(shl->rm.regprog)) | |
| 7953 { | |
| 7954 if (shl->first_lnum == 0) | |
| 7955 { | |
| 7956 # ifdef FEAT_FOLDING | |
| 7957 for (shl->first_lnum = lnum; | |
| 7958 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7959 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7960 NULL, NULL, TRUE, NULL)) | |
| 7961 break; | |
| 7962 # else | |
| 7963 shl->first_lnum = wp->w_topline; | |
| 7964 # endif | |
| 7965 } | |
| 5979 | 7966 if (cur != NULL) |
| 7967 cur->pos.cur = 0; | |
| 7968 pos_inprogress = TRUE; | |
| 7 | 7969 n = 0; |
| 5979 | 7970 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7971 || (cur != NULL && pos_inprogress))) | |
| 7972 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7973 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
|
7974 shl == &search_hl ? NULL : cur); |
| 5979 | 7975 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7976 ? FALSE : TRUE; | |
| 7 | 7977 if (shl->lnum != 0) |
| 7978 { | |
| 7979 shl->first_lnum = shl->lnum | |
| 7980 + shl->rm.endpos[0].lnum | |
| 7981 - shl->rm.startpos[0].lnum; | |
| 7982 n = shl->rm.endpos[0].col; | |
| 7983 } | |
| 7984 else | |
| 7985 { | |
| 7986 ++shl->first_lnum; | |
| 7987 n = 0; | |
| 7988 } | |
| 7989 } | |
| 7990 } | |
| 1326 | 7991 if (shl != &search_hl && cur != NULL) |
| 7992 cur = cur->next; | |
| 7 | 7993 } |
| 7994 } | |
| 7995 | |
| 7996 /* | |
| 1326 | 7997 * Search for a next 'hlsearch' or match. |
| 7 | 7998 * Uses shl->buf. |
| 7999 * Sets shl->lnum and shl->rm contents. | |
| 8000 * Note: Assumes a previous match is always before "lnum", unless | |
| 8001 * shl->lnum is zero. | |
| 8002 * Careful: Any pointers for buffer lines will become invalid. | |
| 8003 */ | |
| 8004 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8005 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8006 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8007 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
|
8008 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8009 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
|
8010 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8011 { |
| 8012 linenr_T l; | |
| 8013 colnr_T matchcol; | |
| 8014 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
|
8015 int save_called_emsg = called_emsg; |
| 7 | 8016 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8017 // 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
|
8018 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
|
8019 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8020 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
|
8021 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8022 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8023 |
| 7 | 8024 if (shl->lnum != 0) |
| 8025 { | |
| 8026 /* Check for three situations: | |
| 8027 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8028 * 2. If the previous match includes "mincol", use it. | |
| 8029 * 3. Continue after the previous match. | |
| 8030 */ | |
| 8031 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8032 if (lnum > l) | |
| 8033 shl->lnum = 0; | |
| 8034 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8035 return; | |
| 8036 } | |
| 8037 | |
| 8038 /* | |
| 8039 * Repeat searching for a match until one is found that includes "mincol" | |
| 8040 * or none is found in this line. | |
| 8041 */ | |
| 8042 called_emsg = FALSE; | |
| 8043 for (;;) | |
| 8044 { | |
| 1521 | 8045 #ifdef FEAT_RELTIME |
| 8046 /* Stop searching after passing the time limit. */ | |
| 8047 if (profile_passed_limit(&(shl->tm))) | |
| 8048 { | |
| 8049 shl->lnum = 0; /* no match found in time */ | |
| 8050 break; | |
| 8051 } | |
| 8052 #endif | |
| 7 | 8053 /* Three situations: |
| 8054 * 1. No useful previous match: search from start of line. | |
| 8055 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8056 * Break the loop if this is beyond the end of the line. | |
| 8057 * 3. Vi compatible searching: continue at end of previous match. | |
| 8058 */ | |
| 8059 if (shl->lnum == 0) | |
| 8060 matchcol = 0; | |
| 8061 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8062 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8063 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8064 { | |
| 688 | 8065 char_u *ml; |
| 685 | 8066 |
| 8067 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8068 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8069 if (*ml == NUL) |
| 8070 { | |
| 8071 ++matchcol; | |
| 7 | 8072 shl->lnum = 0; |
| 8073 break; | |
| 8074 } | |
| 685 | 8075 if (has_mbyte) |
| 8076 matchcol += mb_ptr2len(ml); | |
| 8077 else | |
| 8078 ++matchcol; | |
| 7 | 8079 } |
| 8080 else | |
| 8081 matchcol = shl->rm.endpos[0].col; | |
| 8082 | |
| 8083 shl->lnum = lnum; | |
| 5979 | 8084 if (shl->rm.regprog != NULL) |
| 8085 { | |
| 6394 | 8086 /* Remember whether shl->rm is using a copy of the regprog in |
| 8087 * cur->match. */ | |
| 8088 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8089 && shl == &cur->hl | |
| 8090 && 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
|
8091 int timed_out = FALSE; |
| 6394 | 8092 |
| 5979 | 8093 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8094 matchcol, | |
| 1521 | 8095 #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
|
8096 &(shl->tm), &timed_out |
| 1521 | 8097 #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
|
8098 NULL, NULL |
| 5979 | 8099 #endif |
| 8100 ); | |
| 6394 | 8101 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8102 if (regprog_is_copy) | |
| 8103 cur->match.regprog = cur->hl.rm.regprog; | |
| 8104 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8105 if (called_emsg || got_int || timed_out) |
| 5979 | 8106 { |
| 8107 /* Error while handling regexp: stop using this regexp. */ | |
| 8108 if (shl == &search_hl) | |
| 8109 { | |
| 8110 /* don't free regprog in the match list, it's a copy */ | |
| 8111 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
|
8112 set_no_hlsearch(TRUE); |
| 5979 | 8113 } |
| 8114 shl->rm.regprog = NULL; | |
| 8115 shl->lnum = 0; | |
| 8116 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8117 message */ | |
| 8118 break; | |
| 8119 } | |
| 8120 } | |
| 8121 else if (cur != NULL) | |
| 8122 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8123 else |
| 8124 nmatched = 0; | |
| 7 | 8125 if (nmatched == 0) |
| 8126 { | |
| 8127 shl->lnum = 0; /* no match found */ | |
| 8128 break; | |
| 8129 } | |
| 8130 if (shl->rm.startpos[0].lnum > 0 | |
| 8131 || shl->rm.startpos[0].col >= mincol | |
| 8132 || nmatched > 1 | |
| 8133 || shl->rm.endpos[0].col > mincol) | |
| 8134 { | |
| 8135 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8136 break; /* useful match found */ | |
| 8137 } | |
| 8138 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8139 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8140 // 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
|
8141 called_emsg = save_called_emsg; |
| 7 | 8142 } |
| 8143 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8144 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8145 * 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
|
8146 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8147 */ |
| 5979 | 8148 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8149 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8150 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
|
8151 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8152 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8153 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8154 { |
| 8155 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8156 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8157 |
| 5979 | 8158 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8159 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8160 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8161 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8162 if (pos->lnum == 0) |
| 5979 | 8163 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8164 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8165 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8166 if (pos->lnum == lnum) |
| 5979 | 8167 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8168 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8169 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8170 /* 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
|
8171 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8172 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
|
8173 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8174 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8175 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8176 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8177 posmatch->pos[found] = tmp; |
| 5979 | 8178 } |
| 8179 } | |
| 8180 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8181 found = i; |
| 5979 | 8182 } |
| 8183 } | |
| 8184 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8185 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8186 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8187 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
|
8188 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8189 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
|
8190 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8191 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8192 shl->lnum = lnum; |
| 5979 | 8193 shl->rm.startpos[0].lnum = 0; |
| 8194 shl->rm.startpos[0].col = start; | |
| 8195 shl->rm.endpos[0].lnum = 0; | |
| 8196 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
|
8197 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8198 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8199 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8200 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8201 return 0; |
| 5979 | 8202 } |
| 5985 | 8203 #endif |
| 5979 | 8204 |
| 7 | 8205 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8206 screen_start_highlight(int attr) |
| 7 | 8207 { |
| 8208 attrentry_T *aep = NULL; | |
| 8209 | |
| 8210 screen_attr = attr; | |
| 8211 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8212 #ifdef MSWIN |
| 7 | 8213 && termcap_active |
| 8214 #endif | |
| 8215 ) | |
| 8216 { | |
| 8217 #ifdef FEAT_GUI | |
| 8218 if (gui.in_use) | |
| 8219 { | |
| 8220 char buf[20]; | |
| 8221 | |
| 681 | 8222 /* The GUI handles this internally. */ |
| 8223 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8224 OUT_STR(buf); |
| 8225 } | |
| 8226 else | |
| 8227 #endif | |
| 8228 { | |
| 8229 if (attr > HL_ALL) /* special HL attr. */ | |
| 8230 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8231 if (IS_CTERM) |
| 7 | 8232 aep = syn_cterm_attr2entry(attr); |
| 8233 else | |
| 8234 aep = syn_term_attr2entry(attr); | |
| 8235 if (aep == NULL) /* did ":syntax clear" */ | |
| 8236 attr = 0; | |
| 8237 else | |
| 8238 attr = aep->ae_attr; | |
| 8239 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8240 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8241 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
|
8242 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
|
8243 #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
|
8244 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
|
8245 ? 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
|
8246 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8247 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8248 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8249 /* If the Normal FG color has BOLD attribute and the new HL |
| 8250 * has a FG color defined, clear BOLD. */ | |
| 8251 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
|
8252 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8253 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
|
8254 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
|
8255 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
|
8256 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
|
8257 || ((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
|
8258 && *T_US != NUL) |
| 7 | 8259 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
|
8260 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8261 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
|
8262 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8263 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
|
8264 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
|
8265 out_str(T_STS); |
| 7 | 8266 |
| 8267 /* | |
| 8268 * Output the color or start string after bold etc., in case the | |
| 8269 * bold etc. override the color setting. | |
| 8270 */ | |
| 8271 if (aep != NULL) | |
| 8272 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8273 #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
|
8274 /* 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
|
8275 * 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
|
8276 * 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
|
8277 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
|
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.fg_rgb != INVALCOLOR) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8280 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
|
8281 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8282 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8283 #endif |
|
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.fg_color) |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8287 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
|
8288 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8289 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8290 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
|
8291 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8292 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
|
8293 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8294 } |
| 8295 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8296 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8297 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
|
8298 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8299 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
|
8300 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
|
8301 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8302 |
|
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
|
8303 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
|
8304 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8305 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
|
8306 out_str(aep->ae_u.term.start); |
| 7 | 8307 } |
| 8308 } | |
| 8309 } | |
| 8310 } | |
| 8311 } | |
| 8312 | |
| 8313 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8314 screen_stop_highlight(void) |
| 7 | 8315 { |
| 8316 int do_ME = FALSE; /* output T_ME code */ | |
| 8317 | |
| 8318 if (screen_attr != 0 | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8319 #ifdef MSWIN |
| 7 | 8320 && termcap_active |
| 8321 #endif | |
| 8322 ) | |
| 8323 { | |
| 8324 #ifdef FEAT_GUI | |
| 8325 if (gui.in_use) | |
| 8326 { | |
| 8327 char buf[20]; | |
| 8328 | |
| 8329 /* use internal GUI code */ | |
| 8330 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8331 OUT_STR(buf); | |
| 8332 } | |
| 8333 else | |
| 8334 #endif | |
| 8335 { | |
| 8336 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8337 { | |
| 8338 attrentry_T *aep; | |
| 8339 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8340 if (IS_CTERM) |
| 7 | 8341 { |
| 8342 /* | |
| 8343 * Assume that t_me restores the original colors! | |
| 8344 */ | |
| 8345 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
|
8346 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8347 #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
|
8348 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
|
8349 ? 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
|
8350 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8351 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8352 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
|
8353 #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
|
8354 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
|
8355 ? 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
|
8356 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8357 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8358 aep->ae_u.cterm.bg_color))) |
| 7 | 8359 do_ME = TRUE; |
| 8360 } | |
| 8361 else | |
| 8362 { | |
| 8363 aep = syn_term_attr2entry(screen_attr); | |
| 8364 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8365 { | |
| 8366 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8367 do_ME = TRUE; | |
| 8368 else | |
| 8369 out_str(aep->ae_u.term.stop); | |
| 8370 } | |
| 8371 } | |
| 8372 if (aep == NULL) /* did ":syntax clear" */ | |
| 8373 screen_attr = 0; | |
| 8374 else | |
| 8375 screen_attr = aep->ae_attr; | |
| 8376 } | |
| 8377 | |
| 8378 /* | |
| 8379 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8380 * same sequence several times. | |
| 8381 */ | |
| 8382 if (screen_attr & HL_STANDOUT) | |
| 8383 { | |
| 8384 if (STRCMP(T_SE, T_ME) == 0) | |
| 8385 do_ME = TRUE; | |
| 8386 else | |
| 8387 out_str(T_SE); | |
| 8388 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8389 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
|
8390 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8391 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
|
8392 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8393 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8394 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
|
8395 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8396 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
|
8397 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8398 { |
| 8399 if (STRCMP(T_UE, T_ME) == 0) | |
| 8400 do_ME = TRUE; | |
| 8401 else | |
| 8402 out_str(T_UE); | |
| 8403 } | |
| 8404 if (screen_attr & HL_ITALIC) | |
| 8405 { | |
| 8406 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8407 do_ME = TRUE; | |
| 8408 else | |
| 8409 out_str(T_CZR); | |
| 8410 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8411 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8412 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8413 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
|
8414 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8415 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8416 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8417 } |
| 7 | 8418 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8419 out_str(T_ME); | |
| 8420 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8421 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8422 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8423 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8424 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
|
8425 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
|
8426 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
|
8427 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
|
8428 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8429 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8430 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8431 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8432 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8433 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8434 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8435 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8436 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
|
8437 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8438 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
|
8439 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8440 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8441 } |
| 7 | 8442 } |
| 8443 } | |
| 8444 } | |
| 8445 screen_attr = 0; | |
| 8446 } | |
| 8447 | |
| 8448 /* | |
| 8449 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8450 * The machine specific code may override this again. | |
| 8451 */ | |
| 8452 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8453 reset_cterm_colors(void) |
| 7 | 8454 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8455 if (IS_CTERM) |
| 7 | 8456 { |
| 8457 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8458 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8459 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
|
8460 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8461 : (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
|
8462 #else |
| 7 | 8463 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
|
8464 #endif |
| 7 | 8465 { |
| 8466 out_str(T_OP); | |
| 8467 screen_attr = -1; | |
| 8468 } | |
| 8469 if (cterm_normal_fg_bold) | |
| 8470 { | |
| 8471 out_str(T_ME); | |
| 8472 screen_attr = -1; | |
| 8473 } | |
| 8474 } | |
| 8475 } | |
| 8476 | |
| 8477 /* | |
| 8478 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8479 * using the attributes from ScreenAttrs["off"]. | |
| 8480 */ | |
| 8481 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8482 screen_char(unsigned off, int row, int col) |
| 7 | 8483 { |
| 8484 int attr; | |
| 8485 | |
| 8486 /* Check for illegal values, just in case (could happen just after | |
| 8487 * resizing). */ | |
| 8488 if (row >= screen_Rows || col >= screen_Columns) | |
| 8489 return; | |
| 8490 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8491 #ifdef FEAT_INS_EXPAND |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8492 // Skip if under the popup menu. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8493 // Popup windows with zindex higher than POPUPMENU_ZINDEX go on top. |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8494 if (pum_under_menu(row, col) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8495 # ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8496 && screen_zindex <= POPUPMENU_ZINDEX |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8497 # endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8498 ) |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8499 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8500 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8501 #ifdef FEAT_TEXT_PROP |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8502 if (blocked_by_popup(row, col)) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8503 return; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8504 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8505 |
| 6602 | 8506 /* Outputting a character in the last cell on the screen may scroll the |
| 8507 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8508 * mark the character invalid (update it when scrolled up). */ | |
| 8509 if (*T_XN == NUL | |
| 8510 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8511 #ifdef FEAT_RIGHTLEFT |
| 8512 /* account for first command-line character in rightleft mode */ | |
| 8513 && !cmdmsg_rl | |
| 8514 #endif | |
| 8515 ) | |
| 8516 { | |
| 8517 ScreenAttrs[off] = (sattr_T)-1; | |
| 8518 return; | |
| 8519 } | |
| 8520 | |
| 8521 /* | |
| 8522 * Stop highlighting first, so it's easier to move the cursor. | |
| 8523 */ | |
| 8524 if (screen_char_attr != 0) | |
| 8525 attr = screen_char_attr; | |
| 8526 else | |
| 8527 attr = ScreenAttrs[off]; | |
| 8528 if (screen_attr != attr) | |
| 8529 screen_stop_highlight(); | |
| 8530 | |
| 8531 windgoto(row, col); | |
| 8532 | |
| 8533 if (screen_attr != attr) | |
| 8534 screen_start_highlight(attr); | |
| 8535 | |
| 8536 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8537 { | |
| 8538 char_u buf[MB_MAXBYTES + 1]; | |
| 8539 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8540 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
|
8541 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8542 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8543 #ifdef FEAT_GUI |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8544 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8545 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8546 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8547 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8548 /* 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
|
8549 * 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
|
8550 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
|
8551 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
|
8552 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8553 /* 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
|
8554 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8555 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
|
8556 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8557 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8558 ++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
|
8559 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8560 /* 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
|
8561 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
|
8562 out_str(buf); |
| 7 | 8563 } |
| 8564 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8565 { |
| 7 | 8566 out_flush_check(); |
| 8567 out_char(ScreenLines[off]); | |
| 8568 /* double-byte character in single-width cell */ | |
| 8569 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8570 out_char(ScreenLines2[off]); | |
| 8571 } | |
| 8572 | |
| 8573 screen_cur_col++; | |
| 8574 } | |
| 8575 | |
| 8576 /* | |
| 8577 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8578 * on the screen at position 'row' and 'col'. | |
| 8579 * The attributes of the first byte is used for all. This is required to | |
| 8580 * output the two bytes of a double-byte character with nothing in between. | |
| 8581 */ | |
| 8582 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8583 screen_char_2(unsigned off, int row, int col) |
| 7 | 8584 { |
| 8585 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8586 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8587 return; | |
| 8588 | |
| 8589 /* Outputting the last character on the screen may scrollup the screen. | |
| 8590 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8591 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8592 { | |
| 8593 ScreenAttrs[off] = (sattr_T)-1; | |
| 8594 return; | |
| 8595 } | |
| 8596 | |
| 8597 /* Output the first byte normally (positions the cursor), then write the | |
| 8598 * second byte directly. */ | |
| 8599 screen_char(off, row, col); | |
| 8600 out_char(ScreenLines[off + 1]); | |
| 8601 ++screen_cur_col; | |
| 8602 } | |
| 8603 | |
| 8604 /* | |
| 8605 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8606 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8607 */ | |
| 8608 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8609 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8610 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8611 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8612 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8613 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8614 int invert) |
| 7 | 8615 { |
| 8616 int r, c; | |
| 8617 int off; | |
| 1378 | 8618 int max_off; |
| 7 | 8619 |
| 534 | 8620 /* Can't use ScreenLines unless initialized */ |
| 8621 if (ScreenLines == NULL) | |
| 8622 return; | |
| 8623 | |
| 7 | 8624 if (invert) |
| 8625 screen_char_attr = HL_INVERSE; | |
| 8626 for (r = row; r < row + height; ++r) | |
| 8627 { | |
| 8628 off = LineOffset[r]; | |
| 1378 | 8629 max_off = off + screen_Columns; |
| 7 | 8630 for (c = col; c < col + width; ++c) |
| 8631 { | |
| 1378 | 8632 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8633 { |
| 8634 screen_char_2(off + c, r, c); | |
| 8635 ++c; | |
| 8636 } | |
| 8637 else | |
| 8638 { | |
| 8639 screen_char(off + c, r, c); | |
| 1378 | 8640 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8641 ++c; |
| 8642 } | |
| 8643 } | |
| 8644 } | |
| 8645 screen_char_attr = 0; | |
| 8646 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8647 |
| 7 | 8648 /* |
| 8649 * Redraw the characters for a vertically split window. | |
| 8650 */ | |
| 8651 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8652 redraw_block(int row, int end, win_T *wp) |
| 7 | 8653 { |
| 8654 int col; | |
| 8655 int width; | |
| 8656 | |
| 8657 # ifdef FEAT_CLIPBOARD | |
| 8658 clip_may_clear_selection(row, end - 1); | |
| 8659 # endif | |
| 8660 | |
| 8661 if (wp == NULL) | |
| 8662 { | |
| 8663 col = 0; | |
| 8664 width = Columns; | |
| 8665 } | |
| 8666 else | |
| 8667 { | |
| 8668 col = wp->w_wincol; | |
| 8669 width = wp->w_width; | |
| 8670 } | |
| 8671 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8672 } | |
| 8673 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8674 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8675 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
|
8676 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8677 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8678 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8679 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8680 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8681 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8682 |
| 7 | 8683 /* |
| 8684 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8685 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8686 * Use attributes 'attr'. | |
| 8687 */ | |
| 8688 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8689 screen_fill( |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8690 int start_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8691 int end_row, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8692 int start_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8693 int end_col, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8694 int c1, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8695 int c2, |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8696 int attr) |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8697 { |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8698 int row; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8699 int col; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8700 int off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8701 int end_off; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8702 int did_delete; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8703 int c; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8704 int norm_term; |
| 7 | 8705 #if defined(FEAT_GUI) || defined(UNIX) |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8706 int force_next = FALSE; |
| 7 | 8707 #endif |
| 8708 | |
| 8709 if (end_row > screen_Rows) /* safety check */ | |
| 8710 end_row = screen_Rows; | |
| 8711 if (end_col > screen_Columns) /* safety check */ | |
| 8712 end_col = screen_Columns; | |
| 8713 if (ScreenLines == NULL | |
| 8714 || start_row >= end_row | |
| 8715 || start_col >= end_col) /* nothing to do */ | |
| 8716 return; | |
| 8717 | |
| 8718 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8719 norm_term = ( | |
| 8720 #ifdef FEAT_GUI | |
| 8721 !gui.in_use && | |
| 8722 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8723 !IS_CTERM); |
| 7 | 8724 for (row = start_row; row < end_row; ++row) |
| 8725 { | |
| 1668 | 8726 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8727 #ifdef FEAT_GUI |
| 1668 | 8728 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8729 #endif |
| 1668 | 8730 ) |
| 8731 { | |
| 8732 /* When drawing over the right halve of a double-wide char clear | |
| 8733 * out the left halve. When drawing over the left halve of a | |
| 8734 * double wide-char clear out the right halve. Only needed in a | |
| 8735 * terminal. */ | |
| 1685 | 8736 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8737 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8738 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8739 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8740 } |
| 7 | 8741 /* |
| 8742 * Try to use delete-line termcap code, when no attributes or in a | |
| 8743 * "normal" terminal, where a bold/italic space is just a | |
| 8744 * space. | |
| 8745 */ | |
| 8746 did_delete = FALSE; | |
| 8747 if (c2 == ' ' | |
| 8748 && end_col == Columns | |
| 8749 && can_clear(T_CE) | |
| 8750 && (attr == 0 | |
| 8751 || (norm_term | |
| 8752 && attr <= HL_ALL | |
| 8753 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8754 { | |
| 8755 /* | |
| 8756 * check if we really need to clear something | |
| 8757 */ | |
| 8758 col = start_col; | |
| 8759 if (c1 != ' ') /* don't clear first char */ | |
| 8760 ++col; | |
| 8761 | |
| 8762 off = LineOffset[row] + col; | |
| 8763 end_off = LineOffset[row] + end_col; | |
| 8764 | |
| 8765 /* skip blanks (used often, keep it fast!) */ | |
| 8766 if (enc_utf8) | |
| 8767 while (off < end_off && ScreenLines[off] == ' ' | |
| 8768 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8769 ++off; | |
| 8770 else | |
| 8771 while (off < end_off && ScreenLines[off] == ' ' | |
| 8772 && ScreenAttrs[off] == 0) | |
| 8773 ++off; | |
| 8774 if (off < end_off) /* something to be cleared */ | |
| 8775 { | |
| 8776 col = off - LineOffset[row]; | |
| 8777 screen_stop_highlight(); | |
| 8778 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8779 out_str(T_CE); | |
| 8780 screen_start(); /* don't know where cursor is now */ | |
| 8781 col = end_col - col; | |
| 8782 while (col--) /* clear chars in ScreenLines */ | |
| 8783 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8784 space_to_screenline(off, 0); |
| 7 | 8785 ++off; |
| 8786 } | |
| 8787 } | |
| 8788 did_delete = TRUE; /* the chars are cleared now */ | |
| 8789 } | |
| 8790 | |
| 8791 off = LineOffset[row] + start_col; | |
| 8792 c = c1; | |
| 8793 for (col = start_col; col < end_col; ++col) | |
| 8794 { | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8795 if ((ScreenLines[off] != c |
| 714 | 8796 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8797 != (c >= 0x80 ? c : 0)) | |
| 7 | 8798 || ScreenAttrs[off] != attr |
| 8799 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8800 || force_next | |
| 8801 #endif | |
| 8802 ) | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8803 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8804 // Skip if under a(nother) popup. |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8805 && !blocked_by_popup(row, col) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8806 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8807 ) |
| 7 | 8808 { |
| 8809 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8810 /* The bold trick may make a single row of pixels appear in | |
| 8811 * the next character. When a bold character is removed, the | |
| 8812 * next character should be redrawn too. This happens for our | |
| 8813 * own GUI and for some xterms. */ | |
| 8814 if ( | |
| 8815 # ifdef FEAT_GUI | |
| 8816 gui.in_use | |
| 8817 # endif | |
| 8818 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8819 || | |
| 8820 # endif | |
| 8821 # ifdef UNIX | |
| 8822 term_is_xterm | |
| 8823 # endif | |
| 8824 ) | |
| 8825 { | |
| 8826 if (ScreenLines[off] != ' ' | |
| 8827 && (ScreenAttrs[off] > HL_ALL | |
| 8828 || ScreenAttrs[off] & HL_BOLD)) | |
| 8829 force_next = TRUE; | |
| 8830 else | |
| 8831 force_next = FALSE; | |
| 8832 } | |
| 8833 #endif | |
| 8834 ScreenLines[off] = c; | |
| 8835 if (enc_utf8) | |
| 8836 { | |
| 8837 if (c >= 0x80) | |
| 8838 { | |
| 8839 ScreenLinesUC[off] = c; | |
| 714 | 8840 ScreenLinesC[0][off] = 0; |
| 7 | 8841 } |
| 8842 else | |
| 8843 ScreenLinesUC[off] = 0; | |
| 8844 } | |
| 8845 ScreenAttrs[off] = attr; | |
| 8846 if (!did_delete || c != ' ') | |
| 8847 screen_char(off, row, col); | |
| 8848 } | |
| 8849 ++off; | |
| 8850 if (col == start_col) | |
| 8851 { | |
| 8852 if (did_delete) | |
| 8853 break; | |
| 8854 c = c2; | |
| 8855 } | |
| 8856 } | |
| 8857 if (end_col == Columns) | |
| 8858 LineWraps[row] = FALSE; | |
| 8859 if (row == Rows - 1) /* overwritten the command line */ | |
| 8860 { | |
| 8861 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
|
8862 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
|
8863 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8864 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8865 if (start_col == 0) |
| 8866 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8867 } |
| 8868 } | |
| 8869 } | |
| 8870 | |
| 8871 /* | |
| 8872 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8873 * screen or the command line. | |
| 8874 */ | |
| 8875 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8876 check_for_delay(int check_msg_scroll) |
| 7 | 8877 { |
| 8878 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8879 && !did_wait_return | |
| 8880 && emsg_silent == 0) | |
| 8881 { | |
| 8882 out_flush(); | |
| 8883 ui_delay(1000L, TRUE); | |
| 8884 emsg_on_display = FALSE; | |
| 8885 if (check_msg_scroll) | |
| 8886 msg_scroll = FALSE; | |
| 8887 } | |
| 8888 } | |
| 8889 | |
| 8890 /* | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8891 * Init TabPageIdxs[] to zero: Clicking outside of tabs has no effect. |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8892 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8893 static void |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8894 clear_TabPageIdxs(void) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8895 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8896 int scol; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8897 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8898 for (scol = 0; scol < Columns; ++scol) |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8899 TabPageIdxs[scol] = 0; |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8900 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8901 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8902 /* |
| 7 | 8903 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8904 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8905 * Returns TRUE if there is a valid screen to write to. |
| 8906 * Returns FALSE when starting up and screen not initialized yet. | |
| 8907 */ | |
| 8908 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8909 screen_valid(int doclear) |
| 7 | 8910 { |
| 3263 | 8911 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8912 return (ScreenLines != NULL); |
| 8913 } | |
| 8914 | |
| 8915 /* | |
| 8916 * Resize the shell to Rows and Columns. | |
| 8917 * Allocate ScreenLines[] and associated items. | |
| 8918 * | |
| 8919 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8920 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8921 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8922 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8923 * final size of the shell is needed. | |
| 8924 */ | |
| 8925 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8926 screenalloc(int doclear) |
| 7 | 8927 { |
| 8928 int new_row, old_row; | |
| 8929 #ifdef FEAT_GUI | |
| 8930 int old_Rows; | |
| 8931 #endif | |
| 8932 win_T *wp; | |
| 8933 int outofmem = FALSE; | |
| 8934 int len; | |
| 8935 schar_T *new_ScreenLines; | |
| 8936 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8937 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8938 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8939 int i; |
| 7 | 8940 sattr_T *new_ScreenAttrs; |
| 8941 unsigned *new_LineOffset; | |
| 8942 char_u *new_LineWraps; | |
| 681 | 8943 short *new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8944 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8945 short *new_popup_mask; |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
8946 short *new_popup_mask_next; |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
8947 char *new_popup_transparent; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
8948 #endif |
| 671 | 8949 tabpage_T *tp; |
| 7 | 8950 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8951 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8952 int retry_count = 0; |
| 8953 | |
| 8954 retry: | |
| 7 | 8955 /* |
| 8956 * Allocation of the screen buffers is done only when the size changes and | |
| 8957 * when Rows and Columns have been set and we have started doing full | |
| 8958 * screen stuff. | |
| 8959 */ | |
| 8960 if ((ScreenLines != NULL | |
| 8961 && Rows == screen_Rows | |
| 8962 && Columns == screen_Columns | |
| 8963 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8964 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8965 && p_mco == Screen_mco) |
| 7 | 8966 || Rows == 0 |
| 8967 || Columns == 0 | |
| 8968 || (!full_screen && ScreenLines == NULL)) | |
| 8969 return; | |
| 8970 | |
| 8971 /* | |
| 8972 * It's possible that we produce an out-of-memory message below, which | |
| 8973 * will cause this function to be called again. To break the loop, just | |
| 8974 * return here. | |
| 8975 */ | |
| 8976 if (entered) | |
| 8977 return; | |
| 8978 entered = TRUE; | |
| 8979 | |
| 911 | 8980 /* |
| 8981 * Note that the window sizes are updated before reallocating the arrays, | |
| 8982 * thus we must not redraw here! | |
| 8983 */ | |
| 8984 ++RedrawingDisabled; | |
| 8985 | |
| 7 | 8986 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8987 | |
| 8988 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8989 | |
| 8990 /* | |
| 8991 * We're changing the size of the screen. | |
| 8992 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8993 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8994 * lines (unless the screen is going to be cleared). | |
| 8995 * - Free the old arrays. | |
| 8996 * | |
| 8997 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8998 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8999 * size is wrong. | |
| 9000 */ | |
| 671 | 9001 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9002 win_free_lsize(wp); |
| 1946 | 9003 if (aucmd_win != NULL) |
| 9004 win_free_lsize(aucmd_win); | |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9005 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9006 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9007 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9008 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9009 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9010 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9011 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9012 win_free_lsize(wp); |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9013 #endif |
| 7 | 9014 |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9015 new_ScreenLines = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
2122
476336a5ae95
updated for version 7.2.404
Bram Moolenaar <bram@zimbu.org>
parents:
2069
diff
changeset
|
9016 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9017 if (enc_utf8) |
| 9018 { | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9019 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 9020 for (i = 0; i < p_mco; ++i) |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9021 new_ScreenLinesC[i] = LALLOC_CLEAR_MULT(u8char_T, |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9022 (Rows + 1) * Columns); |
| 7 | 9023 } |
| 9024 if (enc_dbcs == DBCS_JPNU) | |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9025 new_ScreenLines2 = LALLOC_MULT(schar_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9026 new_ScreenAttrs = LALLOC_MULT(sattr_T, (Rows + 1) * Columns); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9027 new_LineOffset = LALLOC_MULT(unsigned, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9028 new_LineWraps = LALLOC_MULT(char_u, Rows); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
9029 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9030 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9031 new_popup_mask = LALLOC_MULT(short, Rows * Columns); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9032 new_popup_mask_next = LALLOC_MULT(short, Rows * Columns); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9033 new_popup_transparent = LALLOC_MULT(char, Rows * Columns); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9034 #endif |
| 7 | 9035 |
| 677 | 9036 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9037 { |
| 9038 if (win_alloc_lines(wp) == FAIL) | |
| 9039 { | |
| 9040 outofmem = TRUE; | |
| 1819 | 9041 goto give_up; |
| 9042 } | |
| 9043 } | |
| 1946 | 9044 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9045 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9046 outofmem = TRUE; |
|
16882
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9047 #ifdef FEAT_TEXT_PROP |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9048 // global popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9049 for (wp = first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9050 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9051 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9052 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9053 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9054 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9055 // tab-local popup windows |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9056 FOR_ALL_TABPAGES(tp) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9057 for (wp = tp->tp_first_popupwin; wp != NULL; wp = wp->w_next) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9058 if (win_alloc_lines(wp) == FAIL) |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9059 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9060 outofmem = TRUE; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9061 goto give_up; |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9062 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9063 #endif |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9064 |
| 1819 | 9065 give_up: |
| 7 | 9066 |
| 714 | 9067 for (i = 0; i < p_mco; ++i) |
| 9068 if (new_ScreenLinesC[i] == NULL) | |
| 9069 break; | |
| 7 | 9070 if (new_ScreenLines == NULL |
| 714 | 9071 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9072 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9073 || new_ScreenAttrs == NULL | |
| 9074 || new_LineOffset == NULL | |
| 9075 || new_LineWraps == NULL | |
| 671 | 9076 || new_TabPageIdxs == NULL |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9077 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9078 || new_popup_mask == NULL |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9079 || new_popup_mask_next == NULL |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9080 || new_popup_transparent == NULL |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9081 #endif |
| 7 | 9082 || outofmem) |
| 9083 { | |
| 944 | 9084 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9085 { |
| 9086 /* guess the size */ | |
| 9087 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9088 | |
| 9089 /* Remember we did this to avoid getting outofmem messages over | |
| 9090 * and over again. */ | |
| 944 | 9091 done_outofmem_msg = TRUE; |
| 534 | 9092 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9093 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9094 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9095 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
|
9096 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
|
9097 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9098 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9099 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9100 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9101 VIM_CLEAR(new_TabPageIdxs); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9102 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9103 VIM_CLEAR(new_popup_mask); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9104 VIM_CLEAR(new_popup_mask_next); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9105 VIM_CLEAR(new_popup_transparent); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9106 #endif |
| 7 | 9107 } |
| 9108 else | |
| 9109 { | |
| 944 | 9110 done_outofmem_msg = FALSE; |
| 534 | 9111 |
| 7 | 9112 for (new_row = 0; new_row < Rows; ++new_row) |
| 9113 { | |
| 9114 new_LineOffset[new_row] = new_row * Columns; | |
| 9115 new_LineWraps[new_row] = FALSE; | |
| 9116 | |
| 9117 /* | |
| 9118 * If the screen is not going to be cleared, copy as much as | |
| 9119 * possible from the old screen to the new one and clear the rest | |
| 9120 * (used when resizing the window at the "--more--" prompt or when | |
| 9121 * executing an external command, for the GUI). | |
| 9122 */ | |
| 3263 | 9123 if (!doclear) |
| 7 | 9124 { |
| 9125 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9126 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9127 if (enc_utf8) | |
| 9128 { | |
| 9129 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9130 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9131 for (i = 0; i < p_mco; ++i) |
| 9132 (void)vim_memset(new_ScreenLinesC[i] | |
| 9133 + new_row * Columns, | |
| 7 | 9134 0, (size_t)Columns * sizeof(u8char_T)); |
| 9135 } | |
| 9136 if (enc_dbcs == DBCS_JPNU) | |
| 9137 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9138 0, (size_t)Columns * sizeof(schar_T)); | |
| 9139 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9140 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9141 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9142 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9143 { |
| 9144 if (screen_Columns < Columns) | |
| 9145 len = screen_Columns; | |
| 9146 else | |
| 9147 len = Columns; | |
| 571 | 9148 /* When switching to utf-8 don't copy characters, they |
| 714 | 9149 * may be invalid now. Also when p_mco changes. */ |
| 9150 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9151 && p_mco == Screen_mco) | |
| 26 | 9152 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9153 ScreenLines + LineOffset[old_row], | |
| 9154 (size_t)len * sizeof(schar_T)); | |
| 714 | 9155 if (enc_utf8 && ScreenLinesUC != NULL |
| 9156 && p_mco == Screen_mco) | |
| 7 | 9157 { |
| 9158 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9159 ScreenLinesUC + LineOffset[old_row], | |
| 9160 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9161 for (i = 0; i < p_mco; ++i) |
| 9162 mch_memmove(new_ScreenLinesC[i] | |
| 9163 + new_LineOffset[new_row], | |
| 9164 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9165 (size_t)len * sizeof(u8char_T)); |
| 9166 } | |
| 9167 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9168 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9169 ScreenLines2 + LineOffset[old_row], | |
| 9170 (size_t)len * sizeof(schar_T)); | |
| 9171 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9172 ScreenAttrs + LineOffset[old_row], | |
| 9173 (size_t)len * sizeof(sattr_T)); | |
| 9174 } | |
| 9175 } | |
| 9176 } | |
| 9177 /* Use the last line of the screen for the current line. */ | |
| 9178 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9179 } | |
| 9180 | |
| 356 | 9181 free_screenlines(); |
| 9182 | |
| 7 | 9183 ScreenLines = new_ScreenLines; |
| 9184 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9185 for (i = 0; i < p_mco; ++i) |
| 9186 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9187 Screen_mco = p_mco; | |
| 7 | 9188 ScreenLines2 = new_ScreenLines2; |
| 9189 ScreenAttrs = new_ScreenAttrs; | |
| 9190 LineOffset = new_LineOffset; | |
| 9191 LineWraps = new_LineWraps; | |
| 671 | 9192 TabPageIdxs = new_TabPageIdxs; |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9193 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9194 popup_mask = new_popup_mask; |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9195 vim_memset(popup_mask, 0, Rows * Columns * sizeof(short)); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9196 popup_mask_next = new_popup_mask_next; |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9197 popup_transparent = new_popup_transparent; |
|
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9198 vim_memset(popup_transparent, 0, Rows * Columns * sizeof(char)); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9199 popup_mask_refresh = TRUE; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9200 #endif |
| 7 | 9201 |
| 9202 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9203 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9204 #ifdef FEAT_GUI | |
| 9205 old_Rows = screen_Rows; | |
| 9206 #endif | |
| 9207 screen_Rows = Rows; | |
| 9208 screen_Columns = Columns; | |
| 9209 | |
| 9210 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9211 if (doclear) |
| 7 | 9212 screenclear2(); |
| 9213 #ifdef FEAT_GUI | |
| 9214 else if (gui.in_use | |
| 9215 && !gui.starting | |
| 9216 && ScreenLines != NULL | |
| 9217 && old_Rows != Rows) | |
| 9218 { | |
| 9219 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9220 /* | |
| 9221 * Adjust the position of the cursor, for when executing an external | |
| 9222 * command. | |
| 9223 */ | |
| 9224 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9225 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9226 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9227 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9228 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9229 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9230 } | |
| 9231 #endif | |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
9232 clear_TabPageIdxs(); |
| 7 | 9233 |
| 9234 entered = FALSE; | |
| 911 | 9235 --RedrawingDisabled; |
| 766 | 9236 |
| 1824 | 9237 /* |
| 9238 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9239 * in case applying autocommands always changes Rows or Columns. | |
| 9240 */ | |
| 9241 if (starting == 0 && ++retry_count <= 3) | |
| 9242 { | |
| 766 | 9243 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9244 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9245 * jump back to check if we need to allocate the screen again. */ | |
| 9246 goto retry; | |
| 9247 } | |
| 7 | 9248 } |
| 9249 | |
| 9250 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9251 free_screenlines(void) |
| 356 | 9252 { |
| 714 | 9253 int i; |
| 9254 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9255 VIM_CLEAR(ScreenLinesUC); |
| 714 | 9256 for (i = 0; i < Screen_mco; ++i) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9257 VIM_CLEAR(ScreenLinesC[i]); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9258 VIM_CLEAR(ScreenLines2); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9259 VIM_CLEAR(ScreenLines); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9260 VIM_CLEAR(ScreenAttrs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9261 VIM_CLEAR(LineOffset); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9262 VIM_CLEAR(LineWraps); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9263 VIM_CLEAR(TabPageIdxs); |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9264 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9265 VIM_CLEAR(popup_mask); |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9266 VIM_CLEAR(popup_mask_next); |
|
17162
f16cee6adf29
patch 8.1.1580: cannot make part of a popup transparent
Bram Moolenaar <Bram@vim.org>
parents:
17145
diff
changeset
|
9267 VIM_CLEAR(popup_transparent); |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9268 #endif |
| 356 | 9269 } |
| 9270 | |
| 9271 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9272 screenclear(void) |
| 7 | 9273 { |
| 9274 check_for_delay(FALSE); | |
| 9275 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9276 screenclear2(); /* clear the screen */ | |
| 9277 } | |
| 9278 | |
| 9279 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9280 screenclear2(void) |
| 7 | 9281 { |
| 9282 int i; | |
| 9283 | |
| 9284 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9285 #ifdef FEAT_GUI | |
| 9286 || (gui.in_use && gui.starting) | |
| 9287 #endif | |
| 9288 ) | |
| 9289 return; | |
| 9290 | |
| 9291 #ifdef FEAT_GUI | |
| 9292 if (!gui.in_use) | |
| 9293 #endif | |
| 9294 screen_attr = -1; /* force setting the Normal colors */ | |
| 9295 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9296 | |
| 9297 #ifdef FEAT_CLIPBOARD | |
| 9298 /* disable selection without redrawing it */ | |
| 9299 clip_scroll_selection(9999); | |
| 9300 #endif | |
| 9301 | |
| 9302 /* blank out ScreenLines */ | |
| 9303 for (i = 0; i < Rows; ++i) | |
| 9304 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9305 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9306 LineWraps[i] = FALSE; |
| 9307 } | |
| 9308 | |
| 9309 if (can_clear(T_CL)) | |
| 9310 { | |
| 9311 out_str(T_CL); /* clear the display */ | |
| 9312 clear_cmdline = FALSE; | |
| 644 | 9313 mode_displayed = FALSE; |
| 7 | 9314 } |
| 9315 else | |
| 9316 { | |
| 9317 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9318 for (i = 0; i < Rows; ++i) | |
| 9319 lineinvalid(LineOffset[i], (int)Columns); | |
| 9320 clear_cmdline = TRUE; | |
| 9321 } | |
| 9322 | |
| 9323 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9324 | |
| 9325 win_rest_invalid(firstwin); | |
| 9326 redraw_cmdline = TRUE; | |
| 673 | 9327 redraw_tabline = TRUE; |
| 7 | 9328 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9329 must_redraw = NOT_VALID; | |
| 9330 compute_cmdrow(); | |
| 9331 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9332 msg_col = 0; | |
| 9333 screen_start(); /* don't know where cursor is now */ | |
| 9334 msg_scrolled = 0; /* can't scroll back */ | |
| 9335 msg_didany = FALSE; | |
| 9336 msg_didout = FALSE; | |
| 9337 } | |
| 9338 | |
| 9339 /* | |
| 9340 * Clear one line in ScreenLines. | |
| 9341 */ | |
| 9342 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9343 lineclear(unsigned off, int width, int attr) |
| 7 | 9344 { |
| 9345 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9346 if (enc_utf8) | |
| 9347 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9348 (size_t)width * sizeof(u8char_T)); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9349 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9350 } |
| 9351 | |
| 9352 /* | |
| 9353 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9354 * invalid value. | |
| 9355 */ | |
| 9356 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9357 lineinvalid(unsigned off, int width) |
| 7 | 9358 { |
| 9359 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9360 } | |
| 9361 | |
| 9362 /* | |
| 9363 * Copy part of a Screenline for vertically split window "wp". | |
| 9364 */ | |
| 9365 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9366 linecopy(int to, int from, win_T *wp) |
| 7 | 9367 { |
| 9368 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9369 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9370 | |
| 9371 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9372 wp->w_width * sizeof(schar_T)); | |
| 9373 if (enc_utf8) | |
| 9374 { | |
| 714 | 9375 int i; |
| 9376 | |
| 7 | 9377 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9378 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9379 for (i = 0; i < p_mco; ++i) |
| 9380 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9381 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9382 } |
| 9383 if (enc_dbcs == DBCS_JPNU) | |
| 9384 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9385 wp->w_width * sizeof(schar_T)); | |
| 9386 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9387 wp->w_width * sizeof(sattr_T)); | |
| 9388 } | |
| 9389 | |
| 9390 /* | |
| 9391 * Return TRUE if clearing with term string "p" would work. | |
| 9392 * It can't work when the string is empty or it won't set the right background. | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9393 * Don't clear to end-of-line when there are popups, it may cause flicker. |
| 7 | 9394 */ |
| 9395 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9396 can_clear(char_u *p) |
| 7 | 9397 { |
| 9398 return (*p != NUL && (t_colors <= 1 | |
| 9399 #ifdef FEAT_GUI | |
| 9400 || gui.in_use | |
| 9401 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9402 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9403 || (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
|
9404 || (!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
|
9405 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9406 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9407 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9408 || *T_UT != NUL) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9409 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9410 && !(p == T_CE && popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9411 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9412 ); |
| 7 | 9413 } |
| 9414 | |
| 9415 /* | |
| 9416 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9417 * something directly to the screen (shell commands) or a terminal control | |
| 9418 * code. | |
| 9419 */ | |
| 9420 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9421 screen_start(void) |
| 7 | 9422 { |
| 9423 screen_cur_row = screen_cur_col = 9999; | |
| 9424 } | |
| 9425 | |
| 9426 /* | |
| 9427 * Move the cursor to position "row","col" in the screen. | |
| 9428 * This tries to find the most efficient way to move, minimizing the number of | |
| 9429 * characters sent to the terminal. | |
| 9430 */ | |
| 9431 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9432 windgoto(int row, int col) |
| 7 | 9433 { |
| 205 | 9434 sattr_T *p; |
| 7 | 9435 int i; |
| 9436 int plan; | |
| 9437 int cost; | |
| 9438 int wouldbe_col; | |
| 9439 int noinvcurs; | |
| 9440 char_u *bs; | |
| 9441 int goto_cost; | |
| 9442 int attr; | |
| 9443 | |
| 1213 | 9444 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9445 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9446 | |
| 9447 #define PLAN_LE 1 | |
| 9448 #define PLAN_CR 2 | |
| 9449 #define PLAN_NL 3 | |
| 9450 #define PLAN_WRITE 4 | |
| 9451 /* Can't use ScreenLines unless initialized */ | |
| 9452 if (ScreenLines == NULL) | |
| 9453 return; | |
| 9454 | |
| 9455 if (col != screen_cur_col || row != screen_cur_row) | |
| 9456 { | |
| 9457 /* Check for valid position. */ | |
| 9458 if (row < 0) /* window without text lines? */ | |
| 9459 row = 0; | |
| 9460 if (row >= screen_Rows) | |
| 9461 row = screen_Rows - 1; | |
| 9462 if (col >= screen_Columns) | |
| 9463 col = screen_Columns - 1; | |
| 9464 | |
| 9465 /* check if no cursor movement is allowed in highlight mode */ | |
| 9466 if (screen_attr && *T_MS == NUL) | |
| 9467 noinvcurs = HIGHL_COST; | |
| 9468 else | |
| 9469 noinvcurs = 0; | |
| 9470 goto_cost = GOTO_COST + noinvcurs; | |
| 9471 | |
| 9472 /* | |
| 9473 * Plan how to do the positioning: | |
| 9474 * 1. Use CR to move it to column 0, same row. | |
| 9475 * 2. Use T_LE to move it a few columns to the left. | |
| 9476 * 3. Use NL to move a few lines down, column 0. | |
| 9477 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9478 * | |
| 9479 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9480 * position is unknown then (some terminals wrap, some don't ) | |
| 9481 * | |
| 1213 | 9482 * First check if the highlighting attributes allow us to write |
| 7 | 9483 * characters to move the cursor to the right. |
| 9484 */ | |
| 9485 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9486 { | |
| 9487 /* | |
| 9488 * If the cursor is in the same row, bigger col, we can use CR | |
| 9489 * or T_LE. | |
| 9490 */ | |
| 9491 bs = NULL; /* init for GCC */ | |
| 9492 attr = screen_attr; | |
| 9493 if (row == screen_cur_row && col < screen_cur_col) | |
| 9494 { | |
| 9495 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9496 if (*T_LE) | |
| 9497 bs = T_LE; /* "cursor left" */ | |
| 9498 else | |
| 9499 bs = T_BC; /* "backspace character (old) */ | |
| 9500 if (*bs) | |
| 9501 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9502 else | |
| 9503 cost = 999; | |
| 9504 if (col + 1 < cost) /* using CR is less characters */ | |
| 9505 { | |
| 9506 plan = PLAN_CR; | |
| 9507 wouldbe_col = 0; | |
| 9508 cost = 1; /* CR is just one character */ | |
| 9509 } | |
| 9510 else | |
| 9511 { | |
| 9512 plan = PLAN_LE; | |
| 9513 wouldbe_col = col; | |
| 9514 } | |
| 9515 if (noinvcurs) /* will stop highlighting */ | |
| 9516 { | |
| 9517 cost += noinvcurs; | |
| 9518 attr = 0; | |
| 9519 } | |
| 9520 } | |
| 9521 | |
| 9522 /* | |
| 9523 * If the cursor is above where we want to be, we can use CR LF. | |
| 9524 */ | |
| 9525 else if (row > screen_cur_row) | |
| 9526 { | |
| 9527 plan = PLAN_NL; | |
| 9528 wouldbe_col = 0; | |
| 9529 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9530 if (noinvcurs) /* will stop highlighting */ | |
| 9531 { | |
| 9532 cost += noinvcurs; | |
| 9533 attr = 0; | |
| 9534 } | |
| 9535 } | |
| 9536 | |
| 9537 /* | |
| 9538 * If the cursor is in the same row, smaller col, just use write. | |
| 9539 */ | |
| 9540 else | |
| 9541 { | |
| 9542 plan = PLAN_WRITE; | |
| 9543 wouldbe_col = screen_cur_col; | |
| 9544 cost = 0; | |
| 9545 } | |
| 9546 | |
| 9547 /* | |
| 9548 * Check if any characters that need to be written have the | |
| 9549 * correct attributes. Also avoid UTF-8 characters. | |
| 9550 */ | |
| 9551 i = col - wouldbe_col; | |
| 9552 if (i > 0) | |
| 9553 cost += i; | |
| 9554 if (cost < goto_cost && i > 0) | |
| 9555 { | |
| 9556 /* | |
| 9557 * Check if the attributes are correct without additionally | |
| 9558 * stopping highlighting. | |
| 9559 */ | |
| 9560 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9561 while (i && *p++ == attr) | |
| 9562 --i; | |
| 9563 if (i != 0) | |
| 9564 { | |
| 9565 /* | |
| 9566 * Try if it works when highlighting is stopped here. | |
| 9567 */ | |
| 9568 if (*--p == 0) | |
| 9569 { | |
| 9570 cost += noinvcurs; | |
| 9571 while (i && *p++ == 0) | |
| 9572 --i; | |
| 9573 } | |
| 9574 if (i != 0) | |
| 9575 cost = 999; /* different attributes, don't do it */ | |
| 9576 } | |
| 9577 if (enc_utf8) | |
| 9578 { | |
| 9579 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9580 for (i = wouldbe_col; i < col; ++i) | |
| 9581 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9582 { | |
| 9583 cost = 999; | |
| 9584 break; | |
| 9585 } | |
| 9586 } | |
| 9587 } | |
| 9588 | |
| 9589 /* | |
| 9590 * We can do it without term_windgoto()! | |
| 9591 */ | |
| 9592 if (cost < goto_cost) | |
| 9593 { | |
| 9594 if (plan == PLAN_LE) | |
| 9595 { | |
| 9596 if (noinvcurs) | |
| 9597 screen_stop_highlight(); | |
| 9598 while (screen_cur_col > col) | |
| 9599 { | |
| 9600 out_str(bs); | |
| 9601 --screen_cur_col; | |
| 9602 } | |
| 9603 } | |
| 9604 else if (plan == PLAN_CR) | |
| 9605 { | |
| 9606 if (noinvcurs) | |
| 9607 screen_stop_highlight(); | |
| 9608 out_char('\r'); | |
| 9609 screen_cur_col = 0; | |
| 9610 } | |
| 9611 else if (plan == PLAN_NL) | |
| 9612 { | |
| 9613 if (noinvcurs) | |
| 9614 screen_stop_highlight(); | |
| 9615 while (screen_cur_row < row) | |
| 9616 { | |
| 9617 out_char('\n'); | |
| 9618 ++screen_cur_row; | |
| 9619 } | |
| 9620 screen_cur_col = 0; | |
| 9621 } | |
| 9622 | |
| 9623 i = col - screen_cur_col; | |
| 9624 if (i > 0) | |
| 9625 { | |
| 9626 /* | |
| 9627 * Use cursor-right if it's one character only. Avoids | |
| 9628 * removing a line of pixels from the last bold char, when | |
| 9629 * using the bold trick in the GUI. | |
| 9630 */ | |
| 9631 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9632 { | |
| 9633 while (i-- > 0) | |
| 9634 out_char(*T_ND); | |
| 9635 } | |
| 9636 else | |
| 9637 { | |
| 9638 int off; | |
| 9639 | |
| 9640 off = LineOffset[row] + screen_cur_col; | |
| 9641 while (i-- > 0) | |
| 9642 { | |
| 9643 if (ScreenAttrs[off] != screen_attr) | |
| 9644 screen_stop_highlight(); | |
| 9645 out_flush_check(); | |
| 9646 out_char(ScreenLines[off]); | |
| 9647 if (enc_dbcs == DBCS_JPNU | |
| 9648 && ScreenLines[off] == 0x8e) | |
| 9649 out_char(ScreenLines2[off]); | |
| 9650 ++off; | |
| 9651 } | |
| 9652 } | |
| 9653 } | |
| 9654 } | |
| 9655 } | |
| 9656 else | |
| 9657 cost = 999; | |
| 9658 | |
| 9659 if (cost >= goto_cost) | |
| 9660 { | |
| 9661 if (noinvcurs) | |
| 9662 screen_stop_highlight(); | |
| 5995 | 9663 if (row == screen_cur_row && (col > screen_cur_col) |
| 9664 && *T_CRI != NUL) | |
| 7 | 9665 term_cursor_right(col - screen_cur_col); |
| 9666 else | |
| 9667 term_windgoto(row, col); | |
| 9668 } | |
| 9669 screen_cur_row = row; | |
| 9670 screen_cur_col = col; | |
| 9671 } | |
| 9672 } | |
| 9673 | |
| 9674 /* | |
| 9675 * Set cursor to its position in the current window. | |
| 9676 */ | |
| 9677 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9678 setcursor(void) |
| 7 | 9679 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9680 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
|
9681 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9682 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9683 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9684 * 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
|
9685 * 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
|
9686 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9687 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9688 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
|
9689 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9690 if (force || redrawing()) |
| 7 | 9691 { |
| 9692 validate_cursor(); | |
| 9693 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
|
9694 curwin->w_wincol + ( |
| 7 | 9695 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9696 /* With 'rightleft' set and the cursor on a double-wide |
| 9697 * character, position it on the leftmost column. */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9698 curwin->w_p_rl ? ((int)curwin->w_width - curwin->w_wcol |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9699 - ((has_mbyte |
| 1545 | 9700 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9701 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9702 #endif |
| 9703 curwin->w_wcol)); | |
| 9704 } | |
| 9705 } | |
| 9706 | |
| 9707 | |
| 9708 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9709 * 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
|
9710 * 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
|
9711 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9712 * scrolling. |
| 9713 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9714 */ | |
| 9715 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9716 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9717 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9718 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9719 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9720 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9721 int mayclear) |
| 7 | 9722 { |
| 9723 int did_delete; | |
| 9724 int nextrow; | |
| 9725 int lastrow; | |
| 9726 int retval; | |
| 9727 | |
| 9728 if (invalid) | |
| 9729 wp->w_lines_valid = 0; | |
| 9730 | |
| 9731 if (wp->w_height < 5) | |
| 9732 return FAIL; | |
| 9733 | |
| 9734 if (line_count > wp->w_height - row) | |
| 9735 line_count = wp->w_height - row; | |
| 9736 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9737 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9738 if (retval != MAYBE) |
| 9739 return retval; | |
| 9740 | |
| 9741 /* | |
| 9742 * If there is a next window or a status line, we first try to delete the | |
| 9743 * lines at the bottom to avoid messing what is after the window. | |
| 9744 * If this fails and there are following windows, don't do anything to avoid | |
| 9745 * messing up those windows, better just redraw. | |
| 9746 */ | |
| 9747 did_delete = FALSE; | |
| 9748 if (wp->w_next != NULL || wp->w_status_height) | |
| 9749 { | |
| 9750 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
|
9751 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9752 did_delete = TRUE; |
| 9753 else if (wp->w_next) | |
| 9754 return FAIL; | |
| 9755 } | |
| 9756 /* | |
| 9757 * if no lines deleted, blank the lines that will end up below the window | |
| 9758 */ | |
| 9759 if (!did_delete) | |
| 9760 { | |
| 9761 wp->w_redr_status = TRUE; | |
| 9762 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
|
9763 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9764 lastrow = nextrow + line_count; |
| 9765 if (lastrow > Rows) | |
| 9766 lastrow = Rows; | |
| 9767 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
|
9768 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9769 ' ', ' ', 0); |
| 9770 } | |
| 9771 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9772 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9773 == FAIL) |
| 9774 { | |
| 9775 /* deletion will have messed up other windows */ | |
| 9776 if (did_delete) | |
| 9777 { | |
| 9778 wp->w_redr_status = TRUE; | |
| 9779 win_rest_invalid(W_NEXT(wp)); | |
| 9780 } | |
| 9781 return FAIL; | |
| 9782 } | |
| 9783 | |
| 9784 return OK; | |
| 9785 } | |
| 9786 | |
| 9787 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9788 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9789 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9790 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9791 * scrolling | |
| 9792 * Return OK for success, FAIL if the lines are not deleted. | |
| 9793 */ | |
| 9794 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9795 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9796 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9797 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9798 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9799 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9800 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9801 int clear_attr) /* for clearing lines */ |
| 7 | 9802 { |
| 9803 int retval; | |
| 9804 | |
| 9805 if (invalid) | |
| 9806 wp->w_lines_valid = 0; | |
| 9807 | |
| 9808 if (line_count > wp->w_height - row) | |
| 9809 line_count = wp->w_height - row; | |
| 9810 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9811 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9812 if (retval != MAYBE) |
| 9813 return retval; | |
| 9814 | |
| 9815 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
|
9816 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9817 return FAIL; |
| 9818 | |
| 9819 /* | |
| 9820 * If there are windows or status lines below, try to put them at the | |
| 9821 * correct place. If we can't do that, they have to be redrawn. | |
| 9822 */ | |
| 9823 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9824 { | |
| 9825 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
|
9826 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9827 { |
| 9828 wp->w_redr_status = TRUE; | |
| 9829 win_rest_invalid(wp->w_next); | |
| 9830 } | |
| 9831 } | |
| 9832 /* | |
| 9833 * If this is the last window and there is no status line, redraw the | |
| 9834 * command line later. | |
| 9835 */ | |
| 9836 else | |
| 9837 redraw_cmdline = TRUE; | |
| 9838 return OK; | |
| 9839 } | |
| 9840 | |
| 9841 /* | |
| 9842 * Common code for win_ins_lines() and win_del_lines(). | |
| 9843 * Returns OK or FAIL when the work has been done. | |
| 9844 * Returns MAYBE when not finished yet. | |
| 9845 */ | |
| 9846 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9847 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9848 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9849 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9850 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9851 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9852 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9853 int clear_attr) |
| 7 | 9854 { |
| 9855 int retval; | |
| 9856 | |
| 9857 if (!redrawing() || line_count <= 0) | |
| 9858 return FAIL; | |
| 9859 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9860 // When inserting lines would result in loss of command output, just redraw |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9861 // the lines. |
|
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
|
9862 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
|
9863 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
|
9864 |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9865 // 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
|
9866 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9867 { |
|
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
|
9868 if (!no_win_do_lines_ins) |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9869 screenclear(); // will set wp->w_lines_valid to 0 |
| 7 | 9870 return FAIL; |
| 9871 } | |
| 9872 | |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9873 #ifdef FEAT_TEXT_PROP |
|
17034
d4a7c690c8e6
patch 8.1.1517: when a popup changes all windows are redrawn
Bram Moolenaar <Bram@vim.org>
parents:
17022
diff
changeset
|
9874 // this doesn't work when there are popups visible |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9875 if (popup_visible) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9876 return FAIL; |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9877 #endif |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9878 |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9879 // Delete all remaining lines |
| 7 | 9880 if (row + line_count >= wp->w_height) |
| 9881 { | |
| 9882 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
|
9883 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9884 ' ', ' ', 0); |
| 9885 return OK; | |
| 9886 } | |
| 9887 | |
| 9888 /* | |
|
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
|
9889 * When scrolling, the message on the command line should be cleared, |
| 7 | 9890 * 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
|
9891 * Don't do this when avoiding to insert lines. |
| 7 | 9892 */ |
|
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
|
9893 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
|
9894 clear_cmdline = TRUE; |
| 7 | 9895 |
| 9896 /* | |
| 9897 * If the terminal can set a scroll region, use that. | |
| 9898 * Always do this in a vertically split window. This will redraw from | |
| 9899 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9900 * win_line(). | |
| 9901 * 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
|
9902 * 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
|
9903 * scroll-up . |
| 7 | 9904 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9905 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
|
9906 { |
| 7 | 9907 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9908 scroll_region_set(wp, row); | |
| 9909 if (del) | |
| 9910 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
|
9911 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9912 else |
| 9913 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
|
9914 wp->w_height - row, clear_attr, wp); |
| 7 | 9915 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9916 scroll_region_reset(); | |
| 9917 return retval; | |
| 9918 } | |
| 9919 | |
| 9920 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9921 return FAIL; | |
| 9922 | |
| 9923 return MAYBE; | |
| 9924 } | |
| 9925 | |
| 9926 /* | |
| 9927 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9928 */ | |
| 9929 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9930 win_rest_invalid(win_T *wp) |
| 7 | 9931 { |
| 9932 while (wp != NULL) | |
| 9933 { | |
| 9934 redraw_win_later(wp, NOT_VALID); | |
| 9935 wp->w_redr_status = TRUE; | |
| 9936 wp = wp->w_next; | |
| 9937 } | |
| 9938 redraw_cmdline = TRUE; | |
| 9939 } | |
| 9940 | |
| 9941 /* | |
| 9942 * The rest of the routines in this file perform screen manipulations. The | |
| 9943 * given operation is performed physically on the screen. The corresponding | |
| 9944 * change is also made to the internal screen image. In this way, the editor | |
| 9945 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9946 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9947 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9948 * screen changes, and in the meantime, everything still works. | |
| 9949 */ | |
| 9950 | |
| 9951 /* | |
| 9952 * types for inserting or deleting lines | |
| 9953 */ | |
| 9954 #define USE_T_CAL 1 | |
| 9955 #define USE_T_CDL 2 | |
| 9956 #define USE_T_AL 3 | |
| 9957 #define USE_T_CE 4 | |
| 9958 #define USE_T_DL 5 | |
| 9959 #define USE_T_SR 6 | |
| 9960 #define USE_NL 7 | |
| 9961 #define USE_T_CD 8 | |
| 9962 #define USE_REDRAW 9 | |
| 9963 | |
| 9964 /* | |
| 9965 * insert lines on the screen and update ScreenLines[] | |
| 9966 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9967 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9968 * 'row' and 'end' are relative to the start of the region. | |
| 9969 * | |
| 9970 * return FAIL for failure, OK for success. | |
| 9971 */ | |
| 446 | 9972 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9973 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9974 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9975 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9976 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9977 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9978 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9979 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9980 { |
| 9981 int i; | |
| 9982 int j; | |
| 9983 unsigned temp; | |
| 9984 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9985 int cursor_col = 0; |
| 7 | 9986 int type; |
| 9987 int result_empty; | |
| 9988 int can_ce = can_clear(T_CE); | |
| 9989 | |
| 9990 /* | |
| 9991 * FAIL if | |
| 9992 * - there is no valid screen | |
| 9993 * - the screen has to be redrawn completely | |
| 9994 * - the line count is less than one | |
| 9995 * - 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
|
9996 * - redrawing for a callback and there is a modeless selection |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9997 * - there is a popup window |
| 7 | 9998 */ |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
9999 if (!screen_valid(TRUE) |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10000 || line_count <= 0 || line_count > p_ttyscroll |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10001 #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
|
10002 || (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
|
10003 && 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
|
10004 #endif |
|
16986
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10005 #ifdef FEAT_TEXT_PROP |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10006 || popup_visible |
|
03f3a9ca2770
patch 8.1.1493: redrawing with popups is slow and causes flicker
Bram Moolenaar <Bram@vim.org>
parents:
16918
diff
changeset
|
10007 #endif |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10008 ) |
| 7 | 10009 return FAIL; |
| 10010 | |
| 10011 /* | |
| 10012 * There are seven ways to insert lines: | |
| 10013 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10014 * characters from ScreenLines[]. | |
| 10015 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 10016 * the insert is just empty lines | |
| 10017 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 10018 * present or line_count > 1. It looks better if we do all the inserts | |
| 10019 * at once. | |
| 10020 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 10021 * insert is just empty lines and T_CE is not present or line_count > | |
| 10022 * 1. | |
| 10023 * 4. Use T_AL (insert line) if it exists. | |
| 10024 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 10025 * just empty lines. | |
| 10026 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 10027 * just empty lines. | |
| 10028 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 10029 * the 'da' flag is not set or we have clear line capability. | |
| 10030 * 8. redraw the characters from ScreenLines[]. | |
| 10031 * | |
| 10032 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 10033 * the scrollbar for the window. It does have insert line, use that if it | |
| 10034 * exists. | |
| 10035 */ | |
| 10036 result_empty = (row + line_count >= end); | |
| 10037 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10038 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
|
10039 else if (can_clear(T_CD) && result_empty) |
| 7 | 10040 type = USE_T_CD; |
| 10041 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10042 type = USE_T_CAL; | |
| 10043 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10044 type = USE_T_CDL; | |
| 10045 else if (*T_AL != NUL) | |
| 10046 type = USE_T_AL; | |
| 10047 else if (can_ce && result_empty) | |
| 10048 type = USE_T_CE; | |
| 10049 else if (*T_DL != NUL && result_empty) | |
| 10050 type = USE_T_DL; | |
| 10051 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10052 type = USE_T_SR; | |
| 10053 else | |
| 10054 return FAIL; | |
| 10055 | |
| 10056 /* | |
| 10057 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10058 * care of t_db if necessary. | |
| 10059 */ | |
| 10060 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10061 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
|
10062 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10063 |
| 10064 /* | |
| 10065 * If text is retained below the screen, first clear or delete as many | |
| 10066 * lines at the bottom of the window as are about to be inserted so that | |
| 10067 * the deleted lines won't later surface during a screen_del_lines. | |
| 10068 */ | |
| 10069 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
|
10070 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10071 |
| 10072 #ifdef FEAT_CLIPBOARD | |
| 10073 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10074 * 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
|
10075 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10076 clip_clear_selection(&clip_star); |
| 7 | 10077 else |
| 10078 clip_scroll_selection(-line_count); | |
| 10079 #endif | |
| 10080 | |
| 10081 #ifdef FEAT_GUI | |
| 10082 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10083 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10084 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10085 #endif |
| 10086 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10087 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
|
10088 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
|
10089 |
| 7 | 10090 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10091 cursor_row = row; | |
| 10092 else | |
| 10093 cursor_row = row + off; | |
| 10094 | |
| 10095 /* | |
| 10096 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10097 * Clear the inserted lines in ScreenLines[]. | |
| 10098 */ | |
| 10099 row += off; | |
| 10100 end += off; | |
| 10101 for (i = 0; i < line_count; ++i) | |
| 10102 { | |
| 10103 if (wp != NULL && wp->w_width != Columns) | |
| 10104 { | |
| 10105 /* need to copy part of a line */ | |
| 10106 j = end - 1 - i; | |
| 10107 while ((j -= line_count) >= row) | |
| 10108 linecopy(j + line_count, j, wp); | |
| 10109 j += line_count; | |
| 10110 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
|
10111 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
|
10112 clear_attr); |
| 7 | 10113 else |
| 10114 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10115 LineWraps[j] = FALSE; | |
| 10116 } | |
| 10117 else | |
| 10118 { | |
| 10119 j = end - 1 - i; | |
| 10120 temp = LineOffset[j]; | |
| 10121 while ((j -= line_count) >= row) | |
| 10122 { | |
| 10123 LineOffset[j + line_count] = LineOffset[j]; | |
| 10124 LineWraps[j + line_count] = LineWraps[j]; | |
| 10125 } | |
| 10126 LineOffset[j + line_count] = temp; | |
| 10127 LineWraps[j + line_count] = FALSE; | |
| 10128 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
|
10129 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10130 else |
| 10131 lineinvalid(temp, (int)Columns); | |
| 10132 } | |
| 10133 } | |
| 10134 | |
| 10135 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10136 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
|
10137 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
|
10138 screen_start_highlight(clear_attr); |
| 7 | 10139 |
| 10140 /* redraw the characters */ | |
| 10141 if (type == USE_REDRAW) | |
| 10142 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
|
10143 else if (type == USE_T_CAL) |
| 7 | 10144 { |
| 10145 term_append_lines(line_count); | |
| 10146 screen_start(); /* don't know where cursor is now */ | |
| 10147 } | |
| 10148 else | |
| 10149 { | |
| 10150 for (i = 0; i < line_count; i++) | |
| 10151 { | |
| 10152 if (type == USE_T_AL) | |
| 10153 { | |
| 10154 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
|
10155 windgoto(cursor_row, cursor_col); |
| 7 | 10156 out_str(T_AL); |
| 10157 } | |
| 10158 else /* type == USE_T_SR */ | |
| 10159 out_str(T_SR); | |
| 10160 screen_start(); /* don't know where cursor is now */ | |
| 10161 } | |
| 10162 } | |
| 10163 | |
| 10164 /* | |
| 10165 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10166 * have been scrolled down into the region. | |
| 10167 */ | |
| 10168 if (type == USE_T_SR && *T_DA) | |
| 10169 { | |
| 10170 for (i = 0; i < line_count; ++i) | |
| 10171 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10172 windgoto(off + i, cursor_col); |
| 7 | 10173 out_str(T_CE); |
| 10174 screen_start(); /* don't know where cursor is now */ | |
| 10175 } | |
| 10176 } | |
| 10177 | |
| 10178 #ifdef FEAT_GUI | |
| 10179 gui_can_update_cursor(); | |
| 10180 if (gui.in_use) | |
| 10181 out_flush(); /* always flush after a scroll */ | |
| 10182 #endif | |
| 10183 return OK; | |
| 10184 } | |
| 10185 | |
| 10186 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10187 * 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
|
10188 * "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
|
10189 * 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
|
10190 * "row" and "end" are relative to the start of the region. |
| 7 | 10191 * |
| 10192 * Return OK for success, FAIL if the lines are not deleted. | |
| 10193 */ | |
| 10194 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10195 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10196 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10197 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10198 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10199 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10200 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
|
10201 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
|
10202 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10203 { |
| 10204 int j; | |
| 10205 int i; | |
| 10206 unsigned temp; | |
| 10207 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10208 int cursor_col = 0; |
| 7 | 10209 int cursor_end; |
| 10210 int result_empty; /* result is empty until end of region */ | |
| 10211 int can_delete; /* deleting line codes can be used */ | |
| 10212 int type; | |
| 10213 | |
| 10214 /* | |
| 10215 * FAIL if | |
| 10216 * - there is no valid screen | |
| 10217 * - the screen has to be redrawn completely | |
| 10218 * - the line count is less than one | |
| 10219 * - 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
|
10220 * - redrawing for a callback and there is a modeless selection |
| 7 | 10221 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10222 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
|
10223 || (!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
|
10224 #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
|
10225 || (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
|
10226 && 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
|
10227 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10228 ) |
| 7 | 10229 return FAIL; |
| 10230 | |
| 10231 /* | |
| 10232 * Check if the rest of the current region will become empty. | |
| 10233 */ | |
| 10234 result_empty = row + line_count >= end; | |
| 10235 | |
| 10236 /* | |
| 10237 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10238 * available. | |
| 10239 */ | |
| 10240 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10241 | |
| 10242 /* | |
| 10243 * There are six ways to delete lines: | |
| 10244 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10245 * characters from ScreenLines[]. | |
| 10246 * 1. Use T_CD if it exists and the result is empty. | |
| 10247 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10248 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10249 * none of the other ways work. | |
| 10250 * 4. Use T_CE (erase line) if the result is empty. | |
| 10251 * 5. Use T_DL (delete line) if it exists. | |
| 10252 * 6. redraw the characters from ScreenLines[]. | |
| 10253 */ | |
| 10254 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10255 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
|
10256 else if (can_clear(T_CD) && result_empty) |
| 7 | 10257 type = USE_T_CD; |
| 10258 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10259 /* | |
| 10260 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10261 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10262 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10263 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10264 * the trick... | |
| 10265 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10266 * (Olaf Seibert) | |
| 10267 */ | |
| 10268 else if (row == 0 && T_DB == empty_option | |
| 10269 && (line_count == 1 || *T_CDL == NUL)) | |
| 10270 #else | |
| 10271 else if (row == 0 && ( | |
| 10272 #ifndef AMIGA | |
| 10273 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10274 * up, so use delete-line command */ | |
| 10275 line_count == 1 || | |
| 10276 #endif | |
| 10277 *T_CDL == NUL)) | |
| 10278 #endif | |
| 10279 type = USE_NL; | |
| 10280 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10281 type = USE_T_CDL; | |
| 10282 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
|
10283 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10284 type = USE_T_CE; |
| 10285 else if (*T_DL != NUL && can_delete) | |
| 10286 type = USE_T_DL; | |
| 10287 else if (*T_CDL != NUL && can_delete) | |
| 10288 type = USE_T_CDL; | |
| 10289 else | |
| 10290 return FAIL; | |
| 10291 | |
| 10292 #ifdef FEAT_CLIPBOARD | |
| 10293 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10294 * 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
|
10295 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10296 clip_clear_selection(&clip_star); |
| 7 | 10297 else |
| 10298 clip_scroll_selection(line_count); | |
| 10299 #endif | |
| 10300 | |
| 10301 #ifdef FEAT_GUI | |
| 10302 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10303 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10304 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
|
10305 && gui.cursor_row < end + off); |
| 7 | 10306 #endif |
| 10307 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10308 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
|
10309 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
|
10310 |
| 7 | 10311 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10312 { | |
| 10313 cursor_row = row; | |
| 10314 cursor_end = end; | |
| 10315 } | |
| 10316 else | |
| 10317 { | |
| 10318 cursor_row = row + off; | |
| 10319 cursor_end = end + off; | |
| 10320 } | |
| 10321 | |
| 10322 /* | |
| 10323 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10324 * Clear the inserted lines in ScreenLines[]. | |
| 10325 */ | |
| 10326 row += off; | |
| 10327 end += off; | |
| 10328 for (i = 0; i < line_count; ++i) | |
| 10329 { | |
| 10330 if (wp != NULL && wp->w_width != Columns) | |
| 10331 { | |
| 10332 /* need to copy part of a line */ | |
| 10333 j = row + i; | |
| 10334 while ((j += line_count) <= end - 1) | |
| 10335 linecopy(j - line_count, j, wp); | |
| 10336 j -= line_count; | |
| 10337 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
|
10338 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
|
10339 clear_attr); |
| 7 | 10340 else |
| 10341 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10342 LineWraps[j] = FALSE; | |
| 10343 } | |
| 10344 else | |
| 10345 { | |
| 10346 /* whole width, moving the line pointers is faster */ | |
| 10347 j = row + i; | |
| 10348 temp = LineOffset[j]; | |
| 10349 while ((j += line_count) <= end - 1) | |
| 10350 { | |
| 10351 LineOffset[j - line_count] = LineOffset[j]; | |
| 10352 LineWraps[j - line_count] = LineWraps[j]; | |
| 10353 } | |
| 10354 LineOffset[j - line_count] = temp; | |
| 10355 LineWraps[j - line_count] = FALSE; | |
| 10356 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
|
10357 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10358 else |
| 10359 lineinvalid(temp, (int)Columns); | |
| 10360 } | |
| 10361 } | |
| 10362 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10363 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
|
10364 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10365 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
|
10366 screen_start_highlight(clear_attr); |
| 7 | 10367 |
| 10368 /* redraw the characters */ | |
| 10369 if (type == USE_REDRAW) | |
| 10370 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
|
10371 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10372 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10373 windgoto(cursor_row, cursor_col); |
| 7 | 10374 out_str(T_CD); |
| 10375 screen_start(); /* don't know where cursor is now */ | |
| 10376 } | |
| 10377 else if (type == USE_T_CDL) | |
| 10378 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10379 windgoto(cursor_row, cursor_col); |
| 7 | 10380 term_delete_lines(line_count); |
| 10381 screen_start(); /* don't know where cursor is now */ | |
| 10382 } | |
| 10383 /* | |
| 10384 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10385 * the whole screen (scroll region) up by outputting newlines on the | |
| 10386 * last line. | |
| 10387 */ | |
| 10388 else if (type == USE_NL) | |
| 10389 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10390 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10391 for (i = line_count; --i >= 0; ) |
| 10392 out_char('\n'); /* cursor will remain on same line */ | |
| 10393 } | |
| 10394 else | |
| 10395 { | |
| 10396 for (i = line_count; --i >= 0; ) | |
| 10397 { | |
| 10398 if (type == USE_T_DL) | |
| 10399 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10400 windgoto(cursor_row, cursor_col); |
| 7 | 10401 out_str(T_DL); /* delete a line */ |
| 10402 } | |
| 10403 else /* type == USE_T_CE */ | |
| 10404 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10405 windgoto(cursor_row + i, cursor_col); |
| 7 | 10406 out_str(T_CE); /* erase a line */ |
| 10407 } | |
| 10408 screen_start(); /* don't know where cursor is now */ | |
| 10409 } | |
| 10410 } | |
| 10411 | |
| 10412 /* | |
| 10413 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10414 * scrolled up at the bottom of the region. | |
| 10415 */ | |
| 10416 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10417 { | |
| 10418 for (i = line_count; i > 0; --i) | |
| 10419 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10420 windgoto(cursor_end - i, cursor_col); |
| 7 | 10421 out_str(T_CE); /* erase a line */ |
| 10422 screen_start(); /* don't know where cursor is now */ | |
| 10423 } | |
| 10424 } | |
| 10425 | |
| 10426 #ifdef FEAT_GUI | |
| 10427 gui_can_update_cursor(); | |
| 10428 if (gui.in_use) | |
| 10429 out_flush(); /* always flush after a scroll */ | |
| 10430 #endif | |
| 10431 | |
| 10432 return OK; | |
| 10433 } | |
| 10434 | |
| 10435 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10436 * Return TRUE when postponing displaying the mode message: when not redrawing |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10437 * or inside a mapping. |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10438 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10439 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10440 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10441 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10442 // Call char_avail() only when we are going to show something, because it |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10443 // takes a bit of time. redrawing() may also call char_avail_avail(). |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10444 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10445 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10446 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10447 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10448 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10449 redraw_mode = TRUE; // show mode later |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10450 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10451 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10452 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10453 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10454 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10455 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10456 * Show the current mode and ruler. |
| 7 | 10457 * |
| 10458 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10459 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10460 * cleared only if a mode is shown. | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10461 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10462 * Return the length of the message (0 if no message). |
| 10463 */ | |
| 10464 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10465 showmode(void) |
| 7 | 10466 { |
| 10467 int need_clear; | |
| 10468 int length = 0; | |
| 10469 int do_mode; | |
| 10470 int attr; | |
| 10471 int nwr_save; | |
| 10472 #ifdef FEAT_INS_EXPAND | |
| 10473 int sub_attr; | |
| 10474 #endif | |
| 10475 | |
| 642 | 10476 do_mode = ((p_smd && msg_silent == 0) |
| 10477 && ((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
|
10478 || restart_edit != NUL |
| 5735 | 10479 || 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
|
10480 if (do_mode || reg_recording != 0) |
| 7 | 10481 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10482 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10483 return 0; // show mode later |
| 7 | 10484 |
| 10485 nwr_save = need_wait_return; | |
| 10486 | |
| 10487 /* wait a bit before overwriting an important message */ | |
| 10488 check_for_delay(FALSE); | |
| 10489 | |
| 10490 /* if the cmdline is more than one line high, erase top lines */ | |
| 10491 need_clear = clear_cmdline; | |
| 10492 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10493 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10494 | |
| 10495 /* Position on the last line in the window, column 0 */ | |
| 10496 msg_pos_mode(); | |
| 10497 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10498 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10499 if (do_mode) |
| 10500 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10501 msg_puts_attr("--", attr); |
| 7 | 10502 #if defined(FEAT_XIM) |
| 2520 | 10503 if ( |
| 10504 # ifdef FEAT_GUI_GTK | |
| 10505 preedit_get_status() | |
| 1668 | 10506 # else |
| 10507 im_get_status() | |
| 2520 | 10508 # endif |
| 1668 | 10509 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10510 # ifdef FEAT_GUI_GTK /* most of the time, it's not XIM being used */ |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10511 msg_puts_attr(" IM", attr); |
| 7 | 10512 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10513 msg_puts_attr(" XIM", attr); |
| 7 | 10514 # endif |
| 10515 #endif | |
| 10516 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10517 if (gui.in_use) | |
| 10518 { | |
| 10519 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10520 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10521 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10522 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10523 msg_puts_attr(" \355\225\234\352\270\200", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10524 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10525 msg_puts_attr(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10526 } |
| 7 | 10527 } |
| 10528 #endif | |
| 10529 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10530 /* CTRL-X in Insert mode */ |
| 10531 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10532 { |
| 10533 /* These messages can get long, avoid a wrap in a narrow | |
| 10534 * window. Prefer showing edit_submode_extra. */ | |
| 10535 length = (Rows - msg_row) * Columns - 3; | |
| 10536 if (edit_submode_extra != NULL) | |
| 10537 length -= vim_strsize(edit_submode_extra); | |
| 10538 if (length > 0) | |
| 10539 { | |
| 10540 if (edit_submode_pre != NULL) | |
| 10541 length -= vim_strsize(edit_submode_pre); | |
| 10542 if (length - vim_strsize(edit_submode) > 0) | |
| 10543 { | |
| 10544 if (edit_submode_pre != NULL) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10545 msg_puts_attr((char *)edit_submode_pre, attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10546 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10547 } |
| 10548 if (edit_submode_extra != NULL) | |
| 10549 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10550 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10551 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
|
10552 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10553 else |
| 10554 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10555 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10556 } |
| 10557 } | |
| 10558 } | |
| 10559 else | |
| 10560 #endif | |
| 10561 { | |
| 10562 if (State & VREPLACE_FLAG) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10563 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10564 else if (State & REPLACE_FLAG) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10565 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10566 else if (State & INSERT) |
| 10567 { | |
| 10568 #ifdef FEAT_RIGHTLEFT | |
| 10569 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10570 msg_puts_attr(_(" REVERSE"), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10571 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10572 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10573 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10574 else if (restart_edit == 'I' || restart_edit == 'A') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10575 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10576 else if (restart_edit == 'R') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10577 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10578 else if (restart_edit == 'V') |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10579 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10580 #ifdef FEAT_RIGHTLEFT |
| 10581 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10582 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10583 #endif |
| 10584 #ifdef FEAT_KEYMAP | |
| 10585 if (State & LANGMAP) | |
| 10586 { | |
| 10587 # ifdef FEAT_ARABIC | |
| 10588 if (curwin->w_p_arab) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10589 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10590 else |
| 10591 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10592 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
|
10593 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10594 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10595 } |
| 10596 #endif | |
| 10597 if ((State & INSERT) && p_paste) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10598 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10599 |
| 10600 if (VIsual_active) | |
| 10601 { | |
| 10602 char *p; | |
| 10603 | |
| 10604 /* Don't concatenate separate words to avoid translation | |
| 10605 * problems. */ | |
| 10606 switch ((VIsual_select ? 4 : 0) | |
| 10607 + (VIsual_mode == Ctrl_V) * 2 | |
| 10608 + (VIsual_mode == 'V')) | |
| 10609 { | |
| 10610 case 0: p = N_(" VISUAL"); break; | |
| 10611 case 1: p = N_(" VISUAL LINE"); break; | |
| 10612 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10613 case 4: p = N_(" SELECT"); break; | |
| 10614 case 5: p = N_(" SELECT LINE"); break; | |
| 10615 default: p = N_(" SELECT BLOCK"); break; | |
| 10616 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10617 msg_puts_attr(_(p), attr); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10618 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10619 msg_puts_attr(" --", attr); |
| 7 | 10620 } |
| 644 | 10621 |
| 7 | 10622 need_clear = TRUE; |
| 10623 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10624 if (reg_recording != 0 |
| 7 | 10625 #ifdef FEAT_INS_EXPAND |
| 10626 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10627 #endif | |
| 10628 ) | |
| 10629 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10630 recording_mode(attr); |
| 7 | 10631 need_clear = TRUE; |
| 10632 } | |
| 644 | 10633 |
| 10634 mode_displayed = TRUE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10635 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10636 msg_clr_eos(); |
| 10637 msg_didout = FALSE; /* overwrite this message */ | |
| 10638 length = msg_col; | |
| 10639 msg_col = 0; | |
| 10640 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10641 } | |
| 10642 else if (clear_cmdline && msg_silent == 0) | |
| 10643 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10644 msg_clr_cmdline(); | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10645 else if (redraw_mode) |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10646 { |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10647 msg_pos_mode(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10648 msg_clr_eos(); |
|
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10649 } |
| 7 | 10650 |
| 10651 #ifdef FEAT_CMDL_INFO | |
| 10652 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10653 if (VIsual_active) | |
| 10654 clear_showcmd(); | |
| 10655 | |
| 10656 /* If the last window has no status line, the ruler is after the mode | |
| 10657 * 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
|
10658 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
|
10659 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10660 #endif |
| 10661 redraw_cmdline = FALSE; | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
10662 redraw_mode = FALSE; |
| 7 | 10663 clear_cmdline = FALSE; |
| 10664 | |
| 10665 return length; | |
| 10666 } | |
| 10667 | |
| 10668 /* | |
| 10669 * Position for a mode message. | |
| 10670 */ | |
| 10671 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10672 msg_pos_mode(void) |
| 7 | 10673 { |
| 10674 msg_col = 0; | |
| 10675 msg_row = Rows - 1; | |
| 10676 } | |
| 10677 | |
| 10678 /* | |
| 10679 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10680 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10681 * Caller should check "mode_displayed". |
| 7 | 10682 */ |
| 10683 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10684 unshowmode(int force) |
| 7 | 10685 { |
| 10686 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10687 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10688 */ |
| 10689 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10690 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10691 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10692 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10693 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10694 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10695 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10696 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10697 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10698 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10699 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10700 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10701 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
|
10702 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
|
10703 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10704 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
|
10705 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
|
10706 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
|
10707 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10708 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10709 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10710 msg_row = save_msg_row; |
| 7 | 10711 } |
| 10712 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10713 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10714 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10715 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10716 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10717 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10718 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10719 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10720 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10721 sprintf(s, " @%c", reg_recording); |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10722 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10723 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10724 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10725 |
| 667 | 10726 /* |
| 10727 * Draw the tab pages line at the top of the Vim window. | |
| 10728 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10729 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10730 draw_tabline(void) |
| 667 | 10731 { |
| 10732 int tabcount = 0; | |
| 10733 tabpage_T *tp; | |
| 10734 int tabwidth; | |
| 10735 int col = 0; | |
| 673 | 10736 int scol = 0; |
| 667 | 10737 int attr; |
| 10738 win_T *wp; | |
| 671 | 10739 win_T *cwp; |
| 10740 int wincount; | |
| 10741 int modified; | |
| 667 | 10742 int c; |
| 10743 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10744 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
|
10745 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
|
10746 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10747 char_u *p; |
| 677 | 10748 int room; |
| 10749 int use_sep_chars = (t_colors < 8 | |
| 10750 #ifdef FEAT_GUI | |
| 10751 && !gui.in_use | |
| 10752 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10753 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10754 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10755 #endif |
| 677 | 10756 ); |
| 673 | 10757 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10758 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10759 return; |
| 673 | 10760 redraw_tabline = FALSE; |
| 667 | 10761 |
| 685 | 10762 #ifdef FEAT_GUI_TABLINE |
| 798 | 10763 /* Take care of a GUI tabline. */ |
| 685 | 10764 if (gui_use_tabline()) |
| 10765 { | |
| 10766 gui_update_tabline(); | |
| 10767 return; | |
| 10768 } | |
| 10769 #endif | |
| 10770 | |
| 10771 if (tabline_height() < 1) | |
| 667 | 10772 return; |
| 10773 | |
| 677 | 10774 #if defined(FEAT_STL_OPT) |
|
16320
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
10775 clear_TabPageIdxs(); |
| 681 | 10776 |
| 677 | 10777 /* Use the 'tabline' option if it's set. */ |
| 10778 if (*p_tal != NUL) | |
| 10779 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10780 int saved_did_emsg = did_emsg; |
| 680 | 10781 |
| 10782 /* Check for an error. If there is one we would loop in redrawing the | |
| 10783 * 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
|
10784 did_emsg = FALSE; |
| 677 | 10785 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10786 if (did_emsg) |
| 680 | 10787 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10788 (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
|
10789 did_emsg |= saved_did_emsg; |
| 680 | 10790 } |
| 10791 else | |
| 10792 #endif | |
| 10793 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10794 FOR_ALL_TABPAGES(tp) |
| 680 | 10795 ++tabcount; |
| 10796 | |
| 10797 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10798 if (tabwidth < 6) | |
| 10799 tabwidth = 6; | |
| 10800 | |
| 10801 attr = attr_nosel; | |
| 10802 tabcount = 0; | |
| 699 | 10803 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10804 tp = tp->tp_next) | |
| 680 | 10805 { |
| 10806 scol = col; | |
| 10807 | |
| 10808 if (tp->tp_topframe == topframe) | |
| 10809 attr = attr_sel; | |
| 10810 if (use_sep_chars && col > 0) | |
| 10811 screen_putchar('|', 0, col++, attr); | |
| 10812 | |
| 10813 if (tp->tp_topframe != topframe) | |
| 10814 attr = attr_nosel; | |
| 10815 | |
| 10816 screen_putchar(' ', 0, col++, attr); | |
| 10817 | |
| 10818 if (tp == curtab) | |
| 10819 { | |
| 10820 cwp = curwin; | |
| 10821 wp = firstwin; | |
| 10822 } | |
| 10823 else | |
| 10824 { | |
| 10825 cwp = tp->tp_curwin; | |
| 10826 wp = tp->tp_firstwin; | |
| 10827 } | |
| 10828 | |
| 10829 modified = FALSE; | |
| 10830 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10831 if (bufIsChanged(wp->w_buffer)) | |
| 10832 modified = TRUE; | |
| 10833 if (modified || wincount > 1) | |
| 10834 { | |
| 10835 if (wincount > 1) | |
| 10836 { | |
| 10837 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10838 len = (int)STRLEN(NameBuff); |
| 699 | 10839 if (col + len >= Columns - 3) |
| 10840 break; | |
| 680 | 10841 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10842 #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
|
10843 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10844 #else |
| 6106 | 10845 attr |
| 680 | 10846 #endif |
| 10847 ); | |
| 10848 col += len; | |
| 10849 } | |
| 10850 if (modified) | |
| 10851 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10852 screen_putchar(' ', 0, col++, attr); | |
| 10853 } | |
| 10854 | |
| 10855 room = scol - col + tabwidth - 1; | |
| 10856 if (room > 0) | |
| 10857 { | |
| 685 | 10858 /* Get buffer name in NameBuff[] */ |
| 10859 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10860 shorten_dir(NameBuff); |
| 680 | 10861 len = vim_strsize(NameBuff); |
| 10862 p = NameBuff; | |
| 10863 if (has_mbyte) | |
| 10864 while (len > room) | |
| 10865 { | |
| 10866 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10867 MB_PTR_ADV(p); |
| 680 | 10868 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10869 else if (len > room) |
| 677 | 10870 { |
| 680 | 10871 p += len - room; |
| 10872 len = room; | |
| 677 | 10873 } |
| 699 | 10874 if (len > Columns - col - 1) |
| 10875 len = Columns - col - 1; | |
| 680 | 10876 |
| 835 | 10877 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10878 col += len; |
| 10879 } | |
| 10880 screen_putchar(' ', 0, col++, attr); | |
| 10881 | |
| 10882 /* Store the tab page number in TabPageIdxs[], so that | |
| 10883 * jump_to_mouse() knows where each one is. */ | |
| 10884 ++tabcount; | |
| 10885 while (scol < col) | |
| 10886 TabPageIdxs[scol++] = tabcount; | |
| 10887 } | |
| 10888 | |
| 10889 if (use_sep_chars) | |
| 10890 c = '_'; | |
| 10891 else | |
| 10892 c = ' '; | |
| 10893 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10894 |
| 10895 /* Put an "X" for closing the current tab if there are several. */ | |
| 10896 if (first_tabpage->tp_next != NULL) | |
| 10897 { | |
| 10898 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10899 TabPageIdxs[Columns - 1] = -999; | |
| 10900 } | |
| 10901 } | |
| 834 | 10902 |
| 10903 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10904 * set. */ | |
| 10905 redraw_tabline = FALSE; | |
| 667 | 10906 } |
| 685 | 10907 |
| 10908 /* | |
| 10909 * Get buffer name for "buf" into NameBuff[]. | |
| 10910 * Takes care of special buffer names and translates special characters. | |
| 10911 */ | |
| 10912 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10913 get_trans_bufname(buf_T *buf) |
| 685 | 10914 { |
| 10915 if (buf_spname(buf) != NULL) | |
| 3839 | 10916 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10917 else |
| 10918 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10919 trans_characters(NameBuff, MAXPATHL); | |
| 10920 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10921 |
| 7 | 10922 /* |
| 10923 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10924 */ | |
| 10925 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
|
10926 fillchar_status(int *attr, win_T *wp) |
| 7 | 10927 { |
| 10928 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
|
10929 |
|
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
|
10930 #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
|
10931 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
|
10932 { |
|
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
|
10933 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
|
10934 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10935 *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
|
10936 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
|
10937 } |
|
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
|
10938 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10939 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10940 *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
|
10941 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
|
10942 } |
|
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
|
10943 } |
|
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
|
10944 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
|
10945 #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
|
10946 if (wp == curwin) |
| 7 | 10947 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10948 *attr = HL_ATTR(HLF_S); |
| 7 | 10949 fill = fill_stl; |
| 10950 } | |
| 10951 else | |
| 10952 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10953 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10954 fill = fill_stlnc; |
| 10955 } | |
| 10956 /* Use fill when there is highlighting, and highlighting of current | |
| 10957 * window differs, or the fillchars differ, or this is not the | |
| 10958 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10959 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
|
10960 || wp != curwin || ONE_WINDOW) |
| 7 | 10961 || (fill_stl != fill_stlnc))) |
| 10962 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
|
10963 if (wp == curwin) |
| 7 | 10964 return '^'; |
| 10965 return '='; | |
| 10966 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10967 |
| 7 | 10968 /* |
| 10969 * Get the character to use in a separator between vertically split windows. | |
| 10970 * Get its attributes in "*attr". | |
| 10971 */ | |
| 10972 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10973 fillchar_vsep(int *attr) |
| 7 | 10974 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10975 *attr = HL_ATTR(HLF_C); |
| 7 | 10976 if (*attr == 0 && fill_vert == ' ') |
| 10977 return '|'; | |
| 10978 else | |
| 10979 return fill_vert; | |
| 10980 } | |
| 10981 | |
| 10982 /* | |
| 10983 * Return TRUE if redrawing should currently be done. | |
| 10984 */ | |
| 10985 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10986 redrawing(void) |
| 7 | 10987 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10988 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10989 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
|
10990 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10991 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10992 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10993 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10994 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10995 || 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
|
10996 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10997 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10998 } |
| 10999 | |
| 11000 /* | |
| 11001 * Return TRUE if printing messages should currently be done. | |
| 11002 */ | |
| 11003 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11004 messaging(void) |
| 7 | 11005 { |
| 11006 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 11007 } | |
| 11008 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11009 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11010 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11011 * 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
|
11012 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11013 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11014 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
|
11015 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11016 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11017 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
|
11018 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
|
11019 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11020 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11021 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
|
11022 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
|
11023 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
|
11024 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11025 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
|
11026 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
|
11027 ++item_count; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
11028 wp->w_winbar_items = ALLOC_CLEAR_MULT(winbar_item_T, item_count + 1); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11029 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11030 /* 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
|
11031 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
|
11032 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
|
11033 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11034 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
|
11035 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
|
11036 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11037 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11038 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11039 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
|
11040 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
|
11041 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11042 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11043 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11044 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
|
11045 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
|
11046 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
|
11047 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11048 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11049 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
|
11050 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
|
11051 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11052 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
|
11053 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11054 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11055 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
|
11056 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
|
11057 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11058 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11059 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
|
11060 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11061 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
|
11062 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11063 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11064 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
|
11065 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11066 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
|
11067 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11068 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11069 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
|
11070 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11071 screen_line(wp->w_winrow, wp->w_wincol, (int)wp->w_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
11072 (int)wp->w_width, 0); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11073 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11074 #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
|
11075 |
| 7 | 11076 /* |
| 11077 * Show current status info in ruler and various other places | |
| 11078 * If always is FALSE, only show ruler if position has changed. | |
| 11079 */ | |
| 11080 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11081 showruler(int always) |
| 7 | 11082 { |
| 11083 if (!always && !redrawing()) | |
| 11084 return; | |
| 574 | 11085 #ifdef FEAT_INS_EXPAND |
| 11086 if (pum_visible()) | |
| 11087 { | |
| 11088 /* Don't redraw right now, do it later. */ | |
| 11089 curwin->w_redr_status = TRUE; | |
| 11090 return; | |
| 11091 } | |
| 11092 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11093 #if defined(FEAT_STL_OPT) |
| 40 | 11094 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 11095 redraw_custom_statusline(curwin); |
| 7 | 11096 else |
| 11097 #endif | |
| 11098 #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
|
11099 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11100 #endif |
| 11101 | |
| 11102 #ifdef FEAT_TITLE | |
| 11103 if (need_maketitle | |
| 11104 # ifdef FEAT_STL_OPT | |
| 11105 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11106 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11107 # endif | |
| 11108 ) | |
| 11109 maketitle(); | |
| 11110 #endif | |
| 1588 | 11111 /* Redraw the tab pages line if needed. */ |
| 11112 if (redraw_tabline) | |
| 11113 draw_tabline(); | |
| 7 | 11114 } |
| 11115 | |
| 11116 #ifdef FEAT_CMDL_INFO | |
| 11117 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
|
11118 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11119 { |
| 1869 | 11120 #define RULER_BUF_LEN 70 |
| 11121 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11122 int row; |
| 11123 int fillchar; | |
| 11124 int attr; | |
| 11125 int empty_line = FALSE; | |
| 11126 colnr_T virtcol; | |
| 11127 int i; | |
| 1869 | 11128 size_t len; |
| 7 | 11129 int o; |
| 11130 int this_ru_col; | |
| 11131 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
11132 int width; |
| 7 | 11133 |
| 11134 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11135 if (!p_ru) | |
| 11136 return; | |
| 11137 | |
| 11138 /* | |
| 11139 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11140 * after deleting lines, before cursor.lnum is corrected. | |
| 11141 */ | |
| 11142 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11143 return; | |
| 11144 | |
| 11145 #ifdef FEAT_INS_EXPAND | |
| 11146 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11147 * the (long) mode message. */ | |
| 11148 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11149 if (edit_submode != NULL) | |
| 11150 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
|
11151 // 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
|
11152 // 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
|
11153 if (!ignore_pum && pum_visible()) |
| 540 | 11154 return; |
| 7 | 11155 #endif |
| 11156 | |
| 11157 #ifdef FEAT_STL_OPT | |
| 11158 if (*p_ruf) | |
| 11159 { | |
| 680 | 11160 int save_called_emsg = called_emsg; |
| 11161 | |
| 11162 called_emsg = FALSE; | |
| 7 | 11163 win_redr_custom(wp, TRUE); |
| 680 | 11164 if (called_emsg) |
| 11165 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11166 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11167 called_emsg |= save_called_emsg; |
| 7 | 11168 return; |
| 11169 } | |
| 11170 #endif | |
| 11171 | |
| 11172 /* | |
| 11173 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11174 */ | |
| 11175 if (!(State & INSERT) | |
| 11176 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11177 empty_line = TRUE; | |
| 11178 | |
| 11179 /* | |
| 11180 * Only draw the ruler when something changed. | |
| 11181 */ | |
| 11182 validate_virtcol_win(wp); | |
| 11183 if ( redraw_cmdline | |
| 11184 || always | |
| 11185 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11186 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11187 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11188 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11189 || wp->w_topline != wp->w_ru_topline | |
| 11190 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11191 #ifdef FEAT_DIFF | |
| 11192 || wp->w_topfill != wp->w_ru_topfill | |
| 11193 #endif | |
| 11194 || empty_line != wp->w_ru_empty) | |
| 11195 { | |
| 11196 cursor_off(); | |
| 11197 if (wp->w_status_height) | |
| 11198 { | |
| 11199 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
|
11200 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
|
11201 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
|
11202 width = wp->w_width; |
| 7 | 11203 } |
| 11204 else | |
| 11205 { | |
| 11206 row = Rows - 1; | |
| 11207 fillchar = ' '; | |
| 11208 attr = 0; | |
| 11209 width = Columns; | |
| 11210 off = 0; | |
| 11211 } | |
| 11212 | |
| 11213 /* In list mode virtcol needs to be recomputed */ | |
| 11214 virtcol = wp->w_virtcol; | |
| 11215 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11216 { | |
| 11217 wp->w_p_list = FALSE; | |
| 11218 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11219 wp->w_p_list = TRUE; | |
| 11220 } | |
| 11221 | |
| 11222 /* | |
| 11223 * Some sprintfs return the length, some return a pointer. | |
| 11224 * To avoid portability problems we use strlen() here. | |
| 11225 */ | |
| 1869 | 11226 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11227 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11228 ? 0L | |
| 11229 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11230 len = STRLEN(buffer); |
| 11231 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11232 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11233 (int)virtcol + 1); | |
| 11234 | |
| 11235 /* | |
| 11236 * Add a "50%" if there is room for it. | |
| 11237 * On the last line, don't print in the last column (scrolls the | |
| 11238 * screen up on some terminals). | |
| 11239 */ | |
| 11240 i = (int)STRLEN(buffer); | |
| 1869 | 11241 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11242 o = i + vim_strsize(buffer + i + 1); |
| 11243 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11244 ++o; | |
| 11245 this_ru_col = ru_col - (Columns - width); | |
| 11246 if (this_ru_col < 0) | |
| 11247 this_ru_col = 0; | |
| 11248 /* Never use more than half the window/screen width, leave the other | |
| 11249 * 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
|
11250 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
|
11251 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
|
11252 if (this_ru_col + o < width) |
| 7 | 11253 { |
| 6466 | 11254 /* 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
|
11255 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11256 { |
| 11257 if (has_mbyte) | |
| 11258 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11259 else | |
| 11260 buffer[i++] = fillchar; | |
| 11261 ++o; | |
| 11262 } | |
| 1869 | 11263 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11264 } |
| 11265 /* Truncate at window boundary. */ | |
| 11266 if (has_mbyte) | |
| 11267 { | |
| 11268 o = 0; | |
| 474 | 11269 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11270 { |
| 11271 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
|
11272 if (this_ru_col + o > width) |
| 7 | 11273 { |
| 11274 buffer[i] = NUL; | |
| 11275 break; | |
| 11276 } | |
| 11277 } | |
| 11278 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11279 else if (this_ru_col + (int)STRLEN(buffer) > width) |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11280 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
|
11281 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11282 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11283 i = redraw_cmdline; |
| 11284 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
|
11285 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
|
11286 (int)(off + width), |
| 7 | 11287 fillchar, fillchar, attr); |
| 11288 /* don't redraw the cmdline because of showing the ruler */ | |
| 11289 redraw_cmdline = i; | |
| 11290 wp->w_ru_cursor = wp->w_cursor; | |
| 11291 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11292 wp->w_ru_empty = empty_line; | |
| 11293 wp->w_ru_topline = wp->w_topline; | |
| 11294 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11295 #ifdef FEAT_DIFF | |
| 11296 wp->w_ru_topfill = wp->w_topfill; | |
| 11297 #endif | |
| 11298 } | |
| 11299 } | |
| 11300 #endif | |
| 13 | 11301 |
| 11302 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11303 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11304 * 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
|
11305 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11306 * Otherwise it depends on 'numberwidth' and the line count. |
| 11307 */ | |
| 11308 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11309 number_width(win_T *wp) |
| 13 | 11310 { |
| 11311 int n; | |
| 11312 linenr_T lnum; | |
| 11313 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11314 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
|
11315 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11316 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11317 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11318 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11319 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
|
11320 |
| 6679 | 11321 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11322 return wp->w_nrwidth_width; |
| 11323 wp->w_nrwidth_line_count = lnum; | |
| 11324 | |
| 11325 n = 0; | |
| 11326 do | |
| 11327 { | |
| 856 | 11328 lnum /= 10; |
| 11329 ++n; | |
| 13 | 11330 } while (lnum > 0); |
| 11331 | |
| 11332 /* 'numberwidth' gives the minimal width plus one */ | |
| 11333 if (n < wp->w_p_nuw - 1) | |
| 11334 n = wp->w_p_nuw - 1; | |
| 11335 | |
| 11336 wp->w_nrwidth_width = n; | |
| 6679 | 11337 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11338 return n; |
| 11339 } | |
| 11340 #endif | |
| 3986 | 11341 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11342 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11343 /* |
| 11344 * Return the current cursor column. This is the actual position on the | |
| 11345 * screen. First column is 0. | |
| 11346 */ | |
| 11347 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11348 screen_screencol(void) |
| 3986 | 11349 { |
| 11350 return screen_cur_col; | |
| 11351 } | |
| 11352 | |
| 11353 /* | |
| 11354 * Return the current cursor row. This is the actual position on the screen. | |
| 11355 * First row is 0. | |
| 11356 */ | |
| 11357 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11358 screen_screenrow(void) |
| 3986 | 11359 { |
| 11360 return screen_cur_row; | |
| 11361 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11362 #endif |