Mercurial > vim
annotate src/screen.c @ 16918:21cddcc6fbe8 v8.1.1460
patch 8.1.1460: popup window border characters may be wrong
commit https://github.com/vim/vim/commit/02e15072be08ef4ae03d673fc95ed6234e749e1c
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 3 22:53:30 2019 +0200
patch 8.1.1460: popup window border characters may be wrong
Problem: Popup window border characters may be wrong.
Solution: Reset the border characters for each popup. Correct use of
'ambiwidth'.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 03 Jun 2019 23:00:06 +0200 |
| parents | 90cec755ff80 |
| children | 03f3a9ca2770 |
| 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 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
124 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
125 static void update_popups(void); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
126 #endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 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
|
128 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
|
129 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, int row, int endrow, hlf_T hl); |
| 7 | 130 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 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
|
132 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
|
133 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
|
134 #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
|
135 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
|
136 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 137 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void redraw_custom_statusline(win_T *wp); |
| 680 | 139 #endif |
| 7 | 140 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 141 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 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
|
145 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
|
146 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
|
147 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
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 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
|
156 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 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
|
158 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
|
159 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
|
160 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
161 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
|
162 #endif |
| 7 | 163 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 165 #endif |
| 166 #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
|
167 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 168 #endif |
| 169 | |
| 170 /* Ugly global: overrule attribute used by screen_char() */ | |
| 171 static int screen_char_attr = 0; | |
| 172 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 #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
|
174 /* 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
|
175 # 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
|
176 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
177 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
183 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
184 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
185 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
186 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
187 |
| 7 | 188 /* |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * 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
|
191 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 192 */ |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
204 if (!exiting && wp->w_redr_type < type) |
| 7 | 205 { |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 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
|
243 // 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
|
244 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
|
245 must_redraw = type; |
| 7 | 246 } |
| 247 | |
| 248 /* | |
| 301 | 249 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 250 */ |
| 251 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
252 redraw_curbuf_later(int type) |
| 7 | 253 { |
| 254 redraw_buf_later(curbuf, type); | |
| 255 } | |
| 256 | |
| 257 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
258 redraw_buf_later(buf_T *buf, int type) |
| 7 | 259 { |
| 260 win_T *wp; | |
| 261 | |
| 262 FOR_ALL_WINDOWS(wp) | |
| 263 { | |
| 264 if (wp->w_buffer == buf) | |
| 265 redraw_win_later(wp, type); | |
| 266 } | |
| 267 } | |
| 268 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
269 #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
|
270 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 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
|
272 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 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
|
274 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 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
|
276 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
|
277 && 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
|
278 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
|
279 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
280 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
281 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
282 #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
|
283 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
|
284 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
|
285 { |
|
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
|
286 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
|
287 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
288 #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
|
289 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
|
290 /* 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
|
291 * 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
|
292 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
293 #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
|
294 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
|
295 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 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
|
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 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
|
299 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
|
300 } |
|
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
|
301 } |
|
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
|
302 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
303 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
304 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
305 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 306 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 * 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
|
308 * 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
|
309 * Return a code indicating what happened. |
|
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 |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
312 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int rows; |
| 6959 | 315 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
319 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
321 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 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
|
323 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 redraw_later(type); |
| 6959 | 326 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
|
327 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 330 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
|
331 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
|
332 screenattr = LALLOC_MULT(sattr_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 { |
|
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
|
337 screenlineUC = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 { |
|
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
|
342 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
|
343 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 { |
|
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
|
349 screenline2 = LALLOC_MULT(schar_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 /* 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
|
357 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
| 6959 | 359 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 361 (size_t)cols * sizeof(schar_T)); |
| 362 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 { |
| 6959 | 367 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 369 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 for (i = 0; i < p_mco; ++i) |
| 6959 | 371 mch_memmove(screenlineC[i] + r * cols, |
| 372 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 373 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 376 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 378 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 } |
|
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 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 int off = (int)(current_ScreenLine - ScreenLines); |
|
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 /* 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
|
389 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(current_ScreenLine, |
| 6959 | 392 screenline + r * cols, |
| 393 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(ScreenAttrs + off, |
| 6959 | 395 screenattr + r * cols, |
| 396 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(ScreenLinesUC + off, |
| 6959 | 400 screenlineUC + r * cols, |
| 401 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 404 screenlineC[i] + r * cols, |
| 405 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 mch_memmove(ScreenLines2 + off, |
| 6959 | 409 screenline2 + r * cols, |
| 410 (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
|
411 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
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
435 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
438 * 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
|
439 * 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
|
440 * 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
|
441 * 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
|
442 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
445 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
|
446 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
447 ++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
|
448 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 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
|
450 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 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
|
452 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // 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
|
454 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
|
455 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 // 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
|
457 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 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
|
459 #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
|
460 && 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
|
461 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 // 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
|
466 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 } |
|
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
|
469 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
470 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
|
471 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
472 // 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
|
473 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
474 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
475 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 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
|
479 // 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
|
480 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
481 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
482 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
483 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 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
|
485 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
486 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
488 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 /* |
| 7 | 490 * Changed something in the current window, at buffer line "lnum", that |
| 491 * requires that line and possibly other lines to be redrawn. | |
| 492 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 493 * Used to remove the "$" from a change command. | |
| 494 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 495 * may become invalid and the whole window will have to be redrawn. | |
| 496 */ | |
| 497 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
498 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
499 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
|
500 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
501 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
502 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
|
503 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
|
504 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
|
505 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
|
506 redraw_win_later(wp, VALID); |
| 7 | 507 } |
| 508 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
509 /* |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
510 * 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
|
511 * 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
|
512 */ |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 void |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
514 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
|
515 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 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
|
517 #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
|
518 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
|
519 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
|
520 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 #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
|
522 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
|
523 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 #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
|
526 // 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
|
527 // 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
|
528 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
|
529 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
530 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
531 |
| 7 | 532 /* |
|
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
|
533 * Update all windows that are editing the current buffer. |
| 7 | 534 */ |
| 535 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
536 update_curbuf(int type) |
| 7 | 537 { |
| 538 redraw_curbuf_later(type); | |
| 539 update_screen(type); | |
| 540 } | |
| 541 | |
| 542 /* | |
| 543 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 544 * 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
|
545 * 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
|
546 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
547 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
|
548 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
|
549 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
550 int type = type_arg; |
| 7 | 551 win_T *wp; |
| 552 static int did_intro = FALSE; | |
| 553 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 554 int did_one; | |
| 555 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
556 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
557 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
558 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
559 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
560 #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
|
561 int no_update = FALSE; |
| 7 | 562 |
| 2008 | 563 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 564 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
|
565 return FAIL; |
| 7 | 566 |
|
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
|
567 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
|
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 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
|
570 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
|
571 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
572 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
573 #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
|
574 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 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
|
576 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 // 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
|
578 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
|
579 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
|
580 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
581 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
582 |
| 7 | 583 if (must_redraw) |
| 584 { | |
| 585 if (type < must_redraw) /* use maximal type */ | |
| 586 type = must_redraw; | |
| 1331 | 587 |
| 588 /* must_redraw is reset here, so that when we run into some weird | |
| 589 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 590 * scrolling), or update_topline() in win_update() will cause a | |
| 591 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 592 must_redraw = 0; |
| 593 } | |
| 594 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
595 /* 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
|
596 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
|
597 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 && !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
|
599 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
600 ) |
| 7 | 601 type = NOT_VALID; |
| 602 | |
| 2008 | 603 /* Postpone the redrawing when it's not needed and when being called |
| 604 * recursively. */ | |
| 605 if (!redrawing() || updating_screen) | |
| 7 | 606 { |
| 607 redraw_later(type); /* remember type for next time */ | |
| 608 must_redraw = type; | |
| 609 if (type > INVERTED_ALL) | |
| 610 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
|
611 return FAIL; |
| 7 | 612 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
613 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 // TODO: avoid redrawing everything when there is a popup window. |
|
16809
5ff14f96f1c9
patch 8.1.1406: popup_hide() and popup_show() not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16796
diff
changeset
|
615 if (popup_any_visible()) |
|
16900
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
616 { |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
617 if (type < NOT_VALID) |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
618 type = NOT_VALID; |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
619 FOR_ALL_WINDOWS(wp) |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
620 wp->w_redr_type = NOT_VALID; |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
621 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
622 #endif |
| 7 | 623 |
| 624 updating_screen = TRUE; | |
| 625 #ifdef FEAT_SYN_HL | |
| 626 ++display_tick; /* let syntax code know we're in a next round of | |
| 627 * display updating */ | |
| 628 #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
|
629 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
|
630 ++no_win_do_lines_ins; |
| 7 | 631 |
| 632 /* | |
| 633 * if the screen was scrolled up when displaying a message, scroll it down | |
| 634 */ | |
| 635 if (msg_scrolled) | |
| 636 { | |
| 637 clear_cmdline = TRUE; | |
| 638 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 639 type = CLEAR; | |
| 640 else if (type != CLEAR) | |
| 641 { | |
| 642 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
|
643 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
|
644 == FAIL) |
| 7 | 645 type = CLEAR; |
| 646 FOR_ALL_WINDOWS(wp) | |
| 647 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
648 if (wp->w_winrow < msg_scrolled) |
| 7 | 649 { |
| 650 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 651 && wp->w_redr_type < REDRAW_TOP | |
| 652 && wp->w_lines_valid > 0 | |
| 653 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 654 { | |
| 655 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 656 wp->w_redr_type = REDRAW_TOP; | |
| 657 } | |
| 658 else | |
| 659 { | |
| 660 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
|
661 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
|
662 <= msg_scrolled) |
| 7 | 663 wp->w_redr_status = TRUE; |
| 664 } | |
| 665 } | |
| 666 } | |
|
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
|
667 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
|
668 redraw_cmdline = TRUE; |
| 673 | 669 redraw_tabline = TRUE; |
| 7 | 670 } |
| 671 msg_scrolled = 0; | |
| 672 need_wait_return = FALSE; | |
| 673 } | |
| 674 | |
| 675 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 676 compute_cmdrow(); | |
| 677 | |
| 678 /* Check for changed highlighting */ | |
| 679 if (need_highlight_changed) | |
| 680 highlight_changed(); | |
| 681 | |
| 682 if (type == CLEAR) /* first clear screen */ | |
| 683 { | |
| 684 screenclear(); /* will reset clear_cmdline */ | |
| 685 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
|
686 /* 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
|
687 must_redraw = 0; |
| 7 | 688 } |
| 689 | |
| 690 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 691 check_for_delay(FALSE); | |
| 692 | |
| 13 | 693 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
694 /* 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
|
695 * changes. */ |
| 13 | 696 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
697 && 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
|
698 ? number_width(curwin) : 0)) |
| 13 | 699 curwin->w_redr_type = NOT_VALID; |
| 700 #endif | |
| 701 | |
| 7 | 702 /* |
| 703 * Only start redrawing if there is really something to do. | |
| 704 */ | |
| 705 if (type == INVERTED) | |
| 706 update_curswant(); | |
| 707 if (curwin->w_redr_type < type | |
| 708 && !((type == VALID | |
| 709 && curwin->w_lines[0].wl_valid | |
| 710 #ifdef FEAT_DIFF | |
| 711 && curwin->w_topfill == curwin->w_old_topfill | |
| 712 && curwin->w_botfill == curwin->w_old_botfill | |
| 713 #endif | |
| 714 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 715 || (type == INVERTED | |
| 1043 | 716 && VIsual_active |
| 7 | 717 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 718 && curwin->w_old_visual_mode == VIsual_mode | |
| 719 && (curwin->w_valid & VALID_VIRTCOL) | |
| 720 && curwin->w_old_curswant == curwin->w_curswant) | |
| 721 )) | |
| 722 curwin->w_redr_type = type; | |
| 723 | |
| 849 | 724 /* Redraw the tab pages line if needed. */ |
| 725 if (redraw_tabline || type >= NOT_VALID) | |
| 726 draw_tabline(); | |
| 727 | |
| 7 | 728 #ifdef FEAT_SYN_HL |
| 729 /* | |
| 730 * Correct stored syntax highlighting info for changes in each displayed | |
| 731 * buffer. Each buffer must only be done once. | |
| 732 */ | |
| 733 FOR_ALL_WINDOWS(wp) | |
| 734 { | |
| 735 if (wp->w_buffer->b_mod_set) | |
| 736 { | |
| 737 win_T *wwp; | |
| 738 | |
| 739 /* Check if we already did this buffer. */ | |
| 740 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 741 if (wwp->w_buffer == wp->w_buffer) | |
| 742 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
743 if (wwp == wp && syntax_present(wp)) |
| 7 | 744 syn_stack_apply_changes(wp->w_buffer); |
| 745 } | |
| 746 } | |
| 747 #endif | |
| 748 | |
| 749 /* | |
| 750 * Go from top to bottom through the windows, redrawing the ones that need | |
| 751 * it. | |
| 752 */ | |
| 753 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 754 did_one = FALSE; | |
| 755 #endif | |
| 756 #ifdef FEAT_SEARCH_EXTRA | |
| 757 search_hl.rm.regprog = NULL; | |
| 758 #endif | |
| 759 FOR_ALL_WINDOWS(wp) | |
| 760 { | |
| 761 if (wp->w_redr_type != 0) | |
| 762 { | |
| 763 cursor_off(); | |
| 764 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 765 if (!did_one) | |
| 766 { | |
| 767 did_one = TRUE; | |
| 768 # ifdef FEAT_SEARCH_EXTRA | |
| 769 start_search_hl(); | |
| 770 # endif | |
| 771 # ifdef FEAT_CLIPBOARD | |
| 772 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 773 if (clip_star.available && clip_isautosel_star()) |
| 774 clip_update_selection(&clip_star); | |
| 775 if (clip_plus.available && clip_isautosel_plus()) | |
| 776 clip_update_selection(&clip_plus); | |
| 7 | 777 # endif |
| 778 #ifdef FEAT_GUI | |
| 779 /* Remove the cursor before starting to do anything, because | |
| 780 * scrolling may make it difficult to redraw the text under | |
| 781 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
782 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
|
783 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
784 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
785 gui_cursor_row = gui.cursor_row; |
| 7 | 786 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
787 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
788 } |
| 7 | 789 #endif |
| 790 } | |
| 791 #endif | |
| 792 win_update(wp); | |
| 793 } | |
| 794 | |
| 795 /* redraw status line after the window to minimize cursor movement */ | |
| 796 if (wp->w_redr_status) | |
| 797 { | |
| 798 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
799 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 800 } |
| 801 } | |
| 802 #if defined(FEAT_SEARCH_EXTRA) | |
| 803 end_search_hl(); | |
| 804 #endif | |
| 4107 | 805 #ifdef FEAT_INS_EXPAND |
| 806 /* 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
|
807 pum_may_redraw(); |
| 4107 | 808 #endif |
| 7 | 809 |
| 810 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 811 * 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
|
812 FOR_ALL_WINDOWS(wp) |
| 7 | 813 wp->w_buffer->b_mod_set = FALSE; |
| 814 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
815 after_updating_screen(TRUE); |
| 7 | 816 |
| 817 /* Clear or redraw the command line. Done last, because scrolling may | |
| 818 * 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
|
819 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 820 showmode(); |
| 821 | |
|
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
|
822 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
|
823 --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
|
824 |
| 7 | 825 /* 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
|
826 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
827 maybe_intro_message(); |
| 7 | 828 did_intro = TRUE; |
| 829 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
830 #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
|
831 // Display popup windows on top of the windows. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
832 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
833 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
834 |
| 7 | 835 #ifdef FEAT_GUI |
| 836 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 837 * done. */ | |
| 838 if (gui.in_use) | |
| 839 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
840 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
|
841 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
842 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
843 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
|
844 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
845 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
846 /* 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
|
847 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
848 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
849 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
850 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 851 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
852 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
853 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
854 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
855 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
856 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
857 out_flush(); |
| 7 | 858 gui_update_scrollbars(FALSE); |
| 859 } | |
| 860 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
861 return OK; |
| 7 | 862 } |
| 863 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
864 #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
|
865 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 * 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
|
867 * 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
|
868 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 /* 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
|
876 * 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
|
877 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 } |
|
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 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 * 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
|
887 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 { |
|
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
|
891 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
|
892 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
898 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
|
899 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 /* 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
|
902 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
905 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
|
906 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
907 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
908 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
909 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
910 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
911 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
912 #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
|
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 * 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
|
915 * 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
|
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 |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
918 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
|
919 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 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
|
921 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
922 if (*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
|
923 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
|
924 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
|
925 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
|
926 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
|
927 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
|
928 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
|
929 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
930 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
931 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
|
932 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 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
|
934 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
|
935 } |
|
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 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 * 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
|
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 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
941 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
|
942 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
943 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
|
944 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
945 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
|
946 /* 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
|
947 * 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
|
948 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
|
949 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
950 } |
| 7 | 951 #endif |
| 952 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
953 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 954 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
955 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 956 { |
| 957 win_T *wp; | |
| 958 int doit = FALSE; | |
| 959 | |
| 960 # ifdef FEAT_FOLDING | |
| 961 win_foldinfo.fi_level = 0; | |
| 962 # endif | |
| 963 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
964 // 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
|
965 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
|
966 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
967 // check if it resulted in the need to redraw a window |
| 7 | 968 FOR_ALL_WINDOWS(wp) |
| 969 if (wp->w_redr_type != 0) | |
| 970 doit = TRUE; | |
| 971 | |
| 3250 | 972 /* 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
|
973 * 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
|
974 */ |
| 3250 | 975 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
|
976 || 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
|
977 || msg_scrolled |
| 3250 | 978 #ifdef FEAT_GUI |
| 979 || gui.starting | |
| 980 #endif | |
| 981 || starting) | |
| 7 | 982 return; |
| 983 | |
| 984 /* update all windows that need updating */ | |
| 985 update_prepare(); | |
| 986 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
987 FOR_ALL_WINDOWS(wp) |
| 7 | 988 { |
| 989 if (wp->w_redr_type != 0) | |
| 990 win_update(wp); | |
| 991 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
|
992 win_redr_status(wp, FALSE); |
| 7 | 993 } |
| 994 | |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
995 #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
|
996 // Display popup windows on top of the others. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
997 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
998 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
999 |
| 7 | 1000 update_finish(); |
| 1001 } | |
| 1002 #endif | |
| 1003 | |
|
16817
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 * 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
|
1006 * 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
|
1007 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1008 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1009 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
|
1010 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1011 int wcr_attr = 0; |
|
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 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
|
1014 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
|
1015 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1016 if (bt_popup(wp->w_buffer) && wcr_attr == 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1017 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
|
1018 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1019 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1020 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1021 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1022 #ifdef FEAT_TEXT_PROP |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1023 /* |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1024 * Return a string of "len" spaces in IObuff. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1025 */ |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1026 static char_u * |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1027 get_spaces(int len) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1028 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1029 vim_memset(IObuff, ' ', (size_t)len); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1030 IObuff[len] = NUL; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1031 return IObuff; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1032 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1033 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1034 static void |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1035 update_popups(void) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1036 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1037 win_T *wp; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1038 int top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1039 int left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1040 int total_width; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1041 int total_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1042 int popup_attr; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1043 int border_attr[4]; |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1044 int border_char[8]; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1045 char_u buf[MB_MAXBYTES]; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1046 int row; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1047 int i; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1048 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1049 // Find the window with the lowest zindex that hasn't been updated yet, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1050 // so that the window with a higher zindex is drawn later, thus goes on |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1051 // top. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1052 // TODO: don't redraw every popup every time. |
|
16904
9138e2c60bf1
patch 8.1.1453: popup window "moved" property not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16900
diff
changeset
|
1053 popup_visible = FALSE; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1054 popup_reset_handled(); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1055 while ((wp = find_next_popup(TRUE)) != NULL) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1056 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1057 // Recompute the position if the text changed. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1058 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1059 popup_adjust_position(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1060 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1061 // adjust w_winrow and w_wincol for border and padding, since |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1062 // win_update() doesn't handle them. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1063 top_off = wp->w_popup_padding[0] + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1064 left_off = wp->w_popup_padding[3] + wp->w_popup_border[3]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1065 wp->w_winrow += top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1066 wp->w_wincol += left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1067 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1068 // Draw the popup text. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1069 win_update(wp); |
|
16904
9138e2c60bf1
patch 8.1.1453: popup window "moved" property not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16900
diff
changeset
|
1070 popup_visible = TRUE; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1071 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1072 wp->w_winrow -= top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1073 wp->w_wincol -= left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1074 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1075 total_width = wp->w_popup_border[3] + wp->w_popup_padding[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1076 + wp->w_width + wp->w_popup_padding[1] + wp->w_popup_border[1]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1077 total_height = wp->w_popup_border[0] + wp->w_popup_padding[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1078 + wp->w_height + wp->w_popup_padding[2] + wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1079 popup_attr = get_wcr_attr(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1080 |
|
16916
90cec755ff80
patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"
Bram Moolenaar <Bram@vim.org>
parents:
16914
diff
changeset
|
1081 // We can only use these line drawing characters when 'encoding' is |
|
90cec755ff80
patch 8.1.1459: popup window border looks bad when 'ambiwidth' is "double"
Bram Moolenaar <Bram@vim.org>
parents:
16914
diff
changeset
|
1082 // "utf-8" and 'ambiwidth' is "single". |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1083 if (enc_utf8 && *p_ambw == 's') |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1084 { |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1085 border_char[0] = border_char[2] = 0x2550; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1086 border_char[1] = border_char[3] = 0x2551; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1087 border_char[4] = 0x2554; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1088 border_char[5] = 0x2557; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1089 border_char[6] = 0x255d; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1090 border_char[7] = 0x255a; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1091 } |
|
16918
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1092 else |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1093 { |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1094 border_char[0] = border_char[2] = '-'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1095 border_char[1] = border_char[3] = '|'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1096 for (i = 4; i < 8; ++i) |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1097 border_char[i] = '+'; |
|
21cddcc6fbe8
patch 8.1.1460: popup window border characters may be wrong
Bram Moolenaar <Bram@vim.org>
parents:
16916
diff
changeset
|
1098 } |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1099 for (i = 0; i < 8; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1100 if (wp->w_border_char[i] != 0) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1101 border_char[i] = wp->w_border_char[i]; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1102 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1103 for (i = 0; i < 4; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1104 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1105 border_attr[i] = popup_attr; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1106 if (wp->w_border_highlight[i] != NULL) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1107 border_attr[i] = syn_name2attr(wp->w_border_highlight[i]); |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1108 } |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1109 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1110 if (wp->w_popup_border[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1111 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1112 // top border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1113 screen_fill(wp->w_winrow, wp->w_winrow + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1114 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1115 wp->w_wincol + total_width, |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1116 wp->w_popup_border[3] != 0 |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1117 ? border_char[4] : border_char[0], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1118 border_char[0], border_attr[0]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1119 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1120 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1121 buf[mb_char2bytes(border_char[5], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1122 screen_puts(buf, wp->w_winrow, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1123 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1124 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1125 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1126 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1127 if (wp->w_popup_padding[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1128 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1129 // top padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1130 row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1131 screen_fill(row, row + wp->w_popup_padding[0], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1132 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1133 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1134 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1135 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1136 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1137 for (row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1138 row < wp->w_winrow + total_height - wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1139 ++row) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1140 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1141 // left border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1142 if (wp->w_popup_border[3] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1143 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1144 buf[mb_char2bytes(border_char[3], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1145 screen_puts(buf, row, wp->w_wincol, border_attr[3]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1146 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1147 // left padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1148 if (wp->w_popup_padding[3] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1149 screen_puts(get_spaces(wp->w_popup_padding[3]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1150 wp->w_wincol + wp->w_popup_border[3], popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1151 // right border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1152 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1153 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1154 buf[mb_char2bytes(border_char[1], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1155 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1156 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1157 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1158 // right padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1159 if (wp->w_popup_padding[1] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1160 screen_puts(get_spaces(wp->w_popup_padding[1]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1161 wp->w_wincol + wp->w_popup_border[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1162 + wp->w_popup_padding[3] + wp->w_width, popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1163 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1164 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1165 if (wp->w_popup_padding[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1166 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1167 // bottom padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1168 row = wp->w_winrow + wp->w_popup_border[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1169 + wp->w_popup_padding[0] + wp->w_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1170 screen_fill(row, row + wp->w_popup_padding[2], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1171 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1172 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1173 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1174 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1175 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1176 if (wp->w_popup_border[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1177 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1178 // bottom border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1179 row = wp->w_winrow + total_height - 1; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1180 screen_fill(row , row + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1181 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1182 wp->w_wincol + total_width, |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1183 wp->w_popup_border[3] != 0 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1184 ? border_char[7] : border_char[2], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1185 border_char[2], border_attr[2]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1186 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1187 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1188 buf[mb_char2bytes(border_char[6], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1189 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1190 wp->w_wincol + total_width - 1, border_attr[2]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1191 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1192 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1193 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1194 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1195 #endif |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1196 |
| 7 | 1197 #if defined(FEAT_GUI) || defined(PROTO) |
| 1198 /* | |
| 1199 * Update a single window, its status line and maybe the command line msg. | |
| 1200 * Used for the GUI scrollbar. | |
| 1201 */ | |
| 1202 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1203 updateWindow(win_T *wp) |
| 7 | 1204 { |
| 2008 | 1205 /* return if already busy updating */ |
| 1206 if (updating_screen) | |
| 1207 return; | |
| 1208 | |
| 7 | 1209 update_prepare(); |
| 1210 | |
| 1211 #ifdef FEAT_CLIPBOARD | |
| 1212 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1213 if (clip_star.available && clip_isautosel_star()) |
| 1214 clip_update_selection(&clip_star); | |
| 1215 if (clip_plus.available && clip_isautosel_plus()) | |
| 1216 clip_update_selection(&clip_plus); | |
| 7 | 1217 #endif |
| 670 | 1218 |
| 7 | 1219 win_update(wp); |
| 670 | 1220 |
| 1221 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1222 if (redraw_tabline) |
| 677 | 1223 draw_tabline(); |
| 670 | 1224 |
| 7 | 1225 if (wp->w_redr_status |
| 1226 # ifdef FEAT_CMDL_INFO | |
| 1227 || p_ru | |
| 1228 # endif | |
| 1229 # ifdef FEAT_STL_OPT | |
| 40 | 1230 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1231 # endif |
| 1232 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1233 win_redr_status(wp, FALSE); |
| 7 | 1234 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1235 #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
|
1236 // Display popup windows on top of everything. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1237 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1238 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1239 |
| 7 | 1240 update_finish(); |
| 1241 } | |
| 1242 #endif | |
| 1243 | |
| 1244 /* | |
| 1245 * Update a single window. | |
| 1246 * | |
| 1247 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1248 * screen or scrolling lines). | |
| 1249 * | |
| 1250 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1251 * implies the one below it. | |
| 1252 * NOT_VALID redraw the whole window | |
| 743 | 1253 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1254 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1255 * INVERTED redraw the changed part of the Visual area | |
| 1256 * INVERTED_ALL redraw the whole Visual area | |
| 1257 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1258 * 2. update lines at the top when scrolled down | |
| 1259 * 3. redraw changed text: | |
| 301 | 1260 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1261 * b_mod_top and b_mod_bot. |
| 1262 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1263 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1264 * - continue redrawing when syntax status is invalid. | |
| 1265 * 4. if scrolled up, update lines at the bottom. | |
| 1266 * This results in three areas that may need updating: | |
| 1267 * top: from first row to top_end (when scrolled down) | |
| 1268 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1269 * bot: from bot_start to last row (when scrolled up) | |
| 1270 */ | |
| 1271 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1272 win_update(win_T *wp) |
| 7 | 1273 { |
| 1274 buf_T *buf = wp->w_buffer; | |
| 1275 int type; | |
| 1276 int top_end = 0; /* Below last row of the top area that needs | |
| 1277 updating. 0 when no top area updating. */ | |
| 1278 int mid_start = 999;/* first row of the mid area that needs | |
| 1279 updating. 999 when no mid area updating. */ | |
| 1280 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1281 updating. 0 when no mid area updating. */ | |
| 1282 int bot_start = 999;/* first row of the bot area that needs | |
| 1283 updating. 999 when no bot area updating */ | |
| 1284 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1285 w_topline got smaller a bit */ | |
| 1286 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1287 matchitem_T *cur; /* points to the match list */ |
| 7 | 1288 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1289 #endif | |
| 1290 | |
| 1291 int row; /* current window row to display */ | |
| 1292 linenr_T lnum; /* current buffer lnum to display */ | |
| 1293 int idx; /* current index in w_lines[] */ | |
| 1294 int srow; /* starting row of the current line */ | |
| 1295 | |
| 1296 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1297 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1298 int i; | |
| 1299 long j; | |
| 1300 static int recursive = FALSE; /* being called recursively */ | |
| 1301 int old_botline = wp->w_botline; | |
| 1302 #ifdef FEAT_FOLDING | |
| 1303 long fold_count; | |
| 1304 #endif | |
| 1305 #ifdef FEAT_SYN_HL | |
| 1306 /* remember what happened to the previous line, to know if | |
| 1307 * check_visual_highlight() can be used */ | |
| 1308 #define DID_NONE 1 /* didn't update a line */ | |
| 1309 #define DID_LINE 2 /* updated a normal line */ | |
| 1310 #define DID_FOLD 3 /* updated a folded line */ | |
| 1311 int did_update = DID_NONE; | |
| 1312 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1313 #endif | |
| 1314 linenr_T mod_top = 0; | |
| 1315 linenr_T mod_bot = 0; | |
| 1316 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1317 int save_got_int; | |
| 1318 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1319 #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
|
1320 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
|
1321 #endif |
| 7 | 1322 |
| 1323 type = wp->w_redr_type; | |
| 1324 | |
| 1325 if (type == NOT_VALID) | |
| 1326 { | |
| 1327 wp->w_redr_status = TRUE; | |
| 1328 wp->w_lines_valid = 0; | |
| 1329 } | |
| 1330 | |
| 1331 /* 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
|
1332 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1333 { |
| 1334 wp->w_redr_type = 0; | |
| 1335 return; | |
| 1336 } | |
| 1337 | |
| 1338 /* Window is zero-width: Only need to draw the separator. */ | |
| 1339 if (wp->w_width == 0) | |
| 1340 { | |
| 1341 /* draw the vertical separator right of this window */ | |
| 1342 draw_vsep_win(wp, 0); | |
| 1343 wp->w_redr_type = 0; | |
| 1344 return; | |
| 1345 } | |
| 1346 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1347 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1348 // 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
|
1349 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
|
1350 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1351 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
|
1352 # 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
|
1353 /* 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
|
1354 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
|
1355 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
|
1356 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1357 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
|
1358 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1359 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1360 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1361 |
| 7 | 1362 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1363 init_search_hl(wp); |
| 7 | 1364 #endif |
| 1365 | |
| 13 | 1366 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1367 /* 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
|
1368 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1369 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1370 if (wp->w_nrwidth != i) |
| 13 | 1371 { |
| 1372 type = NOT_VALID; | |
| 677 | 1373 wp->w_nrwidth = i; |
| 13 | 1374 } |
| 1375 else | |
| 1376 #endif | |
| 1377 | |
| 7 | 1378 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1379 { | |
| 1380 /* | |
| 1381 * When there are both inserted/deleted lines and specific lines to be | |
| 1382 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1383 * everything (only happens when redrawing is off for while). | |
| 1384 */ | |
| 1385 type = NOT_VALID; | |
| 1386 } | |
| 1387 else | |
| 1388 { | |
| 1389 /* | |
| 1390 * Set mod_top to the first line that needs displaying because of | |
| 1391 * changes. Set mod_bot to the first line after the changes. | |
| 1392 */ | |
| 1393 mod_top = wp->w_redraw_top; | |
| 1394 if (wp->w_redraw_bot != 0) | |
| 1395 mod_bot = wp->w_redraw_bot + 1; | |
| 1396 else | |
| 1397 mod_bot = 0; | |
| 1398 if (buf->b_mod_set) | |
| 1399 { | |
| 1400 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1401 { | |
| 1402 mod_top = buf->b_mod_top; | |
| 1403 #ifdef FEAT_SYN_HL | |
| 1404 /* Need to redraw lines above the change that may be included | |
| 1405 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1406 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1407 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1408 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1409 if (mod_top < 1) |
| 1410 mod_top = 1; | |
| 1411 } | |
| 1412 #endif | |
| 1413 } | |
| 1414 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1415 mod_bot = buf->b_mod_bot; | |
| 1416 | |
| 1417 #ifdef FEAT_SEARCH_EXTRA | |
| 1418 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1419 * change in one line may make the Search highlighting in a | |
| 1420 * previous line invalid. Simple solution: redraw all visible | |
| 1421 * lines above the change. | |
| 1326 | 1422 * Same for a match pattern. |
| 7 | 1423 */ |
| 699 | 1424 if (search_hl.rm.regprog != NULL |
| 1425 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1426 top_to_mod = TRUE; |
| 699 | 1427 else |
| 1326 | 1428 { |
| 1429 cur = wp->w_match_head; | |
| 1430 while (cur != NULL) | |
| 1431 { | |
| 1432 if (cur->match.regprog != NULL | |
| 1433 && re_multiline(cur->match.regprog)) | |
| 699 | 1434 { |
| 1435 top_to_mod = TRUE; | |
| 1436 break; | |
| 1437 } | |
| 1326 | 1438 cur = cur->next; |
| 1439 } | |
| 1440 } | |
| 7 | 1441 #endif |
| 1442 } | |
| 1443 #ifdef FEAT_FOLDING | |
| 1444 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1445 { | |
| 1446 linenr_T lnumt, lnumb; | |
| 1447 | |
| 1448 /* | |
| 1449 * A change in a line can cause lines above it to become folded or | |
| 1450 * unfolded. Find the top most buffer line that may be affected. | |
| 1451 * If the line was previously folded and displayed, get the first | |
| 1452 * line of that fold. If the line is folded now, get the first | |
| 1453 * folded line. Use the minimum of these two. | |
| 1454 */ | |
| 1455 | |
| 1456 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1457 * the line below it. If there is no valid entry, use w_topline. | |
| 1458 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1459 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1460 lnumt = wp->w_topline; | |
| 1461 lnumb = MAXLNUM; | |
| 1462 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1463 if (wp->w_lines[i].wl_valid) | |
| 1464 { | |
| 1465 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1466 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1467 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1468 { | |
| 1469 lnumb = wp->w_lines[i].wl_lnum; | |
| 1470 /* When there is a fold column it might need updating | |
| 1471 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1472 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1473 ++lnumb; |
| 1474 } | |
| 1475 } | |
| 1476 | |
| 1477 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1478 if (mod_top > lnumt) | |
| 1479 mod_top = lnumt; | |
| 1480 | |
| 1481 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1482 --mod_bot; | |
| 1483 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1484 ++mod_bot; | |
| 1485 if (mod_bot < lnumb) | |
| 1486 mod_bot = lnumb; | |
| 1487 } | |
| 1488 #endif | |
| 1489 | |
| 1490 /* When a change starts above w_topline and the end is below | |
| 1491 * w_topline, start redrawing at w_topline. | |
| 36 | 1492 * If the end of the change is above w_topline: do like no change was |
| 1493 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1494 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1495 { | |
| 1496 if (mod_bot > wp->w_topline) | |
| 1497 mod_top = wp->w_topline; | |
| 1498 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1499 else if (syntax_present(wp)) |
| 7 | 1500 top_end = 1; |
| 1501 #endif | |
| 1502 } | |
| 36 | 1503 |
| 1504 /* When line numbers are displayed need to redraw all lines below | |
| 1505 * inserted/deleted lines. */ | |
| 1506 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1507 mod_bot = MAXLNUM; | |
| 7 | 1508 } |
|
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
|
1509 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
|
1510 wp->w_redraw_bot = 0; |
| 7 | 1511 |
| 1512 /* | |
| 1513 * When only displaying the lines at the top, set top_end. Used when | |
| 1514 * window has scrolled down for msg_scrolled. | |
| 1515 */ | |
| 1516 if (type == REDRAW_TOP) | |
| 1517 { | |
| 1518 j = 0; | |
| 1519 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1520 { | |
| 1521 j += wp->w_lines[i].wl_size; | |
| 1522 if (j >= wp->w_upd_rows) | |
| 1523 { | |
| 1524 top_end = j; | |
| 1525 break; | |
| 1526 } | |
| 1527 } | |
| 1528 if (top_end == 0) | |
| 1529 /* not found (cannot happen?): redraw everything */ | |
| 1530 type = NOT_VALID; | |
| 1531 else | |
| 1532 /* top area defined, the rest is VALID */ | |
| 1533 type = VALID; | |
| 1534 } | |
| 1535 | |
| 1378 | 1536 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1537 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1538 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1539 * called. */ | |
| 1540 if (screen_cleared) | |
| 1541 screen_cleared = MAYBE; | |
| 1542 | |
| 7 | 1543 /* |
| 1544 * If there are no changes on the screen that require a complete redraw, | |
| 1545 * handle three cases: | |
| 1546 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1547 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1548 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1549 * w_lines[] that needs updating. | |
| 1550 */ | |
| 743 | 1551 if ((type == VALID || type == SOME_VALID |
| 1552 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1553 #ifdef FEAT_DIFF |
| 1554 && !wp->w_botfill && !wp->w_old_botfill | |
| 1555 #endif | |
| 1556 ) | |
| 1557 { | |
| 1558 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1559 { | |
| 1560 /* | |
| 1561 * w_topline is the first changed line, the scrolling will be done | |
| 1562 * further down. | |
| 1563 */ | |
| 1564 } | |
| 1565 else if (wp->w_lines[0].wl_valid | |
| 1566 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1567 #ifdef FEAT_DIFF | |
| 1568 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1569 && wp->w_topfill > wp->w_old_topfill) | |
| 1570 #endif | |
| 1571 )) | |
| 1572 { | |
| 1573 /* | |
| 1574 * New topline is above old topline: May scroll down. | |
| 1575 */ | |
| 1576 #ifdef FEAT_FOLDING | |
| 1577 if (hasAnyFolding(wp)) | |
| 1578 { | |
| 1579 linenr_T ln; | |
| 1580 | |
| 1581 /* count the number of lines we are off, counting a sequence | |
| 1582 * of folded lines as one */ | |
| 1583 j = 0; | |
| 1584 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1585 { | |
| 1586 ++j; | |
| 1587 if (j >= wp->w_height - 2) | |
| 1588 break; | |
| 1589 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1590 } | |
| 1591 } | |
| 1592 else | |
| 1593 #endif | |
| 1594 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1595 if (j < wp->w_height - 2) /* not too far off */ | |
| 1596 { | |
| 1597 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1598 #ifdef FEAT_DIFF | |
| 1599 /* insert extra lines for previously invisible filler lines */ | |
| 1600 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1601 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1602 - wp->w_old_topfill; | |
| 1603 #endif | |
| 1604 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1605 { | |
| 1606 /* | |
| 1607 * Try to insert the correct number of lines. | |
| 1608 * If not the last window, delete the lines at the bottom. | |
| 1609 * win_ins_lines may fail when the terminal can't do it. | |
| 1610 */ | |
| 1611 if (i > 0) | |
| 1612 check_for_delay(FALSE); | |
| 1613 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1614 { | |
| 1615 if (wp->w_lines_valid != 0) | |
| 1616 { | |
| 1617 /* Need to update rows that are new, stop at the | |
| 1618 * first one that scrolled down. */ | |
| 1619 top_end = i; | |
| 1620 scrolled_down = TRUE; | |
| 1621 | |
| 1622 /* Move the entries that were scrolled, disable | |
| 1623 * the entries for the lines to be redrawn. */ | |
| 1624 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1625 wp->w_lines_valid = wp->w_height; | |
| 1626 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1627 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1628 while (idx >= 0) | |
| 1629 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1630 } | |
| 1631 } | |
| 1632 else | |
| 1633 mid_start = 0; /* redraw all lines */ | |
| 1634 } | |
| 1635 else | |
| 1636 mid_start = 0; /* redraw all lines */ | |
| 1637 } | |
| 1638 else | |
| 1639 mid_start = 0; /* redraw all lines */ | |
| 1640 } | |
| 1641 else | |
| 1642 { | |
| 1643 /* | |
| 1644 * New topline is at or below old topline: May scroll up. | |
| 1645 * When topline didn't change, find first entry in w_lines[] that | |
| 1646 * needs updating. | |
| 1647 */ | |
| 1648 | |
| 1649 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1650 j = -1; | |
| 1651 row = 0; | |
| 1652 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1653 { | |
| 1654 if (wp->w_lines[i].wl_valid | |
| 1655 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1656 { | |
| 1657 j = i; | |
| 1658 break; | |
| 1659 } | |
| 1660 row += wp->w_lines[i].wl_size; | |
| 1661 } | |
| 1662 if (j == -1) | |
| 1663 { | |
| 1664 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1665 * lines */ | |
| 1666 mid_start = 0; | |
| 1667 } | |
| 1668 else | |
| 1669 { | |
| 1670 /* | |
| 1671 * Try to delete the correct number of lines. | |
| 1672 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1673 */ | |
| 1674 #ifdef FEAT_DIFF | |
| 1675 /* If the topline didn't change, delete old filler lines, | |
| 1676 * otherwise delete filler lines of the new topline... */ | |
| 1677 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1678 row += wp->w_old_topfill; | |
| 1679 else | |
| 1680 row += diff_check_fill(wp, wp->w_topline); | |
| 1681 /* ... but don't delete new filler lines. */ | |
| 1682 row -= wp->w_topfill; | |
| 1683 #endif | |
| 1684 if (row > 0) | |
| 1685 { | |
| 1686 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
|
1687 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
|
1688 == OK) |
| 7 | 1689 bot_start = wp->w_height - row; |
| 1690 else | |
| 1691 mid_start = 0; /* redraw all lines */ | |
| 1692 } | |
| 1693 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1694 { | |
| 1695 /* | |
| 1696 * Skip the lines (below the deleted lines) that are still | |
| 1697 * valid and don't need redrawing. Copy their info | |
| 1698 * upwards, to compensate for the deleted lines. Set | |
| 1699 * bot_start to the first row that needs redrawing. | |
| 1700 */ | |
| 1701 bot_start = 0; | |
| 1702 idx = 0; | |
| 1703 for (;;) | |
| 1704 { | |
| 1705 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1706 /* stop at line that didn't fit, unless it is still | |
| 1707 * valid (no lines deleted) */ | |
| 1708 if (row > 0 && bot_start + row | |
| 1709 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1710 { | |
| 1711 wp->w_lines_valid = idx + 1; | |
| 1712 break; | |
| 1713 } | |
| 1714 bot_start += wp->w_lines[idx++].wl_size; | |
| 1715 | |
| 1716 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1717 if (++j >= wp->w_lines_valid) | |
| 1718 { | |
| 1719 wp->w_lines_valid = idx; | |
| 1720 break; | |
| 1721 } | |
| 1722 } | |
| 1723 #ifdef FEAT_DIFF | |
| 1724 /* Correct the first entry for filler lines at the top | |
| 1725 * when it won't get updated below. */ | |
| 1726 if (wp->w_p_diff && bot_start > 0) | |
| 1727 wp->w_lines[0].wl_size = | |
| 1728 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1729 + wp->w_topfill; | |
| 1730 #endif | |
| 1731 } | |
| 1732 } | |
| 1733 } | |
| 1734 | |
| 1735 /* When starting redraw in the first line, redraw all lines. When | |
| 1736 * there is only one window it's probably faster to clear the screen | |
| 1737 * first. */ | |
| 1738 if (mid_start == 0) | |
| 1739 { | |
| 1740 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1741 if (ONE_WINDOW) |
| 981 | 1742 { |
| 1331 | 1743 /* Clear the screen when it was not done by win_del_lines() or |
| 1744 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1745 * then. */ | |
| 1746 if (screen_cleared != TRUE) | |
| 1747 screenclear(); | |
| 981 | 1748 /* The screen was cleared, redraw the tab pages line. */ |
| 1749 if (redraw_tabline) | |
| 1750 draw_tabline(); | |
| 1751 } | |
| 7 | 1752 } |
| 1331 | 1753 |
| 1754 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1755 * cleared (only happens for the first window) or when screenclear() | |
| 1756 * was called directly above, "must_redraw" will have been set to | |
| 1757 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1758 if (screen_cleared == TRUE) | |
| 1759 must_redraw = 0; | |
| 7 | 1760 } |
| 1761 else | |
| 1762 { | |
| 1763 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1764 mid_start = 0; | |
| 1765 mid_end = wp->w_height; | |
| 1766 } | |
| 1767 | |
| 743 | 1768 if (type == SOME_VALID) |
| 1769 { | |
| 1770 /* SOME_VALID: redraw all lines. */ | |
| 1771 mid_start = 0; | |
| 1772 mid_end = wp->w_height; | |
| 1773 type = NOT_VALID; | |
| 1774 } | |
| 1775 | |
| 7 | 1776 /* check if we are updating or removing the inverted part */ |
| 1777 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1778 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1779 { | |
| 1780 linenr_T from, to; | |
| 1781 | |
| 1782 if (VIsual_active) | |
| 1783 { | |
| 1784 if (VIsual_active | |
| 1785 && (VIsual_mode != wp->w_old_visual_mode | |
| 1786 || type == INVERTED_ALL)) | |
| 1787 { | |
| 1788 /* | |
| 1789 * If the type of Visual selection changed, redraw the whole | |
| 1790 * selection. Also when the ownership of the X selection is | |
| 1791 * gained or lost. | |
| 1792 */ | |
| 1793 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1794 { | |
| 1795 from = curwin->w_cursor.lnum; | |
| 1796 to = VIsual.lnum; | |
| 1797 } | |
| 1798 else | |
| 1799 { | |
| 1800 from = VIsual.lnum; | |
| 1801 to = curwin->w_cursor.lnum; | |
| 1802 } | |
| 1803 /* redraw more when the cursor moved as well */ | |
| 1804 if (wp->w_old_cursor_lnum < from) | |
| 1805 from = wp->w_old_cursor_lnum; | |
| 1806 if (wp->w_old_cursor_lnum > to) | |
| 1807 to = wp->w_old_cursor_lnum; | |
| 1808 if (wp->w_old_visual_lnum < from) | |
| 1809 from = wp->w_old_visual_lnum; | |
| 1810 if (wp->w_old_visual_lnum > to) | |
| 1811 to = wp->w_old_visual_lnum; | |
| 1812 } | |
| 1813 else | |
| 1814 { | |
| 1815 /* | |
| 1816 * Find the line numbers that need to be updated: The lines | |
| 1817 * between the old cursor position and the current cursor | |
| 1818 * position. Also check if the Visual position changed. | |
| 1819 */ | |
| 1820 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1821 { | |
| 1822 from = curwin->w_cursor.lnum; | |
| 1823 to = wp->w_old_cursor_lnum; | |
| 1824 } | |
| 1825 else | |
| 1826 { | |
| 1827 from = wp->w_old_cursor_lnum; | |
| 1828 to = curwin->w_cursor.lnum; | |
| 1829 if (from == 0) /* Visual mode just started */ | |
| 1830 from = to; | |
| 1831 } | |
| 1832 | |
| 422 | 1833 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1834 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1835 { |
| 1836 if (wp->w_old_visual_lnum < from | |
| 1837 && wp->w_old_visual_lnum != 0) | |
| 1838 from = wp->w_old_visual_lnum; | |
| 1839 if (wp->w_old_visual_lnum > to) | |
| 1840 to = wp->w_old_visual_lnum; | |
| 1841 if (VIsual.lnum < from) | |
| 1842 from = VIsual.lnum; | |
| 1843 if (VIsual.lnum > to) | |
| 1844 to = VIsual.lnum; | |
| 1845 } | |
| 1846 } | |
| 1847 | |
| 1848 /* | |
| 1849 * If in block mode and changed column or curwin->w_curswant: | |
| 1850 * update all lines. | |
| 1851 * First compute the actual start and end column. | |
| 1852 */ | |
| 1853 if (VIsual_mode == Ctrl_V) | |
| 1854 { | |
| 6266 | 1855 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1856 #if defined(FEAT_LINEBREAK) |
| 6266 | 1857 int save_ve_flags = ve_flags; |
| 1858 | |
| 1859 if (curwin->w_p_lbr) | |
| 1860 ve_flags = VE_ALL; | |
| 1861 #endif | |
| 7 | 1862 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
|
1863 #if defined(FEAT_LINEBREAK) |
| 6266 | 1864 ve_flags = save_ve_flags; |
| 1865 #endif | |
| 7 | 1866 ++toc; |
| 1867 if (curwin->w_curswant == MAXCOL) | |
| 1868 toc = MAXCOL; | |
| 1869 | |
| 1870 if (fromc != wp->w_old_cursor_fcol | |
| 1871 || toc != wp->w_old_cursor_lcol) | |
| 1872 { | |
| 1873 if (from > VIsual.lnum) | |
| 1874 from = VIsual.lnum; | |
| 1875 if (to < VIsual.lnum) | |
| 1876 to = VIsual.lnum; | |
| 1877 } | |
| 1878 wp->w_old_cursor_fcol = fromc; | |
| 1879 wp->w_old_cursor_lcol = toc; | |
| 1880 } | |
| 1881 } | |
| 1882 else | |
| 1883 { | |
| 1884 /* Use the line numbers of the old Visual area. */ | |
| 1885 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1886 { | |
| 1887 from = wp->w_old_cursor_lnum; | |
| 1888 to = wp->w_old_visual_lnum; | |
| 1889 } | |
| 1890 else | |
| 1891 { | |
| 1892 from = wp->w_old_visual_lnum; | |
| 1893 to = wp->w_old_cursor_lnum; | |
| 1894 } | |
| 1895 } | |
| 1896 | |
| 1897 /* | |
| 1898 * There is no need to update lines above the top of the window. | |
| 1899 */ | |
| 1900 if (from < wp->w_topline) | |
| 1901 from = wp->w_topline; | |
| 1902 | |
| 1903 /* | |
| 1904 * If we know the value of w_botline, use it to restrict the update to | |
| 1905 * the lines that are visible in the window. | |
| 1906 */ | |
| 1907 if (wp->w_valid & VALID_BOTLINE) | |
| 1908 { | |
| 1909 if (from >= wp->w_botline) | |
| 1910 from = wp->w_botline - 1; | |
| 1911 if (to >= wp->w_botline) | |
| 1912 to = wp->w_botline - 1; | |
| 1913 } | |
| 1914 | |
| 1915 /* | |
| 1916 * Find the minimal part to be updated. | |
| 1917 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1918 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1919 * top_end; need to redraw from top_end to the "to" line. | |
| 1920 * A middle mouse click with a Visual selection may change the text | |
| 1921 * above the Visual area and reset wl_valid, do count these for | |
| 1922 * mid_end (in srow). | |
| 1923 */ | |
| 1924 if (mid_start > 0) | |
| 1925 { | |
| 1926 lnum = wp->w_topline; | |
| 1927 idx = 0; | |
| 1928 srow = 0; | |
| 1929 if (scrolled_down) | |
| 1930 mid_start = top_end; | |
| 1931 else | |
| 1932 mid_start = 0; | |
| 1933 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1934 { | |
| 1935 if (wp->w_lines[idx].wl_valid) | |
| 1936 mid_start += wp->w_lines[idx].wl_size; | |
| 1937 else if (!scrolled_down) | |
| 1938 srow += wp->w_lines[idx].wl_size; | |
| 1939 ++idx; | |
| 1940 # ifdef FEAT_FOLDING | |
| 1941 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1942 lnum = wp->w_lines[idx].wl_lnum; | |
| 1943 else | |
| 1944 # endif | |
| 1945 ++lnum; | |
| 1946 } | |
| 1947 srow += mid_start; | |
| 1948 mid_end = wp->w_height; | |
| 1949 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1950 { | |
| 1951 if (wp->w_lines[idx].wl_valid | |
| 1952 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1953 { | |
| 1954 /* Only update until first row of this line */ | |
| 1955 mid_end = srow; | |
| 1956 break; | |
| 1957 } | |
| 1958 srow += wp->w_lines[idx].wl_size; | |
| 1959 } | |
| 1960 } | |
| 1961 } | |
| 1962 | |
| 1963 if (VIsual_active && buf == curwin->w_buffer) | |
| 1964 { | |
| 1965 wp->w_old_visual_mode = VIsual_mode; | |
| 1966 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1967 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1968 wp->w_old_visual_col = VIsual.col; |
| 7 | 1969 wp->w_old_curswant = curwin->w_curswant; |
| 1970 } | |
| 1971 else | |
| 1972 { | |
| 1973 wp->w_old_visual_mode = 0; | |
| 1974 wp->w_old_cursor_lnum = 0; | |
| 1975 wp->w_old_visual_lnum = 0; | |
| 422 | 1976 wp->w_old_visual_col = 0; |
| 7 | 1977 } |
| 1978 | |
| 1979 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1980 /* reset got_int, otherwise regexp won't work */ | |
| 1981 save_got_int = got_int; | |
| 1982 got_int = 0; | |
| 1983 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1984 #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
|
1985 /* 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
|
1986 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
|
1987 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
|
1988 #endif |
| 7 | 1989 #ifdef FEAT_FOLDING |
| 1990 win_foldinfo.fi_level = 0; | |
| 1991 #endif | |
| 1992 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1993 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1994 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1995 * 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
|
1996 * 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
|
1997 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1998 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
|
1999 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
|
2000 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2001 |
| 7 | 2002 /* |
| 2003 * Update all the window rows. | |
| 2004 */ | |
| 2005 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 2006 row = 0; | |
| 2007 srow = 0; | |
| 2008 lnum = wp->w_topline; /* first line shown in window */ | |
| 2009 for (;;) | |
| 2010 { | |
| 2011 /* stop updating when reached the end of the window (check for _past_ | |
| 2012 * the end of the window is at the end of the loop) */ | |
| 2013 if (row == wp->w_height) | |
| 2014 { | |
| 2015 didline = TRUE; | |
| 2016 break; | |
| 2017 } | |
| 2018 | |
| 2019 /* stop updating when hit the end of the file */ | |
| 2020 if (lnum > buf->b_ml.ml_line_count) | |
| 2021 { | |
| 2022 eof = TRUE; | |
| 2023 break; | |
| 2024 } | |
| 2025 | |
| 2026 /* Remember the starting row of the line that is going to be dealt | |
| 2027 * with. It is used further down when the line doesn't fit. */ | |
| 2028 srow = row; | |
| 2029 | |
| 2030 /* | |
| 2031 * Update a line when it is in an area that needs updating, when it | |
| 2032 * 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
|
2033 * "bot_start" may be halfway a wrapped line after using |
| 7 | 2034 * win_del_lines(), check if the current line includes it. |
| 2035 * When syntax folding is being used, the saved syntax states will | |
| 2036 * already have been updated, we can't see where the syntax state is | |
| 2037 * the same again, just update until the end of the window. | |
| 2038 */ | |
| 2039 if (row < top_end | |
| 2040 || (row >= mid_start && row < mid_end) | |
| 2041 #ifdef FEAT_SEARCH_EXTRA | |
| 2042 || top_to_mod | |
| 2043 #endif | |
| 2044 || idx >= wp->w_lines_valid | |
| 2045 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 2046 || (mod_top != 0 | |
| 2047 && (lnum == mod_top | |
| 2048 || (lnum >= mod_top | |
| 2049 && (lnum < mod_bot | |
| 2050 #ifdef FEAT_SYN_HL | |
| 2051 || did_update == DID_FOLD | |
| 2052 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2053 && syntax_present(wp) |
| 7 | 2054 && ( |
| 2055 # ifdef FEAT_FOLDING | |
| 2056 (foldmethodIsSyntax(wp) | |
| 2057 && hasAnyFolding(wp)) || | |
| 2058 # endif | |
| 2059 syntax_check_changed(lnum))) | |
| 2060 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2061 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 2062 /* match in fixed position might need redraw |
| 2063 * if lines were inserted or deleted */ | |
| 2064 || (wp->w_match_head != NULL | |
| 2065 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2066 #endif |
| 7 | 2067 ))))) |
| 2068 { | |
| 2069 #ifdef FEAT_SEARCH_EXTRA | |
| 2070 if (lnum == mod_top) | |
| 2071 top_to_mod = FALSE; | |
| 2072 #endif | |
| 2073 | |
| 2074 /* | |
| 2075 * When at start of changed lines: May scroll following lines | |
| 2076 * up or down to minimize redrawing. | |
| 2077 * Don't do this when the change continues until the end. | |
| 3318 | 2078 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 2079 */ |
| 2080 if (lnum == mod_top | |
| 2081 && mod_bot != MAXLNUM | |
| 3318 | 2082 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 2083 { |
| 2084 int old_rows = 0; | |
| 2085 int new_rows = 0; | |
| 2086 int xtra_rows; | |
| 2087 linenr_T l; | |
| 2088 | |
| 2089 /* Count the old number of window rows, using w_lines[], which | |
| 2090 * should still contain the sizes for the lines as they are | |
| 2091 * currently displayed. */ | |
| 2092 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 2093 { | |
| 2094 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 2095 * lines are part of the changed area. */ | |
| 2096 if (wp->w_lines[i].wl_valid | |
| 2097 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 2098 break; | |
| 2099 old_rows += wp->w_lines[i].wl_size; | |
| 2100 #ifdef FEAT_FOLDING | |
| 2101 if (wp->w_lines[i].wl_valid | |
| 2102 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 2103 { | |
| 2104 /* Must have found the last valid entry above mod_bot. | |
| 2105 * Add following invalid entries. */ | |
| 2106 ++i; | |
| 2107 while (i < wp->w_lines_valid | |
| 2108 && !wp->w_lines[i].wl_valid) | |
| 2109 old_rows += wp->w_lines[i++].wl_size; | |
| 2110 break; | |
| 2111 } | |
| 2112 #endif | |
| 2113 } | |
| 2114 | |
| 2115 if (i >= wp->w_lines_valid) | |
| 2116 { | |
| 2117 /* We can't find a valid line below the changed lines, | |
| 2118 * need to redraw until the end of the window. | |
| 2119 * Inserting/deleting lines has no use. */ | |
| 2120 bot_start = 0; | |
| 2121 } | |
| 2122 else | |
| 2123 { | |
| 2124 /* Able to count old number of rows: Count new window | |
| 2125 * rows, and may insert/delete lines */ | |
| 2126 j = idx; | |
| 2127 for (l = lnum; l < mod_bot; ++l) | |
| 2128 { | |
| 2129 #ifdef FEAT_FOLDING | |
| 2130 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 2131 ++new_rows; | |
| 2132 else | |
| 2133 #endif | |
| 2134 #ifdef FEAT_DIFF | |
| 2135 if (l == wp->w_topline) | |
| 2136 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 2137 + wp->w_topfill; | |
| 2138 else | |
| 2139 #endif | |
| 2140 new_rows += plines_win(wp, l, TRUE); | |
| 2141 ++j; | |
| 2142 if (new_rows > wp->w_height - row - 2) | |
| 2143 { | |
| 2144 /* it's getting too much, must redraw the rest */ | |
| 2145 new_rows = 9999; | |
| 2146 break; | |
| 2147 } | |
| 2148 } | |
| 2149 xtra_rows = new_rows - old_rows; | |
| 2150 if (xtra_rows < 0) | |
| 2151 { | |
| 2152 /* May scroll text up. If there is not enough | |
| 2153 * remaining text or scrolling fails, must redraw the | |
| 2154 * rest. If scrolling works, must redraw the text | |
| 2155 * below the scrolled text. */ | |
| 2156 if (row - xtra_rows >= wp->w_height - 2) | |
| 2157 mod_bot = MAXLNUM; | |
| 2158 else | |
| 2159 { | |
| 2160 check_for_delay(FALSE); | |
| 2161 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
|
2162 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2163 mod_bot = MAXLNUM; |
| 2164 else | |
| 2165 bot_start = wp->w_height + xtra_rows; | |
| 2166 } | |
| 2167 } | |
| 2168 else if (xtra_rows > 0) | |
| 2169 { | |
| 2170 /* May scroll text down. If there is not enough | |
| 2171 * remaining text of scrolling fails, must redraw the | |
| 2172 * rest. */ | |
| 2173 if (row + xtra_rows >= wp->w_height - 2) | |
| 2174 mod_bot = MAXLNUM; | |
| 2175 else | |
| 2176 { | |
| 2177 check_for_delay(FALSE); | |
| 2178 if (win_ins_lines(wp, row + old_rows, | |
| 2179 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2180 mod_bot = MAXLNUM; | |
| 2181 else if (top_end > row + old_rows) | |
| 2182 /* Scrolled the part at the top that requires | |
| 2183 * updating down. */ | |
| 2184 top_end += xtra_rows; | |
| 2185 } | |
| 2186 } | |
| 2187 | |
| 2188 /* When not updating the rest, may need to move w_lines[] | |
| 2189 * entries. */ | |
| 2190 if (mod_bot != MAXLNUM && i != j) | |
| 2191 { | |
| 2192 if (j < i) | |
| 2193 { | |
| 2194 int x = row + new_rows; | |
| 2195 | |
| 2196 /* move entries in w_lines[] upwards */ | |
| 2197 for (;;) | |
| 2198 { | |
| 2199 /* stop at last valid entry in w_lines[] */ | |
| 2200 if (i >= wp->w_lines_valid) | |
| 2201 { | |
| 2202 wp->w_lines_valid = j; | |
| 2203 break; | |
| 2204 } | |
| 2205 wp->w_lines[j] = wp->w_lines[i]; | |
| 2206 /* stop at a line that won't fit */ | |
| 2207 if (x + (int)wp->w_lines[j].wl_size | |
| 2208 > wp->w_height) | |
| 2209 { | |
| 2210 wp->w_lines_valid = j + 1; | |
| 2211 break; | |
| 2212 } | |
| 2213 x += wp->w_lines[j++].wl_size; | |
| 2214 ++i; | |
| 2215 } | |
| 2216 if (bot_start > x) | |
| 2217 bot_start = x; | |
| 2218 } | |
| 2219 else /* j > i */ | |
| 2220 { | |
| 2221 /* move entries in w_lines[] downwards */ | |
| 2222 j -= i; | |
| 2223 wp->w_lines_valid += j; | |
| 2224 if (wp->w_lines_valid > wp->w_height) | |
| 2225 wp->w_lines_valid = wp->w_height; | |
| 2226 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2227 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2228 | |
| 2229 /* The w_lines[] entries for inserted lines are | |
| 2230 * now invalid, but wl_size may be used above. | |
| 2231 * Reset to zero. */ | |
| 2232 while (i >= idx) | |
| 2233 { | |
| 2234 wp->w_lines[i].wl_size = 0; | |
| 2235 wp->w_lines[i--].wl_valid = FALSE; | |
| 2236 } | |
| 2237 } | |
| 2238 } | |
| 2239 } | |
| 2240 } | |
| 2241 | |
| 2242 #ifdef FEAT_FOLDING | |
| 2243 /* | |
| 2244 * When lines are folded, display one line for all of them. | |
| 2245 * Otherwise, display normally (can be several display lines when | |
| 2246 * 'wrap' is on). | |
| 2247 */ | |
| 2248 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2249 if (fold_count != 0) | |
| 2250 { | |
| 2251 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2252 ++row; | |
| 2253 --fold_count; | |
| 2254 wp->w_lines[idx].wl_folded = TRUE; | |
| 2255 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2256 # ifdef FEAT_SYN_HL | |
| 2257 did_update = DID_FOLD; | |
| 2258 # endif | |
| 2259 } | |
| 2260 else | |
| 2261 #endif | |
| 2262 if (idx < wp->w_lines_valid | |
| 2263 && wp->w_lines[idx].wl_valid | |
| 2264 && wp->w_lines[idx].wl_lnum == lnum | |
| 2265 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2266 && !(dy_flags & (DY_LASTLINE | DY_TRUNCATE)) |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2267 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2268 && !bt_popup(wp->w_buffer) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2269 #endif |
| 7 | 2270 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2271 #ifdef FEAT_DIFF | |
| 2272 && diff_check_fill(wp, lnum) == 0 | |
| 2273 #endif | |
| 2274 ) | |
| 2275 { | |
| 2276 /* This line is not going to fit. Don't draw anything here, | |
| 2277 * will draw "@ " lines below. */ | |
| 2278 row = wp->w_height + 1; | |
| 2279 } | |
| 2280 else | |
| 2281 { | |
| 2282 #ifdef FEAT_SEARCH_EXTRA | |
| 2283 prepare_search_hl(wp, lnum); | |
| 2284 #endif | |
| 2285 #ifdef FEAT_SYN_HL | |
| 2286 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2287 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
|
2288 && syntax_present(wp)) |
| 7 | 2289 syntax_end_parsing(syntax_last_parsed + 1); |
| 2290 #endif | |
| 2291 | |
| 2292 /* | |
| 2293 * Display one line. | |
| 2294 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2295 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
|
2296 mod_top == 0, FALSE); |
| 7 | 2297 |
| 2298 #ifdef FEAT_FOLDING | |
| 2299 wp->w_lines[idx].wl_folded = FALSE; | |
| 2300 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2301 #endif | |
| 2302 #ifdef FEAT_SYN_HL | |
| 2303 did_update = DID_LINE; | |
| 2304 syntax_last_parsed = lnum; | |
| 2305 #endif | |
| 2306 } | |
| 2307 | |
| 2308 wp->w_lines[idx].wl_lnum = lnum; | |
| 2309 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
|
2310 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2311 /* 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
|
2312 * 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
|
2313 * 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
|
2314 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2315 { |
| 2316 /* we may need the size of that too long line later on */ | |
| 3318 | 2317 if (dollar_vcol == -1) |
| 7 | 2318 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2319 ++idx; | |
| 2320 break; | |
| 2321 } | |
| 3318 | 2322 if (dollar_vcol == -1) |
| 7 | 2323 wp->w_lines[idx].wl_size = row - srow; |
| 2324 ++idx; | |
| 2325 #ifdef FEAT_FOLDING | |
| 2326 lnum += fold_count + 1; | |
| 2327 #else | |
| 2328 ++lnum; | |
| 2329 #endif | |
| 2330 } | |
| 2331 else | |
| 2332 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2333 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
|
2334 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2335 #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
|
2336 // '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
|
2337 // 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
|
2338 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
|
2339 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
|
2340 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
|
2341 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2342 #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
|
2343 (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
|
2344 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2345 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2346 // This line does not need to be drawn, advance to the next one. |
| 7 | 2347 row += wp->w_lines[idx++].wl_size; |
| 2348 if (row > wp->w_height) /* past end of screen */ | |
| 2349 break; | |
| 2350 #ifdef FEAT_FOLDING | |
| 2351 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2352 #else | |
| 2353 ++lnum; | |
| 2354 #endif | |
| 2355 #ifdef FEAT_SYN_HL | |
| 2356 did_update = DID_NONE; | |
| 2357 #endif | |
| 2358 } | |
| 2359 | |
| 2360 if (lnum > buf->b_ml.ml_line_count) | |
| 2361 { | |
| 2362 eof = TRUE; | |
| 2363 break; | |
| 2364 } | |
| 2365 } | |
| 2366 /* | |
| 2367 * End of loop over all window lines. | |
| 2368 */ | |
| 2369 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2370 #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
|
2371 /* 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
|
2372 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
|
2373 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2374 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
|
2375 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2376 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
|
2377 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
|
2378 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
|
2379 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
|
2380 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
|
2381 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2382 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
|
2383 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2384 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
|
2385 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2386 #endif |
| 7 | 2387 |
| 2388 if (idx > wp->w_lines_valid) | |
| 2389 wp->w_lines_valid = idx; | |
| 2390 | |
| 2391 #ifdef FEAT_SYN_HL | |
| 2392 /* | |
| 2393 * Let the syntax stuff know we stop parsing here. | |
| 2394 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2395 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2396 syntax_end_parsing(syntax_last_parsed + 1); |
| 2397 #endif | |
| 2398 | |
| 2399 /* | |
| 2400 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2401 * line we were working on, then the line didn't fit. | |
| 2402 */ | |
| 2403 wp->w_empty_rows = 0; | |
| 2404 #ifdef FEAT_DIFF | |
| 2405 wp->w_filler_rows = 0; | |
| 2406 #endif | |
| 2407 if (!eof && !didline) | |
| 2408 { | |
| 2409 if (lnum == wp->w_topline) | |
| 2410 { | |
| 2411 /* | |
| 2412 * Single line that does not fit! | |
| 2413 * Don't overwrite it, it can be edited. | |
| 2414 */ | |
| 2415 wp->w_botline = lnum + 1; | |
| 2416 } | |
| 2417 #ifdef FEAT_DIFF | |
| 2418 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2419 { | |
| 2420 /* Window ends in filler lines. */ | |
| 2421 wp->w_botline = lnum; | |
| 2422 wp->w_filler_rows = wp->w_height - srow; | |
| 2423 } | |
| 2424 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2425 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2426 else if (bt_popup(wp->w_buffer)) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2427 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2428 // 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
|
2429 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2430 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2431 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2432 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
|
2433 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2434 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
|
2435 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2436 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2437 * 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
|
2438 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2439 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
|
2440 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2441 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
|
2442 (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
|
2443 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2444 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2445 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2446 } |
| 7 | 2447 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2448 { | |
| 2449 /* | |
| 2450 * Last line isn't finished: Display "@@@" at the end. | |
| 2451 */ | |
| 2452 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2453 W_WINROW(wp) + wp->w_height, | |
| 2454 (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
|
2455 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2456 set_empty_rows(wp, srow); |
| 2457 wp->w_botline = lnum; | |
| 2458 } | |
| 2459 else | |
| 2460 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2461 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2462 wp->w_botline = lnum; |
| 2463 } | |
| 2464 } | |
| 2465 else | |
| 2466 { | |
| 2467 draw_vsep_win(wp, row); | |
| 2468 if (eof) /* we hit the end of the file */ | |
| 2469 { | |
| 2470 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2471 #ifdef FEAT_DIFF | |
| 2472 j = diff_check_fill(wp, wp->w_botline); | |
| 2473 if (j > 0 && !wp->w_botfill) | |
| 2474 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2475 // Display filler lines at the end of the file. |
| 7 | 2476 if (char2cells(fill_diff) > 1) |
| 2477 i = '-'; | |
| 2478 else | |
| 2479 i = fill_diff; | |
| 2480 if (row + j > wp->w_height) | |
| 2481 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
|
2482 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2483 row += j; |
| 2484 } | |
| 2485 #endif | |
| 2486 } | |
| 3318 | 2487 else if (dollar_vcol == -1) |
| 7 | 2488 wp->w_botline = lnum; |
| 2489 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2490 // 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
|
2491 // put '~'s on rows that aren't part of the file. |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2492 win_draw_end(wp, |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2493 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2494 bt_popup(wp->w_buffer) ? ' ' : |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2495 #endif |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2496 '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2497 } |
| 2498 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2499 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2500 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2501 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2502 |
| 7 | 2503 /* Reset the type of redrawing required, the window has been updated. */ |
| 2504 wp->w_redr_type = 0; | |
| 2505 #ifdef FEAT_DIFF | |
| 2506 wp->w_old_topfill = wp->w_topfill; | |
| 2507 wp->w_old_botfill = wp->w_botfill; | |
| 2508 #endif | |
| 2509 | |
| 3318 | 2510 if (dollar_vcol == -1) |
| 7 | 2511 { |
| 2512 /* | |
| 2513 * There is a trick with w_botline. If we invalidate it on each | |
| 2514 * change that might modify it, this will cause a lot of expensive | |
| 2515 * calls to plines() in update_topline() each time. Therefore the | |
| 2516 * value of w_botline is often approximated, and this value is used to | |
| 2517 * compute the value of w_topline. If the value of w_botline was | |
| 2518 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2519 * the visible part of the text). If it's not, we need to redraw | |
| 2520 * again. Mostly this just means scrolling up a few lines, so it | |
| 2521 * doesn't look too bad. Only do this for the current window (where | |
| 2522 * changes are relevant). | |
| 2523 */ | |
| 2524 wp->w_valid |= VALID_BOTLINE; | |
| 2525 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2526 { | |
| 2527 recursive = TRUE; | |
| 2528 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2529 update_topline(); /* may invalidate w_botline again */ | |
| 2530 if (must_redraw != 0) | |
| 2531 { | |
| 2532 /* Don't update for changes in buffer again. */ | |
| 2533 i = curbuf->b_mod_set; | |
| 2534 curbuf->b_mod_set = FALSE; | |
| 2535 win_update(curwin); | |
| 2536 must_redraw = 0; | |
| 2537 curbuf->b_mod_set = i; | |
| 2538 } | |
| 2539 recursive = FALSE; | |
| 2540 } | |
| 2541 } | |
| 2542 | |
| 2543 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2544 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2545 if (!got_int) | |
| 2546 got_int = save_got_int; | |
| 2547 #endif | |
| 2548 } | |
| 2549 | |
| 2550 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2551 * 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
|
2552 * 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
|
2553 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2554 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
|
2555 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
|
2556 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
|
2557 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
|
2558 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
|
2559 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
|
2560 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
|
2561 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
|
2562 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
|
2563 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
|
2564 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2565 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
|
2566 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2567 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
|
2568 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
|
2569 #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
|
2570 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
|
2571 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2572 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
|
2573 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
|
2574 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
|
2575 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2576 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2577 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2578 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
|
2579 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
|
2580 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
|
2581 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
|
2582 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2583 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2584 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2585 * 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
|
2586 * 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
|
2587 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2588 */ |
| 2589 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2590 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2591 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2592 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2593 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
|
2594 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2595 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2596 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2597 hlf_T hl) |
| 7 | 2598 { |
| 2599 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
|
2600 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
|
2601 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
|
2602 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2603 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
|
2604 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2605 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
|
2606 { |
| 6553 | 2607 #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
|
2608 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
|
2609 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2610 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
|
2611 // 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
|
2612 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
|
2613 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
|
2614 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2615 #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
|
2616 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
|
2617 // 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
|
2618 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
|
2619 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
|
2620 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2621 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
|
2622 && 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
|
2623 // 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
|
2624 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
|
2625 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
|
2626 } |
| 7 | 2627 |
| 2628 #ifdef FEAT_RIGHTLEFT | |
| 2629 if (wp->w_p_rl) | |
| 2630 { | |
| 2631 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
|
2632 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
|
2633 c2, c2, attr); |
| 7 | 2634 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
|
2635 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
|
2636 c1, c2, attr); |
| 7 | 2637 } |
| 2638 else | |
| 2639 #endif | |
| 2640 { | |
| 2641 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
|
2642 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
|
2643 c1, c2, attr); |
| 7 | 2644 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2645 |
| 7 | 2646 set_empty_rows(wp, row); |
| 2647 } | |
| 2648 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2649 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2650 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2651 * 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
|
2652 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2653 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2654 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
|
2655 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2656 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2657 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2658 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2659 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2660 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2661 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2662 #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
|
2663 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2664 * 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
|
2665 * 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
|
2666 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2667 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2668 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
|
2669 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2670 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
|
2671 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2672 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2673 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2674 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2675 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
|
2676 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2677 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2678 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2679 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2680 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2681 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
|
2682 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
|
2683 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2684 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2685 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2686 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
|
2687 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2688 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2689 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2690 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2691 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2692 /* 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
|
2693 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
|
2694 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2695 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
|
2696 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
|
2697 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
|
2698 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2699 - (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
|
2700 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2701 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2702 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2703 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2704 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2705 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2706 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
|
2707 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
|
2708 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2709 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2710 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2711 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2712 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2713 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2714 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2715 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2716 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2717 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
|
2718 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2719 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2720 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
|
2721 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
|
2722 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2723 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2724 /* 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
|
2725 * 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
|
2726 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
|
2727 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2728 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2729 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2730 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
|
2731 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
|
2732 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2733 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2734 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2735 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
|
2736 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2737 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2738 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2739 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2740 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2741 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
|
2742 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2743 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2744 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2745 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2746 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2747 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2748 /* 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
|
2749 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
|
2750 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
|
2751 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2752 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
|
2753 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
|
2754 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2755 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2756 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2757 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2758 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
|
2759 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2760 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
|
2761 /* 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
|
2762 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
|
2763 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
|
2764 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2765 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
|
2766 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2767 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2768 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2769 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2770 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2771 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2772 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2773 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
|
2774 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2775 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
|
2776 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
|
2777 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2778 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2779 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2780 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
|
2781 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
|
2782 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2783 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2784 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
|
2785 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2786 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2787 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2788 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2789 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2790 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2791 |
| 7 | 2792 #ifdef FEAT_FOLDING |
| 2793 /* | |
| 6553 | 2794 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2795 * space is available for window "wp", minus "col". | |
| 2796 */ | |
| 2797 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2798 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2799 { |
| 2800 int fdc = wp->w_p_fdc; | |
| 2801 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
|
2802 int wwidth = wp->w_width; |
| 6553 | 2803 |
| 2804 if (fdc > wwidth - (col + wmw)) | |
| 2805 fdc = wwidth - (col + wmw); | |
| 2806 return fdc; | |
| 2807 } | |
| 2808 | |
| 2809 /* | |
| 7 | 2810 * Display one folded line. |
| 2811 */ | |
| 2812 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2813 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2814 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2815 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2816 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2817 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2818 int row) |
| 7 | 2819 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2820 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2821 pos_T *top, *bot; |
| 2822 linenr_T lnume = lnum + fold_count - 1; | |
| 2823 int len; | |
| 29 | 2824 char_u *text; |
| 7 | 2825 int fdc; |
| 2826 int col; | |
| 2827 int txtcol; | |
| 2828 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2829 int ri; |
| 7 | 2830 |
| 2831 /* Build the fold line: | |
| 2832 * 1. Add the cmdwin_type for the command-line window | |
| 2833 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2834 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2835 * 4. Compose the text |
| 2836 * 5. Add the text | |
| 2837 * 6. set highlighting for the Visual area an other text | |
| 2838 */ | |
| 2839 col = 0; | |
| 2840 | |
| 2841 /* | |
| 2842 * 1. Add the cmdwin_type for the command-line window | |
| 2843 * Ignores 'rightleft', this window is never right-left. | |
| 2844 */ | |
| 2845 #ifdef FEAT_CMDWIN | |
| 2846 if (cmdwin_type != 0 && wp == curwin) | |
| 2847 { | |
| 2848 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
|
2849 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2850 if (enc_utf8) |
| 2851 ScreenLinesUC[off] = 0; | |
| 2852 ++col; | |
| 2853 } | |
| 2854 #endif | |
| 2855 | |
| 2856 /* | |
| 2857 * 2. Add the 'foldcolumn' | |
| 6553 | 2858 * Reduce the width when there is not enough space. |
| 7 | 2859 */ |
| 6553 | 2860 fdc = compute_foldcolumn(wp, col); |
| 7 | 2861 if (fdc > 0) |
| 2862 { | |
| 2863 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2864 #ifdef FEAT_RIGHTLEFT | |
| 2865 if (wp->w_p_rl) | |
| 2866 { | |
| 2867 int i; | |
| 2868 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2869 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
|
2870 HL_ATTR(HLF_FC)); |
| 7 | 2871 /* reverse the fold column */ |
| 2872 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
|
2873 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2874 } |
| 2875 else | |
| 2876 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2877 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2878 col += fdc; |
| 2879 } | |
| 2880 | |
| 2881 #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
|
2882 # 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
|
2883 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2884 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
|
2885 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
|
2886 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
|
2887 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2888 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
|
2889 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
|
2890 } while (0) |
| 7 | 2891 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2892 # 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
|
2893 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2894 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
|
2895 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
|
2896 } while (0) |
| 7 | 2897 #endif |
| 2898 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2899 /* 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
|
2900 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2901 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2902 |
| 2903 #ifdef FEAT_SIGNS | |
| 2904 /* 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
|
2905 if (signcolumn_on(wp)) |
| 7 | 2906 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2907 len = wp->w_width - col; |
| 7 | 2908 if (len > 0) |
| 2909 { | |
| 2910 if (len > 2) | |
| 2911 len = 2; | |
| 2912 # ifdef FEAT_RIGHTLEFT | |
| 2913 if (wp->w_p_rl) | |
| 2914 /* 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
|
2915 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
|
2916 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2917 else |
| 2918 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2919 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2920 col += len; |
| 2921 } | |
| 2922 } | |
| 2923 #endif | |
| 2924 | |
| 2925 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2926 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2927 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2928 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2929 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2930 len = wp->w_width - col; |
| 7 | 2931 if (len > 0) |
| 2932 { | |
| 13 | 2933 int w = number_width(wp); |
| 5905 | 2934 long num; |
| 2935 char *fmt = "%*ld "; | |
| 13 | 2936 |
| 2937 if (len > w + 1) | |
| 2938 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2939 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2940 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
|
2941 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2942 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2943 else |
| 4065 | 2944 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2945 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2946 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
|
2947 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
|
2948 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2949 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2950 * line number */ |
| 4065 | 2951 num = lnum; |
| 2952 fmt = "%-*ld "; | |
| 2953 } | |
| 2954 } | |
| 2955 | |
| 2956 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2957 #ifdef FEAT_RIGHTLEFT |
| 2958 if (wp->w_p_rl) | |
| 2959 /* 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
|
2960 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
|
2961 HL_ATTR(HLF_FL)); |
| 7 | 2962 else |
| 2963 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2964 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2965 col += len; |
| 2966 } | |
| 2967 } | |
| 2968 | |
| 2969 /* | |
| 2970 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2971 */ | |
| 29 | 2972 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2973 |
| 2974 txtcol = col; /* remember where text starts */ | |
| 2975 | |
| 2976 /* | |
| 2977 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2978 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2979 * in columns number-col - window-width. | |
| 2980 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2981 col = text_to_screenline(wp, text, col); |
| 7 | 2982 |
| 2983 /* Fill the rest of the line with the fold filler */ | |
| 2984 #ifdef FEAT_RIGHTLEFT | |
| 2985 if (wp->w_p_rl) | |
| 2986 col -= txtcol; | |
| 2987 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2988 while (col < wp->w_width |
| 7 | 2989 #ifdef FEAT_RIGHTLEFT |
| 2990 - (wp->w_p_rl ? txtcol : 0) | |
| 2991 #endif | |
| 2992 ) | |
| 2993 { | |
| 2994 if (enc_utf8) | |
| 2995 { | |
| 2996 if (fill_fold >= 0x80) | |
| 2997 { | |
| 2998 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2999 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
|
3000 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 3001 } |
| 3002 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3003 { |
| 7 | 3004 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3005 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
3006 } |
|
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
|
3007 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
|
3008 } |
|
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
|
3009 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
|
3010 ScreenLines[off + col++] = fill_fold; |
| 7 | 3011 } |
| 3012 | |
| 3013 if (text != buf) | |
| 3014 vim_free(text); | |
| 3015 | |
| 3016 /* | |
| 3017 * 6. set highlighting for the Visual area an other text. | |
| 3018 * If all folded lines are in the Visual area, highlight the line. | |
| 3019 */ | |
| 3020 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3021 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3022 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3023 { |
| 3024 /* Visual is after curwin->w_cursor */ | |
| 3025 top = &curwin->w_cursor; | |
| 3026 bot = &VIsual; | |
| 3027 } | |
| 3028 else | |
| 3029 { | |
| 3030 /* Visual is before curwin->w_cursor */ | |
| 3031 top = &VIsual; | |
| 3032 bot = &curwin->w_cursor; | |
| 3033 } | |
| 3034 if (lnum >= top->lnum | |
| 3035 && lnume <= bot->lnum | |
| 3036 && (VIsual_mode != 'v' | |
| 3037 || ((lnum > top->lnum | |
| 3038 || (lnum == top->lnum | |
| 3039 && top->col == 0)) | |
| 3040 && (lnume < bot->lnum | |
| 3041 || (lnume == bot->lnum | |
| 3042 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 3043 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 3044 { |
| 3045 if (VIsual_mode == Ctrl_V) | |
| 3046 { | |
| 3047 /* 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
|
3048 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 3049 { |
| 3040 | 3050 if (wp->w_old_cursor_lcol != MAXCOL |
| 3051 && 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
|
3052 < (colnr_T)wp->w_width) |
| 7 | 3053 len = wp->w_old_cursor_lcol; |
| 3054 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3055 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
|
3056 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 3057 len - (int)wp->w_old_cursor_fcol); |
| 7 | 3058 } |
| 3059 } | |
| 3060 else | |
| 216 | 3061 { |
| 7 | 3062 /* 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
|
3063 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 3064 } |
| 7 | 3065 } |
| 3066 } | |
| 3067 | |
| 743 | 3068 #ifdef FEAT_SYN_HL |
| 6685 | 3069 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 3070 if (wp->w_p_cc_cols) | |
| 3071 { | |
| 3072 int i = 0; | |
| 3073 int j = wp->w_p_cc_cols[i]; | |
| 3074 int old_txtcol = txtcol; | |
| 3075 | |
| 3076 while (j > -1) | |
| 3077 { | |
| 3078 txtcol += j; | |
| 3079 if (wp->w_p_wrap) | |
| 3080 txtcol -= wp->w_skipcol; | |
| 3081 else | |
| 3082 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
|
3083 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 3084 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
|
3085 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 3086 txtcol = old_txtcol; |
| 3087 j = wp->w_p_cc_cols[++i]; | |
| 3088 } | |
| 3089 } | |
| 3090 | |
| 743 | 3091 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 3092 if (wp->w_p_cuc) |
| 3093 { | |
| 3094 txtcol += wp->w_virtcol; | |
| 3095 if (wp->w_p_wrap) | |
| 3096 txtcol -= wp->w_skipcol; | |
| 3097 else | |
| 3098 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
|
3099 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 3100 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
|
3101 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 3102 } |
| 743 | 3103 #endif |
| 7 | 3104 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3105 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
|
3106 (int)wp->w_width, 0); |
| 7 | 3107 |
| 3108 /* | |
| 3109 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 3110 * updated (saves a call to plines() later). | |
| 3111 */ | |
| 3112 if (wp == curwin | |
| 3113 && lnum <= curwin->w_cursor.lnum | |
| 3114 && lnume >= curwin->w_cursor.lnum) | |
| 3115 { | |
| 3116 curwin->w_cline_row = row; | |
| 3117 curwin->w_cline_height = 1; | |
| 3118 curwin->w_cline_folded = TRUE; | |
| 3119 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 3120 } | |
| 3121 } | |
| 3122 | |
| 3123 /* | |
| 3124 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 3125 */ | |
| 3126 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3127 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3128 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3129 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3130 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3131 int attr) |
| 7 | 3132 { |
| 216 | 3133 int i; |
| 3134 | |
| 7 | 3135 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 3136 if (enc_utf8) | |
| 3137 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 3138 for (i = 0; i < len; ++i) |
| 3139 ScreenAttrs[off + i] = attr; | |
| 7 | 3140 } |
| 3141 | |
| 3142 /* | |
| 3143 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 3144 * Only to be called when 'foldcolumn' > 0. |
| 7 | 3145 */ |
| 3146 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3147 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3148 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3149 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3150 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3151 linenr_T lnum) /* current line number */ |
| 7 | 3152 { |
| 3153 int i = 0; | |
| 3154 int level; | |
| 3155 int first_level; | |
| 519 | 3156 int empty; |
| 6553 | 3157 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 3158 |
| 3159 /* Init to all spaces. */ | |
| 6929 | 3160 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 3161 |
| 3162 level = win_foldinfo.fi_level; | |
| 3163 if (level > 0) | |
| 3164 { | |
| 519 | 3165 /* If there is only one column put more info in it. */ |
| 6553 | 3166 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3167 |
| 7 | 3168 /* If the column is too narrow, we start at the lowest level that |
| 3169 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3170 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3171 if (first_level < 1) |
| 3172 first_level = 1; | |
| 3173 | |
| 6553 | 3174 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3175 { |
| 3176 if (win_foldinfo.fi_lnum == lnum | |
| 3177 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3178 p[i] = '-'; | |
| 3179 else if (first_level == 1) | |
| 3180 p[i] = '|'; | |
| 3181 else if (first_level + i <= 9) | |
| 3182 p[i] = '0' + first_level + i; | |
| 3183 else | |
| 3184 p[i] = '>'; | |
| 3185 if (first_level + i == level) | |
| 3186 break; | |
| 3187 } | |
| 3188 } | |
| 3189 if (closed) | |
| 6553 | 3190 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3191 } |
| 3192 #endif /* FEAT_FOLDING */ | |
| 3193 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3194 #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
|
3195 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
|
3196 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
|
3197 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3198 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3199 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
|
3200 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3201 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
|
3202 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
|
3203 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
|
3204 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3205 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
|
3206 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
|
3207 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
|
3208 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
|
3209 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
|
3210 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3211 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
|
3212 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3213 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
|
3214 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3215 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
|
3216 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
|
3217 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
|
3218 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
|
3219 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
|
3220 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3221 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3222 |
| 7 | 3223 /* |
| 3224 * Display line "lnum" of window 'wp' on the screen. | |
| 3225 * Start at row "startrow", stop when "endrow" is reached. | |
| 3226 * wp->w_virtcol needs to be valid. | |
| 3227 * | |
| 3228 * Return the number of last row the line occupies. | |
| 3229 */ | |
| 3230 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3231 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3232 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3233 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3234 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3235 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
|
3236 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
|
3237 int number_only) // only update the number column |
| 7 | 3238 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3239 int col = 0; /* visual column on screen */ |
| 7 | 3240 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3241 int c = 0; /* init for GCC */ | |
| 3242 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3243 #ifdef FEAT_LINEBREAK |
| 3244 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3245 #endif | |
| 7 | 3246 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3247 char_u *line; /* current line */ | |
| 3248 char_u *ptr; /* current position in "line" */ | |
| 3249 int row; /* row in the window, excl w_winrow */ | |
| 3250 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3251 | |
| 3252 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3253 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3254 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3255 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3256 int c_extra = NUL; /* extra chars, all the same */ |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3257 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3258 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3259 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3260 displaying lcs_eol at end-of-line */ | |
| 3261 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3262 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3263 | |
| 3264 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3265 int saved_n_extra = 0; | |
| 3266 char_u *saved_p_extra = NULL; | |
| 3267 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
|
3268 int saved_c_final = 0; |
| 7 | 3269 int saved_char_attr = 0; |
| 3270 | |
| 3271 int n_attr = 0; /* chars with special attr */ | |
| 3272 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3273 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3274 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3275 | |
| 3276 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3277 | |
| 3278 int fromcol, tocol; /* start/end of inverting */ | |
| 3279 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3280 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3281 pos_T *top, *bot; | |
| 1813 | 3282 int lnum_in_visual_area = FALSE; |
| 7 | 3283 pos_T pos; |
| 3284 long v; | |
| 3285 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3286 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
|
3287 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
|
3288 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
|
3289 // 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
|
3290 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
|
3291 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3292 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
|
3293 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
|
3294 // 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
|
3295 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
|
3296 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3297 #ifdef FEAT_SYN_HL |
| 743 | 3298 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3299 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3300 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3301 int save_did_emsg; | |
| 1437 | 3302 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
|
3303 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3304 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3305 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3306 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3307 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3308 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
|
3309 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3310 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3311 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3312 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
|
3313 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
|
3314 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
|
3315 #endif |
| 743 | 3316 #ifdef FEAT_SPELL |
| 221 | 3317 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3318 # define SPWORDLEN 150 |
| 3319 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3320 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3321 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3322 starts */ |
| 221 | 3323 int spell_attr = 0; /* attributes desired by spelling */ |
| 3324 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3325 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3326 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3327 * there are no spell errors */ |
| 386 | 3328 static int cap_col = -1; /* column to check for Cap word */ |
| 3329 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3330 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3331 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3332 int extra_check = 0; // has extra highlighting |
| 7 | 3333 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3334 int mb_l = 1; /* multi-byte byte length */ | |
| 3335 int mb_c = 0; /* decoded multi-byte character */ | |
| 3336 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3337 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3338 #ifdef FEAT_DIFF |
| 3339 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3340 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3341 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3342 int change_start = MAXCOL; /* first col of changed area */ |
| 3343 int change_end = -1; /* last col of changed area */ | |
| 3344 #endif | |
| 3345 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3346 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3347 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
|
3348 chars */ |
| 7 | 3349 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3350 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3351 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3352 # define LINE_ATTR |
| 1536 | 3353 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3354 #endif |
| 3355 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3356 matchitem_T *cur; /* points to the match list */ |
| 3357 match_T *shl; /* points to search_hl or a match */ | |
| 3358 int shl_flag; /* flag to indicate whether search_hl | |
| 3359 has been processed or not */ | |
| 5979 | 3360 int pos_inprogress; /* marks that position match search is |
| 3361 in progress */ | |
| 1326 | 3362 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3363 equals startcol of search_hl or one | |
| 3364 of the matches */ | |
| 7 | 3365 #endif |
| 3366 #ifdef FEAT_ARABIC | |
| 3367 int prev_c = 0; /* previous Arabic character */ | |
| 3368 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3369 #endif | |
| 910 | 3370 #if defined(LINE_ATTR) |
| 867 | 3371 int did_line_attr = 0; |
| 3372 #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
|
3373 #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
|
3374 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3375 #endif |
| 7 | 3376 |
| 3377 /* draw_state: items that are drawn in sequence: */ | |
| 3378 #define WL_START 0 /* nothing done yet */ | |
| 3379 #ifdef FEAT_CMDWIN | |
| 3380 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3381 #else | |
| 3382 # define WL_CMDLINE WL_START | |
| 3383 #endif | |
| 3384 #ifdef FEAT_FOLDING | |
| 3385 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3386 #else | |
| 3387 # define WL_FOLD WL_CMDLINE | |
| 3388 #endif | |
| 3389 #ifdef FEAT_SIGNS | |
| 3390 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3391 #else | |
| 3392 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3393 #endif | |
| 3394 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3395 #ifdef FEAT_LINEBREAK |
| 3396 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3397 #else | |
| 3398 # define WL_BRI WL_NR | |
| 3399 #endif | |
| 7 | 3400 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3401 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3402 #else |
| 5995 | 3403 # define WL_SBR WL_BRI |
| 7 | 3404 #endif |
| 3405 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3406 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3407 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3408 int feedback_col = 0; |
| 3409 int feedback_old_attr = -1; | |
| 3410 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3411 int screen_line_flags = 0; |
| 7 | 3412 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3413 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3414 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
|
3415 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
|
3416 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
|
3417 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
|
3418 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3419 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
|
3420 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3421 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
|
3422 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3423 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3424 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3425 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3426 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3427 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3428 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3429 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3430 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3431 col -= boguscols; \ |
| 6520 | 3432 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3433 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3434 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3435 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3436 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3437 #endif |
| 7 | 3438 |
| 3439 if (startrow > endrow) /* past the end already! */ | |
| 3440 return startrow; | |
| 3441 | |
| 3442 row = startrow; | |
| 3443 screen_row = row + W_WINROW(wp); | |
| 3444 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3445 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
|
3446 { |
|
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 * 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
|
3449 * 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
|
3450 */ |
| 7 | 3451 #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
|
3452 extra_check = wp->w_p_lbr; |
| 7 | 3453 #endif |
| 3454 #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
|
3455 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
|
3456 # 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
|
3457 && !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
|
3458 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3459 ) |
|
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 /* 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
|
3462 * 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
|
3463 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
|
3464 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
|
3465 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
|
3466 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
|
3467 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
|
3468 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3469 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3470 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
|
3471 #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
|
3472 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
|
3473 #endif |
|
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 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
|
3476 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
|
3477 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3478 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3479 } |
|
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 /* 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
|
3482 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
|
3483 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
|
3484 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3485 #endif |
| 3486 | |
|
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
|
3487 #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
|
3488 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
|
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 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
|
3491 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3492 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
|
3493 } |
|
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
|
3494 #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
|
3495 |
| 743 | 3496 #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
|
3497 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
|
3498 && *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
|
3499 && 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
|
3500 && *(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
|
3501 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3502 /* 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
|
3503 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
|
3504 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
|
3505 |
|
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
|
3506 /* 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
|
3507 * 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
|
3508 * 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
|
3509 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
|
3510 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
|
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 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
|
3513 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
|
3514 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3515 |
|
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
|
3516 /* 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
|
3517 * 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
|
3518 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
|
3519 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
|
3520 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
|
3521 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3522 /* 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
|
3523 * 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
|
3524 * 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
|
3525 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
|
3526 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
|
3527 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
|
3528 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
|
3529 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
|
3530 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3531 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3532 |
|
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 * 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
|
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 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
|
3537 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
|
3538 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
|
3539 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3540 /* 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
|
3541 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
|
3542 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3543 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
|
3544 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
|
3545 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3546 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
|
3547 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3548 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
|
3549 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
|
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 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
|
3552 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
|
3553 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3554 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
|
3555 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3556 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
|
3557 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
|
3558 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3559 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3560 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
|
3561 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3562 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3563 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
|
3564 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
|
3565 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3566 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
|
3567 fromcol = 0; |
| 7 | 3568 else |
| 3569 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3570 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
|
3571 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
|
3572 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
|
3573 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3574 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3575 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
|
3576 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3577 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
|
3578 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3579 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
|
3580 tocol = MAXCOL; |
| 7 | 3581 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3582 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
|
3583 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
|
3584 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3585 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3586 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
|
3587 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
|
3588 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
|
3589 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3590 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3591 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
|
3592 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3593 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3594 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3595 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3596 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3597 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3598 /* 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
|
3599 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
|
3600 #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
|
3601 && !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
|
3602 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3603 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3604 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
|
3605 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3606 /* 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
|
3607 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
|
3608 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3609 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3610 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3611 #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
|
3612 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
|
3613 && 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
|
3614 || (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
|
3615 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3616 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
|
3617 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3618 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3619 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3620 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3621 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3622 * 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
|
3623 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3624 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
|
3625 && 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
|
3626 && 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
|
3627 && 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
|
3628 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3629 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
|
3630 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
|
3631 (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
|
3632 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3633 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
|
3634 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
|
3635 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3636 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
|
3637 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
|
3638 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
|
3639 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3640 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3641 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
|
3642 /* 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
|
3643 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
|
3644 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
|
3645 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3646 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
|
3647 } |
| 7 | 3648 } |
| 3649 | |
| 3650 #ifdef FEAT_DIFF | |
| 3651 filler_lines = diff_check(wp, lnum); | |
| 3652 if (filler_lines < 0) | |
| 3653 { | |
| 3654 if (filler_lines == -1) | |
| 3655 { | |
| 3656 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3657 diff_hlf = HLF_ADD; /* added line */ | |
| 3658 else if (change_start == 0) | |
| 3659 diff_hlf = HLF_TXD; /* changed text */ | |
| 3660 else | |
| 3661 diff_hlf = HLF_CHD; /* changed line */ | |
| 3662 } | |
| 3663 else | |
| 3664 diff_hlf = HLF_ADD; /* added line */ | |
| 3665 filler_lines = 0; | |
| 3666 area_highlighting = TRUE; | |
| 3667 } | |
| 3668 if (lnum == wp->w_topline) | |
| 3669 filler_lines = wp->w_topfill; | |
| 3670 filler_todo = filler_lines; | |
| 3671 #endif | |
| 3672 | |
| 3673 #ifdef LINE_ATTR | |
| 3674 # ifdef FEAT_SIGNS | |
| 3675 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3676 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3677 if (v != 0) | |
| 3678 line_attr = sign_get_attr((int)v, TRUE); | |
| 3679 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3680 # if defined(FEAT_QUICKFIX) |
| 7 | 3681 /* Highlight the current line in the quickfix window. */ |
| 644 | 3682 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
|
3683 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3684 # endif |
| 3685 if (line_attr != 0) | |
| 3686 area_highlighting = TRUE; | |
| 3687 #endif | |
| 3688 | |
| 3689 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3690 ptr = line; | |
| 3691 | |
| 743 | 3692 #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
|
3693 if (has_spell && !number_only) |
| 348 | 3694 { |
| 386 | 3695 /* For checking first word with a capital skip white space. */ |
| 3696 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
|
3697 cap_col = getwhitecols(line); |
| 386 | 3698 |
| 348 | 3699 /* To be able to spell-check over line boundaries copy the end of the |
| 3700 * current line into nextline[]. Above the start of the next line was | |
| 3701 * copied to nextline[SPWORDLEN]. */ | |
| 3702 if (nextline[SPWORDLEN] == NUL) | |
| 3703 { | |
| 3704 /* No next line or it is empty. */ | |
| 3705 nextlinecol = MAXCOL; | |
| 3706 nextline_idx = 0; | |
| 3707 } | |
| 3708 else | |
| 3709 { | |
| 835 | 3710 v = (long)STRLEN(line); |
| 348 | 3711 if (v < SPWORDLEN) |
| 3712 { | |
| 3713 /* Short line, use it completely and append the start of the | |
| 3714 * next line. */ | |
| 3715 nextlinecol = 0; | |
| 3716 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3717 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3718 nextline_idx = v + 1; |
| 3719 } | |
| 3720 else | |
| 3721 { | |
| 3722 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3723 nextlinecol = v - SPWORDLEN; | |
| 3724 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3725 nextline_idx = SPWORDLEN + 1; | |
| 3726 } | |
| 3727 } | |
| 3728 } | |
| 3729 #endif | |
| 3730 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3731 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3732 { |
|
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
|
3733 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
|
3734 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3735 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3736 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3737 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3738 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
|
3739 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
|
3740 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3741 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3742 } |
| 7 | 3743 } |
| 3744 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3745 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
|
3746 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3747 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3748 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3749 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3750 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3751 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3752 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3753 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3754 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3755 |
| 7 | 3756 /* |
| 3757 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3758 * first character to be displayed. | |
| 3759 */ | |
| 3760 if (wp->w_p_wrap) | |
| 3761 v = wp->w_skipcol; | |
| 3762 else | |
| 3763 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
|
3764 if (v > 0 && !number_only) |
| 7 | 3765 { |
| 3766 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3767 |
| 7 | 3768 while (vcol < v && *ptr != NUL) |
| 3769 { | |
| 5995 | 3770 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3771 vcol += c; |
| 3772 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3773 MB_PTR_ADV(ptr); |
| 7 | 3774 } |
| 3775 | |
| 1984 | 3776 /* When: |
| 3777 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3778 * - 'colorcolumn' is set, or |
| 1984 | 3779 * - 'virtualedit' is set, or |
| 3780 * - the visual mode is active, | |
| 3781 * the end of the line may be before the start of the displayed part. | |
| 3782 */ | |
| 3783 if (vcol < v && ( | |
| 5735 | 3784 #ifdef FEAT_SYN_HL |
| 3785 wp->w_p_cuc || draw_color_col || | |
| 3786 #endif | |
| 3787 virtual_active() || | |
| 3788 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3789 vcol = v; |
| 3790 | |
| 3791 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3792 * that character but skip the first few screen characters. */ | |
| 3793 if (vcol > v) | |
| 3794 { | |
| 3795 vcol -= c; | |
| 3796 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
|
3797 /* 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
|
3798 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3799 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
|
3800 n_skip = v - vcol; |
| 7 | 3801 } |
| 3802 | |
| 3803 /* | |
| 3804 * Adjust for when the inverted text is before the screen, | |
| 3805 * and when the start of the inverted text is before the screen. | |
| 3806 */ | |
| 3807 if (tocol <= vcol) | |
| 3808 fromcol = 0; | |
| 3809 else if (fromcol >= 0 && fromcol < vcol) | |
| 3810 fromcol = vcol; | |
| 3811 | |
| 3812 #ifdef FEAT_LINEBREAK | |
| 3813 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3814 if (wp->w_p_wrap) | |
| 3815 need_showbreak = TRUE; | |
| 3816 #endif | |
| 743 | 3817 #ifdef FEAT_SPELL |
| 499 | 3818 /* When spell checking a word we need to figure out the start of the |
| 3819 * word and if it's badly spelled or not. */ | |
| 3820 if (has_spell) | |
| 3821 { | |
| 3822 int len; | |
| 1536 | 3823 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3824 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3825 |
| 3826 pos = wp->w_cursor; | |
| 3827 wp->w_cursor.lnum = lnum; | |
| 1536 | 3828 wp->w_cursor.col = linecol; |
| 534 | 3829 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3830 |
| 3831 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3832 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3833 ptr = line + linecol; | |
| 3834 | |
| 530 | 3835 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3836 { |
| 3837 /* no bad word found at line start, don't check until end of a | |
| 3838 * word */ | |
| 534 | 3839 spell_hlf = HLF_COUNT; |
| 3572 | 3840 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3841 } |
| 3842 else | |
| 534 | 3843 { |
| 499 | 3844 /* bad word found, use attributes until end of word */ |
| 3845 word_end = wp->w_cursor.col + len + 1; | |
| 3846 | |
| 534 | 3847 /* Turn index into actual attributes. */ |
| 3848 if (spell_hlf != HLF_COUNT) | |
| 3849 spell_attr = highlight_attr[spell_hlf]; | |
| 3850 } | |
| 499 | 3851 wp->w_cursor = pos; |
| 501 | 3852 |
| 743 | 3853 # ifdef FEAT_SYN_HL |
| 501 | 3854 /* Need to restart syntax highlighting for this line. */ |
| 3855 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3856 syntax_start(wp, lnum); |
| 743 | 3857 # endif |
| 499 | 3858 } |
| 3859 #endif | |
| 7 | 3860 } |
| 3861 | |
| 3862 /* | |
| 3863 * Correct highlighting for cursor that can't be disabled. | |
| 3864 * Avoids having to check this for each character. | |
| 3865 */ | |
| 3866 if (fromcol >= 0) | |
| 3867 { | |
| 3868 if (noinvcur) | |
| 3869 { | |
| 3870 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3871 { | |
| 3872 /* highlighting starts at cursor, let it start just after the | |
| 3873 * cursor */ | |
| 3874 fromcol_prev = fromcol; | |
| 3875 fromcol = -1; | |
| 3876 } | |
| 3877 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3878 /* restart highlighting after the cursor */ | |
| 3879 fromcol_prev = wp->w_virtcol; | |
| 3880 } | |
| 3881 if (fromcol >= tocol) | |
| 3882 fromcol = -1; | |
| 3883 } | |
| 3884 | |
| 3885 #ifdef FEAT_SEARCH_EXTRA | |
| 3886 /* | |
| 1326 | 3887 * Handle highlighting the last used search pattern and matches. |
| 3888 * Do this for both search_hl and the match list. | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3889 * Not in a popup window. |
| 7 | 3890 */ |
| 1326 | 3891 cur = wp->w_match_head; |
| 3892 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3893 while ((cur != NULL || shl_flag == FALSE) && !number_only |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3894 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3895 { |
| 3896 if (shl_flag == FALSE) | |
| 3897 { | |
| 3898 shl = &search_hl; | |
| 3899 shl_flag = TRUE; | |
| 3900 } | |
| 3901 else | |
| 3902 shl = &cur->hl; | |
| 36 | 3903 shl->startcol = MAXCOL; |
| 3904 shl->endcol = MAXCOL; | |
| 7 | 3905 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3906 shl->is_addpos = FALSE; |
| 5979 | 3907 v = (long)(ptr - line); |
| 3908 if (cur != NULL) | |
| 3909 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3910 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
|
3911 shl == &search_hl ? NULL : cur); |
| 5979 | 3912 |
| 3913 /* Need to get the line again, a multi-line regexp may have made it | |
| 3914 * invalid. */ | |
| 3915 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3916 ptr = line + v; | |
| 3917 | |
| 3918 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3919 { | |
| 3920 if (shl->lnum == lnum) | |
| 3921 shl->startcol = shl->rm.startpos[0].col; | |
| 3922 else | |
| 3923 shl->startcol = 0; | |
| 3924 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3925 - shl->rm.startpos[0].lnum) | |
| 3926 shl->endcol = shl->rm.endpos[0].col; | |
| 3927 else | |
| 3928 shl->endcol = MAXCOL; | |
| 3929 /* Highlight one character for an empty match. */ | |
| 3930 if (shl->startcol == shl->endcol) | |
| 3931 { | |
| 3932 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3933 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3934 else |
| 5979 | 3935 ++shl->endcol; |
| 3936 } | |
| 3937 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3938 { | |
| 3939 shl->attr_cur = shl->attr; | |
| 3940 search_attr = shl->attr; | |
| 3941 } | |
| 3942 area_highlighting = TRUE; | |
| 7 | 3943 } |
| 1326 | 3944 if (shl != &search_hl && cur != NULL) |
| 3945 cur = cur->next; | |
| 7 | 3946 } |
| 3947 #endif | |
| 3948 | |
| 743 | 3949 #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
|
3950 // 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
|
3951 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
|
3952 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3953 // 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
|
3954 // 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
|
3955 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
|
3956 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3957 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
|
3958 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3959 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3960 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3961 } |
| 3962 #endif | |
| 3963 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3964 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3965 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3966 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3967 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3968 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
|
3969 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3970 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3971 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3972 // 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
|
3973 // 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
|
3974 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
|
3975 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3976 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
|
3977 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
|
3978 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3979 // 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
|
3980 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
|
3981 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3982 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3983 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3984 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3985 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3986 |
| 504 | 3987 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3988 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3989 |
| 7 | 3990 #ifdef FEAT_RIGHTLEFT |
| 3991 if (wp->w_p_rl) | |
| 3992 { | |
| 3993 /* Rightleft window: process the text in the normal direction, but put | |
| 3994 * it in current_ScreenLine[] from right to left. Start at the | |
| 3995 * 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
|
3996 col = wp->w_width - 1; |
| 7 | 3997 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3998 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3999 } |
| 4000 #endif | |
| 4001 | |
| 4002 /* | |
| 4003 * Repeat for the whole displayed line. | |
| 4004 */ | |
| 4005 for (;;) | |
| 4006 { | |
| 6947 | 4007 #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
|
4008 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
|
4009 int did_decrement_ptr = FALSE; |
| 6947 | 4010 #endif |
| 7 | 4011 /* Skip this quickly when working on the text. */ |
| 4012 if (draw_state != WL_LINE) | |
| 4013 { | |
| 4014 #ifdef FEAT_CMDWIN | |
| 4015 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 4016 { | |
| 4017 draw_state = WL_CMDLINE; | |
| 4018 if (cmdwin_type != 0 && wp == curwin) | |
| 4019 { | |
| 4020 /* Draw the cmdline character. */ | |
| 4021 n_extra = 1; | |
| 1340 | 4022 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
|
4023 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
|
4024 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 4025 } |
| 4026 } | |
| 4027 #endif | |
| 4028 | |
| 4029 #ifdef FEAT_FOLDING | |
| 4030 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 4031 { | |
| 6553 | 4032 int fdc = compute_foldcolumn(wp, 0); |
| 4033 | |
| 7 | 4034 draw_state = WL_FOLD; |
| 6553 | 4035 if (fdc > 0) |
| 7 | 4036 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4037 /* 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
|
4038 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4039 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4040 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4041 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4042 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4043 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4044 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
|
4045 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4046 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4047 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4048 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
|
4049 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
|
4050 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
|
4051 } |
| 7 | 4052 } |
| 4053 } | |
| 4054 #endif | |
| 4055 | |
| 4056 #ifdef FEAT_SIGNS | |
| 4057 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 4058 { | |
| 4059 draw_state = WL_SIGN; | |
| 4060 /* Show the sign column when there are any signs in this | |
| 4061 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
4062 if (signcolumn_on(wp)) |
| 7 | 4063 { |
| 2661 | 4064 int text_sign; |
| 7 | 4065 # ifdef FEAT_SIGN_ICONS |
| 2661 | 4066 int icon_sign; |
| 7 | 4067 # endif |
| 4068 | |
| 4069 /* Draw two cells with the sign value or blank. */ | |
| 4070 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4071 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
|
4072 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 4073 n_extra = 2; |
| 4074 | |
| 5921 | 4075 if (row == startrow |
| 4076 #ifdef FEAT_DIFF | |
| 4077 + filler_lines && filler_todo <= 0 | |
| 4078 #endif | |
| 4079 ) | |
| 7 | 4080 { |
| 4081 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4082 SIGN_TEXT); | |
| 4083 # ifdef FEAT_SIGN_ICONS | |
| 4084 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4085 SIGN_ICON); | |
| 4086 if (gui.in_use && icon_sign != 0) | |
| 4087 { | |
| 4088 /* Use the image in this position. */ | |
| 4089 c_extra = SIGN_BYTE; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4090 c_final = NUL; |
| 7 | 4091 # ifdef FEAT_NETBEANS_INTG |
| 4092 if (buf_signcount(wp->w_buffer, lnum) > 1) | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4093 { |
| 7 | 4094 c_extra = MULTISIGN_BYTE; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4095 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4096 } |
| 7 | 4097 # endif |
| 4098 char_attr = icon_sign; | |
| 4099 } | |
| 4100 else | |
| 4101 # endif | |
| 4102 if (text_sign != 0) | |
| 4103 { | |
| 4104 p_extra = sign_get_text(text_sign); | |
| 4105 if (p_extra != NULL) | |
| 4106 { | |
| 4107 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
|
4108 c_final = NUL; |
| 835 | 4109 n_extra = (int)STRLEN(p_extra); |
| 7 | 4110 } |
| 4111 char_attr = sign_get_attr(text_sign, FALSE); | |
| 4112 } | |
| 4113 } | |
| 4114 } | |
| 4115 } | |
| 4116 #endif | |
| 4117 | |
| 4118 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 4119 { | |
| 4120 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4121 /* 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
|
4122 * 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
|
4123 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 4124 && (row == startrow |
| 4125 #ifdef FEAT_DIFF | |
| 4126 + filler_lines | |
| 4127 #endif | |
| 4128 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 4129 { | |
| 4130 /* Draw the line number (empty space after wrapping). */ | |
| 4131 if (row == startrow | |
| 4132 #ifdef FEAT_DIFF | |
| 4133 + filler_lines | |
| 4134 #endif | |
| 4135 ) | |
| 4136 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4137 long num; |
| 4065 | 4138 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4139 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4140 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
|
4141 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4142 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4143 else |
| 4065 | 4144 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4145 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 4146 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
|
4147 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 4148 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4149 /* 'number' + 'relativenumber' */ |
| 4065 | 4150 num = lnum; |
| 4151 fmt = "%-*ld "; | |
| 4152 } | |
| 4153 } | |
| 4154 | |
| 4155 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4156 number_width(wp), num); |
| 7 | 4157 if (wp->w_skipcol > 0) |
| 4158 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 4159 *p_extra = '-'; | |
| 4160 #ifdef FEAT_RIGHTLEFT | |
| 4161 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
|
4162 { |
|
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
|
4163 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
|
4164 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
|
4165 |
|
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
|
4166 // 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
|
4167 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
|
4168 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
|
4169 { |
|
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
|
4170 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
|
4171 *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
|
4172 *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
|
4173 } |
|
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
|
4174 } |
| 7 | 4175 #endif |
| 4176 p_extra = extra; | |
| 4177 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
|
4178 c_final = NUL; |
| 7 | 4179 } |
| 4180 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4181 { |
| 7 | 4182 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4183 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4184 } |
| 13 | 4185 n_extra = 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
|
4186 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4187 #ifdef FEAT_SYN_HL |
| 4188 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4189 * the current line differently. |
| 4190 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4191 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4192 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4193 && 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
|
4194 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4195 #endif |
| 7 | 4196 } |
| 4197 } | |
| 4198 | |
| 5995 | 4199 #ifdef FEAT_LINEBREAK |
| 4200 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4201 && n_extra == 0 && *p_sbr != NUL) | |
| 4202 /* draw indent after showbreak value */ | |
| 4203 draw_state = WL_BRI; | |
| 4204 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4205 /* After the showbreak, draw the breakindent */ | |
| 4206 draw_state = WL_BRI - 1; | |
| 4207 | |
| 4208 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4209 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4210 { | |
| 4211 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4212 /* 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
|
4213 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
|
4214 && (row != startrow || need_showbreak) |
| 5995 | 4215 # ifdef FEAT_DIFF |
| 4216 && filler_lines == 0 | |
| 6834 | 4217 # endif |
| 5995 | 4218 ) |
| 4219 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4220 char_attr = 0; |
| 6834 | 4221 # ifdef FEAT_DIFF |
| 5995 | 4222 if (diff_hlf != (hlf_T)0) |
| 6106 | 4223 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4224 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4225 # ifdef FEAT_SYN_HL |
| 6106 | 4226 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4227 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
|
4228 HL_ATTR(HLF_CUL)); |
| 6834 | 4229 # endif |
| 6106 | 4230 } |
| 6834 | 4231 # endif |
| 6028 | 4232 p_extra = NULL; |
| 5995 | 4233 c_extra = ' '; |
| 4234 n_extra = get_breakindent_win(wp, | |
| 4235 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4236 /* Correct end of highlighted area for 'breakindent', | |
| 4237 * required when 'linebreak' is also set. */ | |
| 4238 if (tocol == vcol) | |
| 4239 tocol += n_extra; | |
| 4240 } | |
| 4241 } | |
| 4242 #endif | |
| 4243 | |
| 7 | 4244 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4245 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4246 { | |
| 4247 draw_state = WL_SBR; | |
| 4248 # ifdef FEAT_DIFF | |
| 4249 if (filler_todo > 0) | |
| 4250 { | |
| 4251 /* Draw "deleted" diff line(s). */ | |
| 4252 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
|
4253 { |
| 7 | 4254 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4255 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4256 } |
| 7 | 4257 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4258 { |
| 7 | 4259 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
|
4260 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4261 } |
| 7 | 4262 # ifdef FEAT_RIGHTLEFT |
| 4263 if (wp->w_p_rl) | |
| 4264 n_extra = col + 1; | |
| 4265 else | |
| 4266 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4267 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
|
4268 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4269 } |
| 4270 # endif | |
| 4271 # ifdef FEAT_LINEBREAK | |
| 4272 if (*p_sbr != NUL && need_showbreak) | |
| 4273 { | |
| 4274 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4275 p_extra = p_sbr; | |
| 4276 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
|
4277 c_final = NUL; |
| 7 | 4278 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
|
4279 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4280 need_showbreak = FALSE; |
| 6503 | 4281 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4282 /* Correct end of highlighted area for 'showbreak', |
| 4283 * required when 'linebreak' is also set. */ | |
| 4284 if (tocol == vcol) | |
| 4285 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4286 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4287 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4288 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4289 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
|
4290 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4291 #endif |
| 7 | 4292 } |
| 4293 # endif | |
| 4294 } | |
| 4295 #endif | |
| 4296 | |
| 4297 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4298 { | |
| 4299 draw_state = WL_LINE; | |
| 4300 if (saved_n_extra) | |
| 4301 { | |
| 4302 /* Continue item from end of wrapped line. */ | |
| 4303 n_extra = saved_n_extra; | |
| 4304 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
|
4305 c_final = saved_c_final; |
| 7 | 4306 p_extra = saved_p_extra; |
| 4307 char_attr = saved_char_attr; | |
| 4308 } | |
| 4309 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4310 char_attr = win_attr; |
| 7 | 4311 } |
| 4312 } | |
| 4313 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4314 // 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
|
4315 // 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
|
4316 // 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
|
4317 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4318 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4319 #ifdef FEAT_DIFF |
| 4320 && filler_todo <= 0 | |
| 4321 #endif | |
| 4322 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4323 || (number_only && draw_state > WL_NR)) |
| 7 | 4324 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4325 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
|
4326 screen_line_flags); |
| 819 | 4327 /* Pretend we have finished updating the window. Except when |
| 4328 * 'cursorcolumn' is set. */ | |
| 4329 #ifdef FEAT_SYN_HL | |
| 4330 if (wp->w_p_cuc) | |
| 4331 row = wp->w_cline_row + wp->w_cline_height; | |
| 4332 else | |
| 4333 #endif | |
| 4334 row = wp->w_height; | |
| 7 | 4335 break; |
| 4336 } | |
| 4337 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4338 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
|
4339 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4340 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4341 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4342 )) |
| 7 | 4343 { |
| 4344 /* handle Visual or match highlighting in this line */ | |
| 4345 if (vcol == fromcol | |
| 4346 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4347 && (*mb_ptr2cells)(ptr) > 1) | |
| 4348 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4349 && vcol_prev < vcol /* not at margin */ |
| 7 | 4350 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4351 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4352 else if (area_attr != 0 |
| 4353 && (vcol == tocol | |
| 4354 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4355 area_attr = 0; /* stop highlighting */ | |
| 4356 | |
| 4357 #ifdef FEAT_SEARCH_EXTRA | |
| 4358 if (!n_extra) | |
| 4359 { | |
| 4360 /* | |
| 4361 * Check for start/end of search pattern match. | |
| 4362 * After end, check for start/end of next match. | |
| 4363 * When another match, have to check for start again. | |
| 4364 * Watch out for matching an empty string! | |
| 1326 | 4365 * Do this for 'search_hl' and the match list (ordered by |
| 4366 * priority). | |
| 7 | 4367 */ |
| 36 | 4368 v = (long)(ptr - line); |
| 1326 | 4369 cur = wp->w_match_head; |
| 4370 shl_flag = FALSE; | |
| 4371 while (cur != NULL || shl_flag == FALSE) | |
| 4372 { | |
| 4373 if (shl_flag == FALSE | |
| 4374 && ((cur != NULL | |
| 4375 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4376 || cur == NULL)) | |
| 4377 { | |
| 4378 shl = &search_hl; | |
| 4379 shl_flag = TRUE; | |
| 4380 } | |
| 4381 else | |
| 4382 shl = &cur->hl; | |
| 5979 | 4383 if (cur != NULL) |
| 4384 cur->pos.cur = 0; | |
| 4385 pos_inprogress = TRUE; | |
| 4386 while (shl->rm.regprog != NULL | |
| 4387 || (cur != NULL && pos_inprogress)) | |
| 7 | 4388 { |
| 36 | 4389 if (shl->startcol != MAXCOL |
| 4390 && v >= (long)shl->startcol | |
| 4391 && v < (long)shl->endcol) | |
| 7 | 4392 { |
| 6430 | 4393 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4394 | |
| 4395 if (shl->endcol < tmp_col) | |
| 4396 shl->endcol = tmp_col; | |
| 7 | 4397 shl->attr_cur = shl->attr; |
| 6947 | 4398 #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
|
4399 // 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
|
4400 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4401 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
|
4402 && 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
|
4403 && 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
|
4404 == cur->hlg_id) |
| 6947 | 4405 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4406 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4407 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4408 match_conc = cur->conceal_char; |
| 4409 } | |
| 4410 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4411 has_match_conc = match_conc = 0; |
| 6947 | 4412 #endif |
| 7 | 4413 } |
| 6430 | 4414 else if (v == (long)shl->endcol) |
| 7 | 4415 { |
| 4416 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4417 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
|
4418 shl == &search_hl ? NULL : cur); |
| 5979 | 4419 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4420 ? FALSE : TRUE; |
| 7 | 4421 |
| 4422 /* Need to get the line again, a multi-line regexp | |
| 4423 * may have made it invalid. */ | |
| 4424 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4425 ptr = line + v; | |
| 4426 | |
| 4427 if (shl->lnum == lnum) | |
| 4428 { | |
| 36 | 4429 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4430 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4431 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4432 else |
| 36 | 4433 shl->endcol = MAXCOL; |
| 4434 | |
| 4435 if (shl->startcol == shl->endcol) | |
| 7 | 4436 { |
| 4437 /* highlight empty match, try again after | |
| 4438 * it */ | |
| 4439 if (has_mbyte) | |
| 474 | 4440 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4441 + shl->endcol); |
| 7 | 4442 else |
| 36 | 4443 ++shl->endcol; |
| 7 | 4444 } |
| 4445 | |
| 4446 /* Loop to check if the match starts at the | |
| 4447 * current position */ | |
| 4448 continue; | |
| 4449 } | |
| 4450 } | |
| 4451 break; | |
| 4452 } | |
| 1326 | 4453 if (shl != &search_hl && cur != NULL) |
| 4454 cur = cur->next; | |
| 4455 } | |
| 4456 | |
| 4457 /* Use attributes from match with highest priority among | |
| 4458 * 'search_hl' and the match list. */ | |
| 4459 search_attr = search_hl.attr_cur; | |
| 4460 cur = wp->w_match_head; | |
| 4461 shl_flag = FALSE; | |
| 4462 while (cur != NULL || shl_flag == FALSE) | |
| 4463 { | |
| 4464 if (shl_flag == FALSE | |
| 4465 && ((cur != NULL | |
| 4466 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4467 || cur == NULL)) | |
| 699 | 4468 { |
| 1326 | 4469 shl = &search_hl; |
| 4470 shl_flag = TRUE; | |
| 699 | 4471 } |
| 1326 | 4472 else |
| 4473 shl = &cur->hl; | |
| 4474 if (shl->attr_cur != 0) | |
| 4475 search_attr = shl->attr_cur; | |
| 4476 if (shl != &search_hl && cur != NULL) | |
| 4477 cur = cur->next; | |
| 4478 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4479 /* 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
|
4480 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
|
4481 || (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
|
4482 search_attr = 0; |
| 7 | 4483 } |
| 4484 #endif | |
| 4485 | |
| 4486 #ifdef FEAT_DIFF | |
| 674 | 4487 if (diff_hlf != (hlf_T)0) |
| 7 | 4488 { |
| 1295 | 4489 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4490 && n_extra == 0) | |
| 7 | 4491 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4492 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4493 && n_extra == 0) | |
| 7 | 4494 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
|
4495 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4496 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
|
4497 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4498 } |
| 4499 #endif | |
| 4500 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4501 #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
|
4502 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
|
4503 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4504 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4505 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
|
4506 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4507 // 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
|
4508 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
|
4509 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4510 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
|
4511 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4512 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
|
4513 + 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
|
4514 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4515 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
|
4516 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
|
4517 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
|
4518 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4519 * (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
|
4520 --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
|
4521 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4522 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4523 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4524 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4525 // 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
|
4526 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
|
4527 && 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
|
4528 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
|
4529 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4530 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
|
4531 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
|
4532 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
|
4533 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4534 // 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
|
4535 // 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
|
4536 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
|
4537 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
|
4538 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
|
4539 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
|
4540 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4541 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
|
4542 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4543 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
|
4544 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
|
4545 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
|
4546 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4547 if (pt != NULL) |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4548 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4549 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
|
4550 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4551 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
|
4552 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4553 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
|
4554 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
|
4555 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4556 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4557 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4558 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4559 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4560 |
| 674 | 4561 /* Decide which of the highlight attributes to use. */ |
| 4562 attr_pri = TRUE; | |
| 6717 | 4563 #ifdef LINE_ATTR |
| 674 | 4564 if (area_attr != 0) |
| 6717 | 4565 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4566 else if (search_attr != 0) |
| 6717 | 4567 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
|
4568 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4569 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
|
4570 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4571 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
|
4572 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
|
4573 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4574 # endif |
| 674 | 4575 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4576 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4577 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4578 // 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
|
4579 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4580 char_attr = line_attr; |
| 6717 | 4581 #else |
| 4582 if (area_attr != 0) | |
| 4583 char_attr = area_attr; | |
| 4584 else if (search_attr != 0) | |
| 4585 char_attr = search_attr; | |
| 674 | 4586 #endif |
| 4587 else | |
| 4588 { | |
| 4589 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4590 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4591 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
|
4592 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4593 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
|
4594 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
|
4595 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
|
4596 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4597 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
|
4598 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
|
4599 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4600 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4601 #endif |
| 674 | 4602 #ifdef FEAT_SYN_HL |
| 4603 if (has_syntax) | |
| 4604 char_attr = syntax_attr; | |
| 4605 else | |
| 4606 #endif | |
| 4607 char_attr = 0; | |
| 4608 } | |
| 7 | 4609 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4610 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4611 char_attr = win_attr; |
| 7 | 4612 |
| 4613 /* | |
| 4614 * Get the next character to put on the screen. | |
| 4615 */ | |
| 4616 /* | |
| 1340 | 4617 * The "p_extra" points to the extra stuff that is inserted to |
| 4618 * represent special characters (non-printable stuff) and other | |
| 4619 * 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
|
4620 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4621 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4622 * "p_extra[n_extra]". | |
| 7 | 4623 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4624 */ | |
| 4625 if (n_extra > 0) | |
| 4626 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4627 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
|
4628 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4629 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4630 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
|
4631 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4632 { |
| 4633 mb_utf8 = TRUE; | |
| 714 | 4634 u8cc[0] = 0; |
| 819 | 4635 c = 0xc0; |
| 7 | 4636 } |
| 4637 else | |
| 4638 mb_utf8 = FALSE; | |
| 4639 } | |
| 4640 else | |
| 4641 { | |
| 4642 c = *p_extra; | |
| 4643 if (has_mbyte) | |
| 4644 { | |
| 4645 mb_c = c; | |
| 4646 if (enc_utf8) | |
| 4647 { | |
| 4648 /* If the UTF-8 character is more than one byte: | |
| 4649 * 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
|
4650 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4651 mb_utf8 = FALSE; |
| 4652 if (mb_l > n_extra) | |
| 4653 mb_l = 1; | |
| 4654 else if (mb_l > 1) | |
| 4655 { | |
| 714 | 4656 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4657 mb_utf8 = TRUE; |
| 819 | 4658 c = 0xc0; |
| 7 | 4659 } |
| 4660 } | |
| 4661 else | |
| 4662 { | |
| 4663 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4664 mb_l = MB_BYTE2LEN(c); | |
| 4665 if (mb_l >= n_extra) | |
| 4666 mb_l = 1; | |
| 4667 else if (mb_l > 1) | |
| 4668 mb_c = (c << 8) + p_extra[1]; | |
| 4669 } | |
| 504 | 4670 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4671 mb_l = 1; | |
| 4672 | |
| 7 | 4673 /* If a double-width char doesn't fit display a '>' in the |
| 4674 * last column. */ | |
| 504 | 4675 if (( |
| 7 | 4676 # ifdef FEAT_RIGHTLEFT |
| 4677 wp->w_p_rl ? (col <= 0) : | |
| 4678 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4679 (col >= wp->w_width - 1)) |
| 7 | 4680 && (*mb_char2cells)(mb_c) == 2) |
| 4681 { | |
| 4682 c = '>'; | |
| 4683 mb_c = c; | |
| 4684 mb_l = 1; | |
| 4685 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
|
4686 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4687 /* put the pointer back to output the double-width |
| 4688 * character at the start of the next line. */ | |
| 4689 ++n_extra; | |
| 4690 --p_extra; | |
| 4691 } | |
| 4692 else | |
| 4693 { | |
| 4694 n_extra -= mb_l - 1; | |
| 4695 p_extra += mb_l - 1; | |
| 4696 } | |
| 4697 } | |
| 4698 ++p_extra; | |
| 4699 } | |
| 4700 --n_extra; | |
| 4701 } | |
| 4702 else | |
| 4703 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4704 #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
|
4705 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4706 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4707 |
| 6026 | 4708 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
|
4709 VIM_CLEAR(p_extra_free); |
| 7 | 4710 /* |
| 4711 * Get a character from the line itself. | |
| 4712 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4713 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4714 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4715 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4716 #endif |
| 7 | 4717 if (has_mbyte) |
| 4718 { | |
| 4719 mb_c = c; | |
| 4720 if (enc_utf8) | |
| 4721 { | |
| 4722 /* If the UTF-8 character is more than one byte: Decode it | |
| 4723 * 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
|
4724 mb_l = utfc_ptr2len(ptr); |
| 7 | 4725 mb_utf8 = FALSE; |
| 4726 if (mb_l > 1) | |
| 4727 { | |
| 714 | 4728 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4729 /* Overlong encoded ASCII or ASCII with composing char |
| 4730 * is displayed normally, except a NUL. */ | |
| 4731 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
|
4732 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4733 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4734 #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
|
4735 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4736 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4737 } |
| 7 | 4738 mb_utf8 = TRUE; |
| 507 | 4739 |
| 4740 /* At start of the line we can have a composing char. | |
| 4741 * Draw it as a space with a composing char. */ | |
| 4742 if (utf_iscomposing(mb_c)) | |
| 4743 { | |
| 1326 | 4744 int i; |
| 4745 | |
| 714 | 4746 for (i = Screen_mco - 1; i > 0; --i) |
| 4747 u8cc[i] = u8cc[i - 1]; | |
| 4748 u8cc[0] = mb_c; | |
| 507 | 4749 mb_c = ' '; |
| 4750 } | |
| 7 | 4751 } |
| 4752 | |
| 4753 if ((mb_l == 1 && c >= 0x80) | |
| 4754 || (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
|
4755 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4756 { |
| 4757 /* | |
| 4758 * Illegal UTF-8 byte: display as <xx>. | |
| 4759 * Non-BMP character : display as ? or fullwidth ?. | |
| 4760 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4761 transchar_hex(extra, mb_c); |
| 714 | 4762 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4763 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
|
4764 rl_mirror(extra); |
| 714 | 4765 # endif |
| 7 | 4766 p_extra = extra; |
| 4767 c = *p_extra; | |
| 4768 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4769 mb_utf8 = (c >= 0x80); | |
| 4770 n_extra = (int)STRLEN(p_extra); | |
| 4771 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
|
4772 c_final = NUL; |
| 7 | 4773 if (area_attr == 0 && search_attr == 0) |
| 4774 { | |
| 4775 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
|
4776 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4777 saved_attr2 = char_attr; /* save current attr */ |
| 4778 } | |
| 4779 } | |
| 4780 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4781 mb_l = 1; | |
| 4782 #ifdef FEAT_ARABIC | |
| 4783 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4784 { | |
| 4785 /* Do Arabic shaping. */ | |
| 714 | 4786 int pc, pc1, nc; |
| 4787 int pcc[MAX_MCO]; | |
| 7 | 4788 |
| 4789 /* The idea of what is the previous and next | |
| 4790 * character depends on 'rightleft'. */ | |
| 4791 if (wp->w_p_rl) | |
| 4792 { | |
| 4793 pc = prev_c; | |
| 4794 pc1 = prev_c1; | |
| 4795 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4796 prev_c1 = u8cc[0]; |
| 7 | 4797 } |
| 4798 else | |
| 4799 { | |
| 714 | 4800 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4801 nc = prev_c; |
| 714 | 4802 pc1 = pcc[0]; |
| 7 | 4803 } |
| 4804 prev_c = mb_c; | |
| 4805 | |
| 714 | 4806 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4807 } |
| 4808 else | |
| 4809 prev_c = mb_c; | |
| 4810 #endif | |
| 4811 } | |
| 4812 else /* enc_dbcs */ | |
| 4813 { | |
| 4814 mb_l = MB_BYTE2LEN(c); | |
| 4815 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4816 mb_l = 1; | |
| 4817 else if (mb_l > 1) | |
| 4818 { | |
| 4819 /* We assume a second byte below 32 is illegal. | |
| 4820 * Hopefully this is OK for all double-byte encodings! | |
| 4821 */ | |
| 4822 if (ptr[1] >= 32) | |
| 4823 mb_c = (c << 8) + ptr[1]; | |
| 4824 else | |
| 4825 { | |
| 4826 if (ptr[1] == NUL) | |
| 4827 { | |
| 4828 /* head byte at end of line */ | |
| 4829 mb_l = 1; | |
| 4830 transchar_nonprint(extra, c); | |
| 4831 } | |
| 4832 else | |
| 4833 { | |
| 4834 /* illegal tail byte */ | |
| 4835 mb_l = 2; | |
| 4836 STRCPY(extra, "XX"); | |
| 4837 } | |
| 4838 p_extra = extra; | |
| 4839 n_extra = (int)STRLEN(extra) - 1; | |
| 4840 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
|
4841 c_final = NUL; |
| 7 | 4842 c = *p_extra++; |
| 4843 if (area_attr == 0 && search_attr == 0) | |
| 4844 { | |
| 4845 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
|
4846 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4847 saved_attr2 = char_attr; /* save current attr */ |
| 4848 } | |
| 4849 mb_c = c; | |
| 4850 } | |
| 4851 } | |
| 4852 } | |
| 4853 /* If a double-width char doesn't fit display a '>' in the | |
| 4854 * last column; the character is displayed at the start of the | |
| 4855 * next line. */ | |
| 4856 if (( | |
| 4857 # ifdef FEAT_RIGHTLEFT | |
| 4858 wp->w_p_rl ? (col <= 0) : | |
| 4859 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4860 (col >= wp->w_width - 1)) |
| 7 | 4861 && (*mb_char2cells)(mb_c) == 2) |
| 4862 { | |
| 4863 c = '>'; | |
| 4864 mb_c = c; | |
| 4865 mb_utf8 = FALSE; | |
| 4866 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
|
4867 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
|
4868 // 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
|
4869 // displayed at the start of the next line. |
| 7 | 4870 --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
|
4871 #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
|
4872 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
|
4873 #endif |
| 7 | 4874 } |
| 4875 else if (*ptr != NUL) | |
| 4876 ptr += mb_l - 1; | |
| 4877 | |
| 4878 /* 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
|
4879 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4880 * 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
|
4881 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4882 { |
| 4883 n_extra = 1; | |
| 3586 | 4884 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
|
4885 c_final = NUL; |
| 7 | 4886 c = ' '; |
| 4887 if (area_attr == 0 && search_attr == 0) | |
| 4888 { | |
| 4889 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
|
4890 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4891 saved_attr2 = char_attr; /* save current attr */ |
| 4892 } | |
| 4893 mb_c = c; | |
| 4894 mb_utf8 = FALSE; | |
| 4895 mb_l = 1; | |
| 4896 } | |
| 4897 | |
| 4898 } | |
| 4899 ++ptr; | |
| 4900 | |
| 4901 if (extra_check) | |
| 4902 { | |
| 743 | 4903 #ifdef FEAT_SPELL |
| 221 | 4904 int can_spell = TRUE; |
| 743 | 4905 #endif |
| 4906 | |
|
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
|
4907 #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
|
4908 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
|
4909 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4910 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
|
4911 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4912 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
|
4913 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
|
4914 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
|
4915 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
|
4916 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4917 #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
|
4918 |
| 743 | 4919 #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
|
4920 // 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
|
4921 // (double-wide char that doesn't fit). |
| 221 | 4922 v = (long)(ptr - line); |
| 4923 if (has_syntax && v > 0) | |
| 7 | 4924 { |
| 4925 /* Get the syntax attribute for the character. If there | |
| 4926 * is an error, disable syntax highlighting. */ | |
| 4927 save_did_emsg = did_emsg; | |
| 4928 did_emsg = FALSE; | |
| 4929 | |
| 221 | 4930 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4931 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4932 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4933 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4934 NULL, FALSE); |
| 7 | 4935 |
| 4936 if (did_emsg) | |
| 482 | 4937 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4938 wp->w_s->b_syn_error = TRUE; |
| 482 | 4939 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4940 syntax_attr = 0; |
| 482 | 4941 } |
| 7 | 4942 else |
| 4943 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4944 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4945 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4946 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4947 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
|
4948 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4949 #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
|
4950 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
|
4951 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4952 #endif |
| 7 | 4953 |
| 4954 /* Need to get the line again, a multi-line regexp may | |
| 4955 * have made it invalid. */ | |
| 4956 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4957 ptr = line + v; | |
| 4958 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4959 # 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
|
4960 // 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
|
4961 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
|
4962 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4963 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4964 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
|
4965 # 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
|
4966 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
|
4967 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4968 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
|
4969 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
|
4970 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4971 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
|
4972 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4973 # 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
|
4974 /* 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
|
4975 * 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
|
4976 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
|
4977 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
|
4978 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
|
4979 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
|
4980 # endif |
| 7 | 4981 } |
| 743 | 4982 #endif |
| 4983 | |
| 4984 #ifdef FEAT_SPELL | |
| 301 | 4985 /* Check spelling (unless at the end of the line). |
| 319 | 4986 * Only do this when there is no syntax highlighting, the |
| 4987 * @Spell cluster is not used or the current syntax item | |
| 4988 * contains the @Spell cluster. */ | |
| 348 | 4989 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4990 { |
| 230 | 4991 spell_attr = 0; |
| 743 | 4992 if (c != 0 && ( |
| 4993 # ifdef FEAT_SYN_HL | |
| 4994 !has_syntax || | |
| 4995 # endif | |
| 4996 can_spell)) | |
| 221 | 4997 { |
| 348 | 4998 char_u *prev_ptr, *p; |
| 4999 int len; | |
| 534 | 5000 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 5001 if (has_mbyte) |
| 5002 { | |
| 5003 prev_ptr = ptr - mb_l; | |
| 5004 v -= mb_l - 1; | |
| 5005 } | |
| 5006 else | |
| 5007 prev_ptr = ptr - 1; | |
| 348 | 5008 |
| 5009 /* Use nextline[] if possible, it has the start of the | |
| 5010 * next line concatenated. */ | |
| 5011 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 5012 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 5013 else | |
| 5014 p = prev_ptr; | |
| 835 | 5015 cap_col -= (int)(prev_ptr - line); |
| 625 | 5016 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 5017 nochange); | |
| 348 | 5018 word_end = v + len; |
| 301 | 5019 |
| 5020 /* In Insert mode only highlight a word that | |
| 5021 * doesn't touch the cursor. */ | |
| 534 | 5022 if (spell_hlf != HLF_COUNT |
| 301 | 5023 && (State & INSERT) != 0 |
| 5024 && wp->w_cursor.lnum == lnum | |
| 5025 && wp->w_cursor.col >= | |
| 5026 (colnr_T)(prev_ptr - line) | |
| 5027 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 5028 { |
| 534 | 5029 spell_hlf = HLF_COUNT; |
| 301 | 5030 spell_redraw_lnum = lnum; |
| 221 | 5031 } |
| 348 | 5032 |
| 534 | 5033 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 5034 && (p - nextline) + len > nextline_idx) |
| 5035 { | |
| 5036 /* Remember that the good word continues at the | |
| 5037 * start of the next line. */ | |
| 5038 checked_lnum = lnum + 1; | |
| 835 | 5039 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 5040 } |
| 386 | 5041 |
| 534 | 5042 /* Turn index into actual attributes. */ |
| 5043 if (spell_hlf != HLF_COUNT) | |
| 5044 spell_attr = highlight_attr[spell_hlf]; | |
| 5045 | |
| 386 | 5046 if (cap_col > 0) |
| 5047 { | |
| 5048 if (p != prev_ptr | |
| 5049 && (p - nextline) + cap_col >= nextline_idx) | |
| 5050 { | |
| 5051 /* Remember that the word in the next line | |
| 5052 * must start with a capital. */ | |
| 5053 capcol_lnum = lnum + 1; | |
| 835 | 5054 cap_col = (int)((p - nextline) + cap_col |
| 5055 - nextline_idx); | |
| 386 | 5056 } |
| 5057 else | |
| 5058 /* Compute the actual column. */ | |
| 835 | 5059 cap_col += (int)(prev_ptr - line); |
| 386 | 5060 } |
| 221 | 5061 } |
| 5062 } | |
| 5063 if (spell_attr != 0) | |
| 348 | 5064 { |
| 674 | 5065 if (!attr_pri) |
| 348 | 5066 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 5067 else | |
| 5068 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 5069 } | |
| 7 | 5070 #endif |
| 5071 #ifdef FEAT_LINEBREAK | |
| 5072 /* | |
| 221 | 5073 * Found last space before word: check for line break. |
| 7 | 5074 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
5075 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
|
5076 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 5077 { |
| 6693 | 5078 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
|
5079 char_u *p = ptr - (mb_off + 1); |
| 6681 | 5080 |
| 5995 | 5081 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 5082 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 5083 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5084 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
|
5085 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
5086 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
|
5087 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
|
5088 # else |
| 6371 | 5089 n_extra = (int)wp->w_buffer->b_p_ts |
| 5090 - 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
|
5091 # endif |
| 6371 | 5092 |
| 6693 | 5093 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
|
5094 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5095 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5096 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5097 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5098 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5099 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5100 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5101 #endif |
| 6026 | 5102 if (!wp->w_p_list) |
| 5103 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5104 } |
| 7 | 5105 } |
| 5106 #endif | |
| 5107 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5108 // '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
|
5109 // 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
|
5110 // 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
|
5111 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
|
5112 && ((((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
|
5113 || (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
|
5114 && ((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
|
5115 || (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
|
5116 && 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
|
5117 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5118 && 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
|
5119 && 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
|
5120 && 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
|
5121 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5122 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
|
5123 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
|
5124 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5125 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
|
5126 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
|
5127 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
|
5128 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5129 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
|
5130 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
|
5131 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5132 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
|
5133 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
|
5134 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5135 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5136 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5137 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5138 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5139 |
| 7 | 5140 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 5141 { | |
| 5142 c = lcs_trail; | |
| 674 | 5143 if (!attr_pri) |
| 7 | 5144 { |
| 5145 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
|
5146 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5147 saved_attr2 = char_attr; /* save current attr */ |
| 5148 } | |
| 5149 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
|
5150 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5151 { |
| 5152 mb_utf8 = TRUE; | |
| 714 | 5153 u8cc[0] = 0; |
| 819 | 5154 c = 0xc0; |
| 7 | 5155 } |
| 5156 else | |
| 5157 mb_utf8 = FALSE; | |
| 5158 } | |
| 5159 } | |
| 5160 | |
| 5161 /* | |
| 5162 * Handling of non-printable characters. | |
| 5163 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5164 if (!vim_isprintc(c)) |
| 7 | 5165 { |
| 5166 /* | |
| 5167 * when getting a character from the file, we may have to | |
| 5168 * turn it into something else on the way to putting it | |
| 5169 * into "ScreenLines". | |
| 5170 */ | |
| 5171 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5172 { | |
| 6026 | 5173 int tab_len = 0; |
| 6503 | 5174 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5175 #ifdef FEAT_LINEBREAK | |
| 5176 /* only adjust the tab_len, when at the first column | |
| 5177 * after the showbreak value was drawn */ | |
| 5178 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5179 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5180 #endif | |
| 7 | 5181 /* 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
|
5182 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5183 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
|
5184 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
|
5185 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
|
5186 #else |
| 6026 | 5187 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
|
5188 - 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
|
5189 #endif |
| 6503 | 5190 |
| 6026 | 5191 #ifdef FEAT_LINEBREAK |
| 6100 | 5192 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5193 #endif |
| 5194 /* tab amount depends on current column */ | |
| 5195 n_extra = tab_len; | |
| 5196 #ifdef FEAT_LINEBREAK | |
| 5197 else | |
| 5198 { | |
| 5199 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5200 int len; |
| 6026 | 5201 int i; |
| 5202 int saved_nextra = n_extra; | |
| 5203 | |
| 6172 | 5204 #ifdef FEAT_CONCEAL |
| 6627 | 5205 if (vcol_off > 0) |
| 6172 | 5206 /* there are characters to conceal */ |
| 5207 tab_len += vcol_off; | |
| 6520 | 5208 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5209 */ | |
| 5210 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5211 && n_extra > tab_len) | |
| 5212 tab_len += n_extra - tab_len; | |
| 5213 #endif | |
| 5214 | |
| 6026 | 5215 /* if n_extra > 0, it gives the number of chars, to |
| 5216 * use for a tab, else we need to calculate the width | |
| 5217 * for a tab */ | |
| 5218 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5219 if (n_extra > 0) | |
| 5220 len += n_extra - tab_len; | |
| 5221 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
|
5222 p = alloc(len + 1); |
| 6026 | 5223 vim_memset(p, ' ', len); |
| 5224 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5225 vim_free(p_extra_free); |
| 6026 | 5226 p_extra_free = p; |
| 5227 for (i = 0; i < tab_len; i++) | |
| 5228 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5229 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5230 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5231 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5232 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5233 } |
| 6026 | 5234 mb_char2bytes(lcs_tab2, p); |
| 5235 p += mb_char2len(lcs_tab2); | |
| 5236 n_extra += mb_char2len(lcs_tab2) | |
| 5237 - (saved_nextra > 0 ? 1 : 0); | |
| 5238 } | |
| 5239 p_extra = p_extra_free; | |
| 6172 | 5240 #ifdef FEAT_CONCEAL |
| 5241 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5242 * macro below, so need to adjust for that here */ | |
| 6627 | 5243 if (vcol_off > 0) |
| 6172 | 5244 n_extra -= vcol_off; |
| 5245 #endif | |
| 6026 | 5246 } |
| 5247 #endif | |
| 3984 | 5248 #ifdef FEAT_CONCEAL |
| 6627 | 5249 { |
| 5250 int vc_saved = vcol_off; | |
| 5251 | |
| 5252 /* Tab alignment should be identical regardless of | |
| 5253 * 'conceallevel' value. So tab compensates of all | |
| 5254 * previous concealed characters, and thus resets | |
| 5255 * vcol_off and boguscols accumulated so far in the | |
| 5256 * line. Note that the tab can be longer than | |
| 5257 * 'tabstop' when there are concealed characters. */ | |
| 5258 FIX_FOR_BOGUSCOLS; | |
| 5259 | |
| 5260 /* Make sure, the highlighting for the tab char will be | |
| 5261 * correctly set further below (effectively reverts the | |
| 5262 * FIX_FOR_BOGSUCOLS macro */ | |
| 5263 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5264 && lcs_tab1) |
| 6627 | 5265 tab_len += vc_saved; |
| 5266 } | |
| 3984 | 5267 #endif |
| 7 | 5268 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5269 if (wp->w_p_list) | |
| 5270 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5271 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5272 #ifdef FEAT_LINEBREAK |
| 5273 if (wp->w_p_lbr) | |
| 5274 c_extra = NUL; /* using p_extra from above */ | |
| 5275 else | |
| 5276 #endif | |
| 5277 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
|
5278 c_final = lcs_tab3; |
| 6026 | 5279 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
|
5280 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5281 saved_attr2 = char_attr; /* save current attr */ |
| 5282 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
|
5283 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5284 { |
| 5285 mb_utf8 = TRUE; | |
| 714 | 5286 u8cc[0] = 0; |
| 819 | 5287 c = 0xc0; |
| 7 | 5288 } |
| 5289 } | |
| 5290 else | |
| 5291 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5292 c_final = NUL; |
| 7 | 5293 c_extra = ' '; |
| 5294 c = ' '; | |
| 5295 } | |
| 5296 } | |
| 36 | 5297 else if (c == NUL |
| 6799 | 5298 && (wp->w_p_list |
| 36 | 5299 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5300 && tocol > vcol | |
| 5301 && VIsual_mode != Ctrl_V | |
| 5302 && ( | |
| 5303 # ifdef FEAT_RIGHTLEFT | |
| 5304 wp->w_p_rl ? (col >= 0) : | |
| 5305 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5306 (col < wp->w_width)) |
| 36 | 5307 && !(noinvcur |
| 1850 | 5308 && lnum == wp->w_cursor.lnum |
| 36 | 5309 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5310 && lcs_eol_one > 0) |
| 7 | 5311 { |
| 36 | 5312 /* Display a '$' after the line or highlight an extra |
| 5313 * character if the line break is included. */ | |
| 7 | 5314 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5315 /* For a diff line the highlighting continues after the | |
| 5316 * "$". */ | |
| 5317 if ( | |
| 5318 # ifdef FEAT_DIFF | |
| 534 | 5319 diff_hlf == (hlf_T)0 |
| 7 | 5320 # ifdef LINE_ATTR |
| 5321 && | |
| 5322 # endif | |
| 5323 # endif | |
| 5324 # ifdef LINE_ATTR | |
| 5325 line_attr == 0 | |
| 5326 # endif | |
| 5327 ) | |
| 5328 #endif | |
| 5329 { | |
| 5330 /* In virtualedit, visual selections may extend | |
| 5331 * beyond end of line. */ | |
| 5332 if (area_highlighting && virtual_active() | |
| 5333 && tocol != MAXCOL && vcol < tocol) | |
| 5334 n_extra = 0; | |
| 5335 else | |
| 5336 { | |
| 5337 p_extra = at_end_str; | |
| 5338 n_extra = 1; | |
| 5339 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
|
5340 c_final = NUL; |
| 7 | 5341 } |
| 5342 } | |
| 6799 | 5343 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5344 c = lcs_eol; |
| 5345 else | |
| 5346 c = ' '; | |
| 7 | 5347 lcs_eol_one = -1; |
| 5348 --ptr; /* put it back at the NUL */ | |
| 674 | 5349 if (!attr_pri) |
| 7 | 5350 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5351 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5352 n_attr = 1; |
| 5353 } | |
| 5354 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
|
5355 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5356 { |
| 5357 mb_utf8 = TRUE; | |
| 714 | 5358 u8cc[0] = 0; |
| 819 | 5359 c = 0xc0; |
| 7 | 5360 } |
| 5361 else | |
| 5362 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5363 } | |
| 5364 else if (c != NUL) | |
| 5365 { | |
| 5366 p_extra = transchar(c); | |
| 6064 | 5367 if (n_extra == 0) |
| 5368 n_extra = byte2cells(c) - 1; | |
| 7 | 5369 #ifdef FEAT_RIGHTLEFT |
| 5370 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5371 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5372 #endif | |
| 5373 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
|
5374 c_final = NUL; |
| 6026 | 5375 #ifdef FEAT_LINEBREAK |
| 5376 if (wp->w_p_lbr) | |
| 5377 { | |
| 5378 char_u *p; | |
| 5379 | |
| 5380 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
|
5381 p = alloc(n_extra + 1); |
| 6026 | 5382 vim_memset(p, ' ', n_extra); |
| 5383 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5384 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5385 vim_free(p_extra_free); |
| 6026 | 5386 p_extra_free = p_extra = p; |
| 5387 } | |
| 5388 else | |
| 5389 #endif | |
| 5390 { | |
| 5391 n_extra = byte2cells(c) - 1; | |
| 5392 c = *p_extra++; | |
| 5393 } | |
| 674 | 5394 if (!attr_pri) |
| 7 | 5395 { |
| 5396 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
|
5397 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5398 saved_attr2 = char_attr; /* save current attr */ |
| 5399 } | |
| 5400 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5401 } | |
| 5402 else if (VIsual_active | |
| 5403 && (VIsual_mode == Ctrl_V | |
| 5404 || VIsual_mode == 'v') | |
| 5405 && virtual_active() | |
| 5406 && tocol != MAXCOL | |
| 5407 && vcol < tocol | |
| 5408 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5409 #ifdef FEAT_RIGHTLEFT |
| 7 | 5410 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5411 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5412 (col < wp->w_width))) |
| 7 | 5413 { |
| 5414 c = ' '; | |
| 5415 --ptr; /* put it back at the NUL */ | |
| 5416 } | |
| 910 | 5417 #if defined(LINE_ATTR) |
| 7 | 5418 else if (( |
| 5419 # ifdef FEAT_DIFF | |
| 910 | 5420 diff_hlf != (hlf_T)0 || |
| 7 | 5421 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5422 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5423 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
|
5424 # endif |
| 7 | 5425 line_attr != 0 |
| 5426 ) && ( | |
| 5427 # ifdef FEAT_RIGHTLEFT | |
| 5428 wp->w_p_rl ? (col >= 0) : | |
| 5429 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5430 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5431 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5432 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5433 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5434 < wp->w_width))) |
| 7 | 5435 { |
| 5436 /* Highlight until the right side of the window */ | |
| 5437 c = ' '; | |
| 5438 --ptr; /* put it back at the NUL */ | |
| 867 | 5439 |
| 5440 /* Remember we do the char for line highlighting. */ | |
| 5441 ++did_line_attr; | |
| 5442 | |
| 5443 /* 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
|
5444 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
|
5445 && (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
|
5446 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5447 char_attr = line_attr; |
| 7 | 5448 # ifdef FEAT_DIFF |
| 5449 if (diff_hlf == HLF_TXD) | |
| 5450 { | |
| 5451 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5452 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5453 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5454 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5455 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5456 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
|
5457 HL_ATTR(HLF_CUL)); |
| 6106 | 5458 } |
| 7 | 5459 } |
| 5460 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5461 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5462 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
|
5463 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5464 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
|
5465 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
|
5466 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
|
5467 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
|
5468 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5469 # endif |
| 7 | 5470 } |
| 5471 #endif | |
| 5472 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5473 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5474 #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
|
5475 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
|
5476 && (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
|
5477 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
|
5478 && ((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
|
5479 && !(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
|
5480 && 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
|
5481 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5482 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5483 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5484 && (syn_get_sub_char() != NUL || match_conc |
| 5485 || 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
|
5486 && 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
|
5487 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5488 /* 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
|
5489 * character. */ |
| 6947 | 5490 if (match_conc) |
| 5491 c = match_conc; | |
| 5492 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
|
5493 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5494 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5495 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5496 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5497 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5498 |
|
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
|
5499 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5500 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5501 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5502 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5503 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5504 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
|
5505 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5507 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5508 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5509 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5510 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5511 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5512 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5513 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5514 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5515 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5516 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5517 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5518 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5519 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5520 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5521 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5522 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5523 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5524 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5525 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5526 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5527 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
|
5528 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
|
5529 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5530 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5531 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5532 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5533 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5534 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5535 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
|
5536 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5537 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5538 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5539 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
|
5540 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5541 } |
|
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
|
5542 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5543 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
|
5544 // 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
|
5545 ++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
|
5546 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5547 #endif // FEAT_CONCEAL |
| 7 | 5548 } |
| 5549 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5550 #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
|
5551 /* 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
|
5552 * 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
|
5553 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
|
5554 && 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
|
5555 && 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
|
5556 && (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
|
5557 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5558 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5559 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
|
5560 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
|
5561 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5562 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5563 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
|
5564 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
|
5565 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
|
5566 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5567 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5568 |
| 7 | 5569 /* Don't override visual selection highlighting. */ |
| 5570 if (n_attr > 0 | |
| 5571 && draw_state == WL_LINE | |
| 674 | 5572 && !attr_pri) |
| 7 | 5573 char_attr = extra_attr; |
| 5574 | |
| 42 | 5575 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5576 /* XIM don't send preedit_start and preedit_end, but they send |
| 5577 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5578 * 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
|
5579 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
|
5580 && xic != NULL |
| 1850 | 5581 && lnum == wp->w_cursor.lnum |
| 7 | 5582 && (State & INSERT) |
| 5583 && !p_imdisable | |
| 5584 && im_is_preediting() | |
| 5585 && draw_state == WL_LINE) | |
| 5586 { | |
| 5587 colnr_T tcol; | |
| 5588 | |
| 5589 if (preedit_end_col == MAXCOL) | |
| 1850 | 5590 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5591 else |
| 5592 tcol = preedit_end_col; | |
| 5593 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5594 { | |
| 5595 if (feedback_old_attr < 0) | |
| 5596 { | |
| 5597 feedback_col = 0; | |
| 5598 feedback_old_attr = char_attr; | |
| 5599 } | |
| 5600 char_attr = im_get_feedback_attr(feedback_col); | |
| 5601 if (char_attr < 0) | |
| 5602 char_attr = feedback_old_attr; | |
| 5603 feedback_col++; | |
| 5604 } | |
| 5605 else if (feedback_old_attr >= 0) | |
| 5606 { | |
| 5607 char_attr = feedback_old_attr; | |
| 5608 feedback_old_attr = -1; | |
| 5609 feedback_col = 0; | |
| 5610 } | |
| 5611 } | |
| 5612 #endif | |
| 5613 /* | |
| 5614 * Handle the case where we are in column 0 but not on the first | |
| 5615 * character of the line and the user wants us to show us a | |
| 5616 * special character (via 'listchars' option "precedes:<char>". | |
| 5617 */ | |
| 5618 if (lcs_prec_todo != NUL | |
| 6276 | 5619 && wp->w_p_list |
| 7 | 5620 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5621 #ifdef FEAT_DIFF | |
| 5622 && filler_todo <= 0 | |
| 5623 #endif | |
| 5624 && draw_state > WL_NR | |
| 5625 && c != NUL) | |
| 5626 { | |
| 5627 c = lcs_prec; | |
| 5628 lcs_prec_todo = NUL; | |
| 3586 | 5629 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5630 { | |
| 5631 /* Double-width character being overwritten by the "precedes" | |
| 5632 * character, need to fill up half the character. */ | |
| 5633 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
|
5634 c_final = NUL; |
| 3586 | 5635 n_extra = 1; |
| 5636 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
|
5637 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5638 } |
| 7 | 5639 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
|
5640 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5641 { |
| 5642 mb_utf8 = TRUE; | |
| 714 | 5643 u8cc[0] = 0; |
| 819 | 5644 c = 0xc0; |
| 7 | 5645 } |
| 5646 else | |
| 5647 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5648 if (!attr_pri) |
| 7 | 5649 { |
| 5650 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
|
5651 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5652 n_attr3 = 1; |
| 5653 } | |
| 5654 } | |
| 5655 | |
| 5656 /* | |
| 867 | 5657 * At end of the text line or just after the last character. |
| 7 | 5658 */ |
| 867 | 5659 if (c == NUL |
| 910 | 5660 #if defined(LINE_ATTR) |
| 867 | 5661 || did_line_attr == 1 |
| 5662 #endif | |
| 5663 ) | |
| 5664 { | |
| 5665 #ifdef FEAT_SEARCH_EXTRA | |
| 5666 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5667 |
| 5668 /* we're not really at that column when skipping some text */ | |
| 1439 | 5669 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5670 ++prevcol; |
| 867 | 5671 #endif |
| 5672 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5673 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5674 * highlight match at end of line. If it's beyond the last |
| 5675 * char on the screen, just overwrite that one (tricky!) Not | |
| 5676 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5677 #ifdef FEAT_SEARCH_EXTRA |
| 5678 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5679 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5680 prevcol_hl_flag = TRUE; |
| 5681 else | |
| 5682 { | |
| 5683 cur = wp->w_match_head; | |
| 5684 while (cur != NULL) | |
| 5685 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5686 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5687 { |
| 5688 prevcol_hl_flag = TRUE; | |
| 5689 break; | |
| 5690 } | |
| 5691 cur = cur->next; | |
| 5692 } | |
| 5693 } | |
| 5694 #endif | |
| 7 | 5695 if (lcs_eol == lcs_eol_one |
| 1850 | 5696 && ((area_attr != 0 && vcol == fromcol |
| 5697 && (VIsual_mode != Ctrl_V | |
| 5698 || lnum == VIsual.lnum | |
| 5699 || lnum == curwin->w_cursor.lnum) | |
| 5700 && c == NUL) | |
| 7 | 5701 #ifdef FEAT_SEARCH_EXTRA |
| 5702 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5703 || (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
|
5704 # 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
|
5705 && !(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
|
5706 && !(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
|
5707 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5708 # 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
|
5709 && 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
|
5710 # endif |
| 910 | 5711 # if defined(LINE_ATTR) |
| 867 | 5712 && did_line_attr <= 1 |
| 5713 # endif | |
| 5714 ) | |
| 7 | 5715 #endif |
| 5716 )) | |
| 5717 { | |
| 5718 int n = 0; | |
| 5719 | |
| 5720 #ifdef FEAT_RIGHTLEFT | |
| 5721 if (wp->w_p_rl) | |
| 5722 { | |
| 5723 if (col < 0) | |
| 5724 n = 1; | |
| 5725 } | |
| 5726 else | |
| 5727 #endif | |
| 5728 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5729 if (col >= wp->w_width) |
| 7 | 5730 n = -1; |
| 5731 } | |
| 5732 if (n != 0) | |
| 5733 { | |
| 5734 /* At the window boundary, highlight the last character | |
| 5735 * instead (better than nothing). */ | |
| 5736 off += n; | |
| 5737 col += n; | |
| 5738 } | |
| 5739 else | |
| 5740 { | |
| 5741 /* Add a blank character to highlight. */ | |
| 5742 ScreenLines[off] = ' '; | |
| 5743 if (enc_utf8) | |
| 5744 ScreenLinesUC[off] = 0; | |
| 5745 } | |
| 5746 #ifdef FEAT_SEARCH_EXTRA | |
| 5747 if (area_attr == 0) | |
| 5748 { | |
| 1326 | 5749 /* Use attributes from match with highest priority among |
| 5750 * 'search_hl' and the match list. */ | |
| 5751 char_attr = search_hl.attr; | |
| 5752 cur = wp->w_match_head; | |
| 5753 shl_flag = FALSE; | |
| 5754 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5755 { |
| 1326 | 5756 if (shl_flag == FALSE |
| 5757 && ((cur != NULL | |
| 5758 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5759 || cur == NULL)) | |
| 699 | 5760 { |
| 1326 | 5761 shl = &search_hl; |
| 5762 shl_flag = TRUE; | |
| 699 | 5763 } |
| 1326 | 5764 else |
| 5765 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5766 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
|
5767 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5768 char_attr = shl->attr; |
| 5769 if (shl != &search_hl && cur != NULL) | |
| 5770 cur = cur->next; | |
| 699 | 5771 } |
| 7 | 5772 } |
| 5773 #endif | |
| 5774 ScreenAttrs[off] = char_attr; | |
| 5775 #ifdef FEAT_RIGHTLEFT | |
| 5776 if (wp->w_p_rl) | |
| 1437 | 5777 { |
| 7 | 5778 --col; |
| 1437 | 5779 --off; |
| 5780 } | |
| 7 | 5781 else |
| 5782 #endif | |
| 1437 | 5783 { |
| 7 | 5784 ++col; |
| 1437 | 5785 ++off; |
| 5786 } | |
| 743 | 5787 ++vcol; |
| 1437 | 5788 #ifdef FEAT_SYN_HL |
| 5789 eol_hl_off = 1; | |
| 5790 #endif | |
| 743 | 5791 } |
| 867 | 5792 } |
| 5793 | |
| 5794 /* | |
| 5795 * At end of the text line. | |
| 5796 */ | |
| 5797 if (c == NUL) | |
| 5798 { | |
| 743 | 5799 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5800 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5801 if (wp->w_p_wrap) |
| 5802 v = wp->w_skipcol; | |
| 5803 else | |
| 5804 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5805 |
| 820 | 5806 /* check if line ends before left margin */ |
| 5807 if (vcol < v + col - win_col_off(wp)) | |
| 5808 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
|
5809 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5810 // 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
|
5811 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5812 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5813 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5814 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5815 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5816 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5817 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
|
5818 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5819 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5820 && (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
|
5821 && (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
|
5822 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
|
5823 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5824 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5825 || win_attr != 0) |
| 743 | 5826 # ifdef FEAT_RIGHTLEFT |
| 5827 && !wp->w_p_rl | |
| 5828 # endif | |
| 5829 ) | |
| 5830 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5831 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5832 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5833 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5834 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5835 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5836 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5837 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5838 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
|
5839 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5840 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5841 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5842 while (col < wp->w_width) |
| 743 | 5843 { |
| 5844 ScreenLines[off] = ' '; | |
| 5845 if (enc_utf8) | |
| 5846 ScreenLinesUC[off] = 0; | |
| 5847 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5848 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5849 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
|
5850 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5851 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5852 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
|
5853 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
|
5854 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
|
5855 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5856 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5857 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5858 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5859 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5860 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5861 |
| 743 | 5862 ++vcol; |
| 5863 } | |
| 5864 } | |
| 5865 #endif | |
| 7 | 5866 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5867 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
|
5868 (int)wp->w_width, screen_line_flags); |
| 7 | 5869 row++; |
| 5870 | |
| 5871 /* | |
| 5872 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5873 * updated (saves a call to plines() later). | |
| 5874 */ | |
| 5875 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5876 { | |
| 5877 curwin->w_cline_row = startrow; | |
| 5878 curwin->w_cline_height = row - startrow; | |
| 5879 #ifdef FEAT_FOLDING | |
| 5880 curwin->w_cline_folded = FALSE; | |
| 5881 #endif | |
| 5882 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5883 } | |
| 5884 | |
| 5885 break; | |
| 5886 } | |
| 5887 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5888 // 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
|
5889 // '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
|
5890 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
|
5891 && wp->w_p_list |
| 7 | 5892 && !wp->w_p_wrap |
| 5893 #ifdef FEAT_DIFF | |
| 5894 && filler_todo <= 0 | |
| 5895 #endif | |
| 5896 && ( | |
| 5897 #ifdef FEAT_RIGHTLEFT | |
| 5898 wp->w_p_rl ? col == 0 : | |
| 5899 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5900 col == wp->w_width - 1) |
| 7 | 5901 && (*ptr != NUL |
| 1555 | 5902 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5903 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5904 { | |
| 5905 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
|
5906 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5907 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
|
5908 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5909 { |
| 5910 mb_utf8 = TRUE; | |
| 714 | 5911 u8cc[0] = 0; |
| 819 | 5912 c = 0xc0; |
| 7 | 5913 } |
| 5914 else | |
| 5915 mb_utf8 = FALSE; | |
| 5916 } | |
| 5917 | |
| 743 | 5918 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5919 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5920 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5921 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
|
5922 |
| 743 | 5923 /* 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
|
5924 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5925 * 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
|
5926 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5927 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
|
5928 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
|
5929 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5930 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5931 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
|
5932 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5933 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5934 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
|
5935 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
|
5936 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5937 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
|
5938 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5939 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
|
5940 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
|
5941 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5942 } |
| 743 | 5943 #endif |
| 5944 | |
| 7 | 5945 /* |
| 5946 * Store character to be displayed. | |
| 5947 * Skip characters that are left of the screen for 'nowrap'. | |
| 5948 */ | |
| 5949 vcol_prev = vcol; | |
| 5950 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5951 { | |
| 5952 /* | |
| 5953 * Store the character. | |
| 5954 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5955 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5956 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5957 { | |
| 5958 /* A double-wide character is: put first halve in left cell. */ | |
| 5959 --off; | |
| 5960 --col; | |
| 5961 } | |
| 5962 #endif | |
| 5963 ScreenLines[off] = c; | |
| 5964 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5965 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5966 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5967 ScreenLines[off] = 0x8e; |
| 7 | 5968 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5969 } |
| 7 | 5970 else if (enc_utf8) |
| 5971 { | |
| 5972 if (mb_utf8) | |
| 5973 { | |
| 1326 | 5974 int i; |
| 5975 | |
| 7 | 5976 ScreenLinesUC[off] = mb_c; |
| 819 | 5977 if ((c & 0xff) == 0) |
| 5978 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5979 for (i = 0; i < Screen_mco; ++i) |
| 5980 { | |
| 5981 ScreenLinesC[i][off] = u8cc[i]; | |
| 5982 if (u8cc[i] == 0) | |
| 5983 break; | |
| 5984 } | |
| 7 | 5985 } |
| 5986 else | |
| 5987 ScreenLinesUC[off] = 0; | |
| 5988 } | |
| 5989 if (multi_attr) | |
| 5990 { | |
| 5991 ScreenAttrs[off] = multi_attr; | |
| 5992 multi_attr = 0; | |
| 5993 } | |
| 5994 else | |
| 5995 ScreenAttrs[off] = char_attr; | |
| 5996 | |
| 5997 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5998 { | |
| 5999 /* Need to fill two screen columns. */ | |
| 6000 ++off; | |
| 6001 ++col; | |
| 6002 if (enc_utf8) | |
| 6003 /* UTF-8: Put a 0 in the second screen char. */ | |
| 6004 ScreenLines[off] = 0; | |
| 6005 else | |
| 6006 /* DBCS: Put second byte in the second screen char. */ | |
| 6007 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6008 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6009 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6010 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6011 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6012 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6013 ++vcol; |
| 7 | 6014 /* When "tocol" is halfway a character, set it to the end of |
| 6015 * the character, otherwise highlighting won't stop. */ | |
| 6016 if (tocol == vcol) | |
| 6017 ++tocol; | |
| 6018 #ifdef FEAT_RIGHTLEFT | |
| 6019 if (wp->w_p_rl) | |
| 6020 { | |
| 6021 /* now it's time to backup one cell */ | |
| 6022 --off; | |
| 6023 --col; | |
| 6024 } | |
| 6025 #endif | |
| 6026 } | |
| 6027 #ifdef FEAT_RIGHTLEFT | |
| 6028 if (wp->w_p_rl) | |
| 6029 { | |
| 6030 --off; | |
| 6031 --col; | |
| 6032 } | |
| 6033 else | |
| 6034 #endif | |
| 6035 { | |
| 6036 ++off; | |
| 6037 ++col; | |
| 6038 } | |
| 6039 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6040 #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
|
6041 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
|
6042 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6043 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6044 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6045 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6046 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6047 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6048 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6049 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6050 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6051 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6052 * 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
|
6053 * 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
|
6054 * 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
|
6055 * 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
|
6056 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6057 * 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
|
6058 * 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
|
6059 * 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
|
6060 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6061 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6062 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6063 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6064 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6065 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6066 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6067 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6068 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6069 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6070 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6071 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6072 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6073 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6074 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6075 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6076 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6077 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6078 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6079 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6080 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6081 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6082 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
|
6083 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6084 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6085 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6086 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6087 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6088 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6089 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6090 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6091 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6092 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6093 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6094 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6095 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6096 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6097 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6098 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6099 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6100 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6101 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6102 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6103 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6104 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6105 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6106 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6107 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6108 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6109 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6110 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6111 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6112 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6113 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6114 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6115 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6116 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6117 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6118 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6119 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6120 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6121 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6122 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6123 #endif /* FEAT_CONCEAL */ |
| 7 | 6124 else |
| 6125 --n_skip; | |
| 6126 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
6127 /* 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
|
6128 * column. */ |
| 1849 | 6129 if (draw_state > WL_NR |
| 7 | 6130 #ifdef FEAT_DIFF |
| 6131 && filler_todo <= 0 | |
| 6132 #endif | |
| 6133 ) | |
| 6134 ++vcol; | |
| 6135 | |
| 743 | 6136 #ifdef FEAT_SYN_HL |
| 6137 if (vcol_save_attr >= 0) | |
| 6138 char_attr = vcol_save_attr; | |
| 6139 #endif | |
| 6140 | |
| 7 | 6141 /* restore attributes after "predeces" in 'listchars' */ |
| 6142 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 6143 char_attr = saved_attr3; | |
| 6144 | |
| 6145 /* restore attributes after last 'listchars' or 'number' char */ | |
| 6146 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 6147 char_attr = saved_attr2; | |
| 6148 | |
| 6149 /* | |
| 6150 * At end of screen line and there is more to come: Display the line | |
| 1378 | 6151 * so far. If there is no more to display it is caught above. |
| 7 | 6152 */ |
| 6153 if (( | |
| 6154 #ifdef FEAT_RIGHTLEFT | |
| 6155 wp->w_p_rl ? (col < 0) : | |
| 6156 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6157 (col >= wp->w_width)) |
| 7 | 6158 && (*ptr != NUL |
| 6159 #ifdef FEAT_DIFF | |
| 6160 || filler_todo > 0 | |
| 6161 #endif | |
| 2724 | 6162 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6163 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6164 ) | |
| 6165 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6166 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6167 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
|
6168 (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
|
6169 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6170 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6171 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
|
6172 (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
|
6173 #endif |
| 7 | 6174 ++row; |
| 6175 ++screen_row; | |
| 6176 | |
| 6177 /* When not wrapping and finished diff lines, or when displayed | |
| 6178 * '$' and highlighting until last column, break here. */ | |
| 6179 if ((!wp->w_p_wrap | |
| 6180 #ifdef FEAT_DIFF | |
| 6181 && filler_todo <= 0 | |
| 6182 #endif | |
| 6183 ) || lcs_eol_one == -1) | |
| 6184 break; | |
| 6185 | |
| 6186 /* When the window is too narrow draw all "@" lines. */ | |
| 6187 if (draw_state != WL_LINE | |
| 6188 #ifdef FEAT_DIFF | |
| 6189 && filler_todo <= 0 | |
| 6190 #endif | |
| 6191 ) | |
| 6192 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6193 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6194 draw_vsep_win(wp, row); |
| 6195 row = endrow; | |
| 6196 } | |
| 6197 | |
| 6198 /* When line got too long for screen break here. */ | |
| 6199 if (row == endrow) | |
| 6200 { | |
| 6201 ++row; | |
| 6202 break; | |
| 6203 } | |
| 6204 | |
| 6205 if (screen_cur_row == screen_row - 1 | |
| 6206 #ifdef FEAT_DIFF | |
| 6207 && filler_todo <= 0 | |
| 6208 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6209 && wp->w_width == Columns) |
| 7 | 6210 { |
| 6211 /* Remember that the line wraps, used for modeless copy. */ | |
| 6212 LineWraps[screen_row - 1] = TRUE; | |
| 6213 | |
| 6214 /* | |
| 6215 * Special trick to make copy/paste of wrapped lines work with | |
| 6216 * xterm/screen: write an extra character beyond the end of | |
| 6217 * the line. This will work with all terminal types | |
| 6218 * (regardless of the xn,am settings). | |
| 6219 * Only do this on a fast tty. | |
| 6220 * Only do this if the cursor is on the current line | |
| 6221 * (something has been written in it). | |
| 6222 * Don't do this for the GUI. | |
| 6223 * Don't do this for double-width characters. | |
| 6224 * Don't do this for a window not at the right screen border. | |
| 6225 */ | |
| 6226 if (p_tf | |
| 6227 #ifdef FEAT_GUI | |
| 6228 && !gui.in_use | |
| 6229 #endif | |
| 6230 && !(has_mbyte | |
| 1378 | 6231 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6232 LineOffset[screen_row] + screen_Columns) | |
| 6233 == 2 | |
| 7 | 6234 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6235 + (int)Columns - 2, |
| 6236 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6237 == 2))) |
| 7 | 6238 { |
| 6239 /* First make sure we are at the end of the screen line, | |
| 6240 * then output the same character again to let the | |
| 6241 * terminal know about the wrap. If the terminal doesn't | |
| 6242 * 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
|
6243 if (screen_cur_col != wp->w_width) |
| 7 | 6244 screen_char(LineOffset[screen_row - 1] |
| 6245 + (unsigned)Columns - 1, | |
| 6246 screen_row - 1, (int)(Columns - 1)); | |
| 6247 | |
| 6248 /* When there is a multi-byte character, just output a | |
| 6249 * space to keep it simple. */ | |
| 148 | 6250 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6251 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6252 out_char(' '); |
| 6253 else | |
| 6254 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6255 + (Columns - 1)]); | |
| 6256 /* force a redraw of the first char on the next line */ | |
| 6257 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6258 screen_start(); /* don't know where cursor is now */ | |
| 6259 } | |
| 6260 } | |
| 6261 | |
| 6262 col = 0; | |
| 6263 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6264 #ifdef FEAT_RIGHTLEFT | |
| 6265 if (wp->w_p_rl) | |
| 6266 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6267 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6268 off += col; |
| 6269 } | |
| 6270 #endif | |
| 6271 | |
| 6272 /* reset the drawing state for the start of a wrapped line */ | |
| 6273 draw_state = WL_START; | |
| 6274 saved_n_extra = n_extra; | |
| 6275 saved_p_extra = p_extra; | |
| 6276 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
|
6277 saved_c_final = c_final; |
| 7 | 6278 saved_char_attr = char_attr; |
| 6279 n_extra = 0; | |
| 6280 lcs_prec_todo = lcs_prec; | |
| 6281 #ifdef FEAT_LINEBREAK | |
| 6282 # ifdef FEAT_DIFF | |
| 6283 if (filler_todo <= 0) | |
| 6284 # endif | |
| 6285 need_showbreak = TRUE; | |
| 6286 #endif | |
| 6287 #ifdef FEAT_DIFF | |
| 6288 --filler_todo; | |
| 6289 /* When the filler lines are actually below the last line of the | |
| 6290 * file, don't draw the line itself, break here. */ | |
| 6291 if (filler_todo == 0 && wp->w_botfill) | |
| 6292 break; | |
| 6293 #endif | |
| 6294 } | |
| 6295 | |
| 6296 } /* for every character in the line */ | |
| 6297 | |
| 743 | 6298 #ifdef FEAT_SPELL |
| 386 | 6299 /* After an empty line check first word for capital. */ |
| 6300 if (*skipwhite(line) == NUL) | |
| 6301 { | |
| 6302 capcol_lnum = lnum + 1; | |
| 6303 cap_col = 0; | |
| 6304 } | |
| 6305 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6306 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6307 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6308 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6309 #endif |
| 386 | 6310 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6311 vim_free(p_extra_free); |
| 7 | 6312 return row; |
| 6313 } | |
| 6314 | |
| 714 | 6315 /* |
| 6316 * 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
|
6317 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6318 */ |
| 6319 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6320 comp_char_differs(int off_from, int off_to) |
| 714 | 6321 { |
| 6322 int i; | |
| 6323 | |
| 6324 for (i = 0; i < Screen_mco; ++i) | |
| 6325 { | |
| 6326 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6327 return TRUE; | |
| 6328 if (ScreenLinesC[i][off_from] == 0) | |
| 6329 break; | |
| 6330 } | |
| 6331 return FALSE; | |
| 6332 } | |
| 6333 | |
| 7 | 6334 /* |
| 6335 * Check whether the given character needs redrawing: | |
| 6336 * - the (first byte of the) character is different | |
| 6337 * - the attributes are different | |
| 6338 * - the character is multi-byte and the next byte is different | |
| 1616 | 6339 * - the character is two cells wide and the second cell differs. |
| 7 | 6340 */ |
| 6341 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6342 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6343 { |
| 6344 if (cols > 0 | |
| 6345 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6346 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6347 || (enc_dbcs != 0 | |
| 6348 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6349 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6350 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6351 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6352 != ScreenLines[off_to + 1]))) | |
| 6353 || (enc_utf8 | |
| 6354 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6355 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6356 && comp_char_differs(off_from, off_to)) |
| 3759 | 6357 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6358 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6359 != ScreenLines[off_to + 1]))))) |
| 7 | 6360 return TRUE; |
| 6361 return FALSE; | |
| 6362 } | |
| 6363 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6364 #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
|
6365 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6366 * 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
|
6367 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6368 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6369 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
|
6370 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6371 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
|
6372 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6373 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6374 |
| 7 | 6375 /* |
| 6376 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6377 * have actually changed. Handle insert/delete character. | |
| 6378 * "coloff" gives the first column on the screen for this line. | |
| 6379 * "endcol" gives the columns where valid characters are. | |
| 6380 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6381 * 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
|
6382 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6383 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6384 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6385 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6386 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6387 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6388 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6389 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6390 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6391 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6392 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
|
6393 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6394 int flags UNUSED) |
| 7 | 6395 { |
| 6396 unsigned off_from; | |
| 6397 unsigned off_to; | |
| 1378 | 6398 unsigned max_off_from; |
| 6399 unsigned max_off_to; | |
| 7 | 6400 int col = 0; |
| 6401 int hl; | |
| 6402 int force = FALSE; /* force update rest of the line */ | |
| 6403 int redraw_this /* bool: does character need redraw? */ | |
| 6404 #ifdef FEAT_GUI | |
| 6405 = TRUE /* For GUI when while-loop empty */ | |
| 6406 #endif | |
| 6407 ; | |
| 6408 int redraw_next; /* redraw_this for next character */ | |
| 6409 int clear_next = FALSE; | |
| 6410 int char_cells; /* 1: normal char */ | |
| 6411 /* 2: occupies two display cells */ | |
| 6412 # define CHAR_CELLS char_cells | |
| 6413 | |
| 3413 | 6414 /* Check for illegal row and col, just in case. */ |
| 6415 if (row >= Rows) | |
| 6416 row = Rows - 1; | |
| 6417 if (endcol > Columns) | |
| 6418 endcol = Columns; | |
| 6419 | |
| 7 | 6420 # ifdef FEAT_CLIPBOARD |
| 6421 clip_may_clear_selection(row, row); | |
| 6422 # endif | |
| 6423 | |
| 6424 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6425 off_to = LineOffset[row] + coloff; | |
| 1378 | 6426 max_off_from = off_from + screen_Columns; |
| 6427 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6428 |
| 6429 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6430 if (flags & SLF_RIGHTLEFT) |
| 7 | 6431 { |
| 6432 /* Clear rest first, because it's left of the text. */ | |
| 6433 if (clear_width > 0) | |
| 6434 { | |
| 6435 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6436 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6437 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6438 { |
| 6439 ++off_to; | |
| 6440 ++col; | |
| 6441 } | |
| 6442 if (col <= endcol) | |
| 6443 screen_fill(row, row + 1, col + coloff, | |
| 6444 endcol + coloff + 1, ' ', ' ', 0); | |
| 6445 } | |
| 6446 col = endcol + 1; | |
| 6447 off_to = LineOffset[row] + col + coloff; | |
| 6448 off_from += col; | |
| 6449 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6450 } | |
| 6451 #endif /* FEAT_RIGHTLEFT */ | |
| 6452 | |
| 6453 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6454 | |
| 6455 while (col < endcol) | |
| 6456 { | |
| 6457 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6458 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6459 else |
| 6460 char_cells = 1; | |
| 6461 | |
| 6462 redraw_this = redraw_next; | |
| 6463 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6464 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6465 | |
| 6466 #ifdef FEAT_GUI | |
| 6467 /* If the next character was bold, then redraw the current character to | |
| 6468 * remove any pixels that might have spilt over into us. This only | |
| 6469 * happens in the GUI. | |
| 6470 */ | |
| 6471 if (redraw_next && gui.in_use) | |
| 6472 { | |
| 6473 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6474 if (hl > HL_ALL) |
| 6475 hl = syn_attr2attr(hl); | |
| 6476 if (hl & HL_BOLD) | |
| 7 | 6477 redraw_this = TRUE; |
| 6478 } | |
| 6479 #endif | |
| 6480 | |
| 6481 if (redraw_this) | |
| 6482 { | |
| 6483 /* | |
| 6484 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6485 * Attributes for characters are stored at the position where the | |
| 6486 * cursor is when writing the highlighting code. The | |
| 6487 * start-highlighting code must be written with the cursor on the | |
| 6488 * first highlighted character. The stop-highlighting code must | |
| 6489 * be written with the cursor just after the last highlighted | |
| 6490 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6491 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6492 * to clear the rest of the line, and force redrawing it |
| 6493 * completely. | |
| 6494 */ | |
| 6495 if ( p_wiv | |
| 6496 && !force | |
| 6497 #ifdef FEAT_GUI | |
| 6498 && !gui.in_use | |
| 6499 #endif | |
| 6500 && ScreenAttrs[off_to] != 0 | |
| 6501 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6502 { | |
| 6503 /* | |
| 6504 * Need to remove highlighting attributes here. | |
| 6505 */ | |
| 6506 windgoto(row, col + coloff); | |
| 6507 out_str(T_CE); /* clear rest of this screen line */ | |
| 6508 screen_start(); /* don't know where cursor is now */ | |
| 6509 force = TRUE; /* force redraw of rest of the line */ | |
| 6510 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6511 | |
| 6512 /* | |
| 6513 * If the previous character was highlighted, need to stop | |
| 6514 * highlighting at this character. | |
| 6515 */ | |
| 6516 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6517 { | |
| 6518 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6519 term_windgoto(row, col + coloff); | |
| 6520 screen_stop_highlight(); | |
| 6521 } | |
| 6522 else | |
| 6523 screen_attr = 0; /* highlighting has stopped */ | |
| 6524 } | |
| 6525 if (enc_dbcs != 0) | |
| 6526 { | |
| 6527 /* Check if overwriting a double-byte with a single-byte or | |
| 6528 * the other way around requires another character to be | |
| 6529 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6530 * ScreenLinesUC[] is sufficient. */ | |
| 6531 if (char_cells == 1 | |
| 6532 && col + 1 < endcol | |
| 1378 | 6533 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6534 { |
| 6535 /* Writing a single-cell character over a double-cell | |
| 6536 * character: need to redraw the next cell. */ | |
| 6537 ScreenLines[off_to + 1] = 0; | |
| 6538 redraw_next = TRUE; | |
| 6539 } | |
| 6540 else if (char_cells == 2 | |
| 6541 && col + 2 < endcol | |
| 1378 | 6542 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6543 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6544 { |
| 6545 /* Writing the second half of a double-cell character over | |
| 6546 * a double-cell character: need to redraw the second | |
| 6547 * cell. */ | |
| 6548 ScreenLines[off_to + 2] = 0; | |
| 6549 redraw_next = TRUE; | |
| 6550 } | |
| 6551 | |
| 6552 if (enc_dbcs == DBCS_JPNU) | |
| 6553 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6554 } | |
| 6555 /* When writing a single-width character over a double-width | |
| 6556 * character and at the end of the redrawn text, need to clear out | |
| 6557 * the right halve of the old character. | |
| 6558 * Also required when writing the right halve of a double-width | |
| 6559 * char over the left halve of an existing one. */ | |
| 6560 if (has_mbyte && col + char_cells == endcol | |
| 6561 && ((char_cells == 1 | |
| 1378 | 6562 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6563 || (char_cells == 2 |
| 1378 | 6564 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6565 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6566 clear_next = TRUE; |
| 6567 | |
| 6568 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6569 if (enc_utf8) | |
| 6570 { | |
| 6571 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6572 if (ScreenLinesUC[off_from] != 0) | |
| 6573 { | |
| 714 | 6574 int i; |
| 6575 | |
| 6576 for (i = 0; i < Screen_mco; ++i) | |
| 6577 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6578 } |
| 6579 } | |
| 6580 if (char_cells == 2) | |
| 6581 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6582 | |
| 6583 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6584 /* The bold trick makes a single column of pixels appear in the |
| 6585 * next character. When a bold character is removed, the next | |
| 7 | 6586 * character should be redrawn too. This happens for our own GUI |
| 6587 * and for some xterms. */ | |
| 6588 if ( | |
| 6589 # ifdef FEAT_GUI | |
| 6590 gui.in_use | |
| 6591 # endif | |
| 6592 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6593 || | |
| 6594 # endif | |
| 6595 # ifdef UNIX | |
| 6596 term_is_xterm | |
| 6597 # endif | |
| 6598 ) | |
| 6599 { | |
| 6600 hl = ScreenAttrs[off_to]; | |
| 743 | 6601 if (hl > HL_ALL) |
| 6602 hl = syn_attr2attr(hl); | |
| 6603 if (hl & HL_BOLD) | |
| 7 | 6604 redraw_next = TRUE; |
| 6605 } | |
| 6606 #endif | |
| 6607 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6608 |
| 819 | 6609 /* For simplicity set the attributes of second half of a |
| 6610 * double-wide character equal to the first half. */ | |
| 6611 if (char_cells == 2) | |
| 6612 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6613 | |
| 7 | 6614 if (enc_dbcs != 0 && char_cells == 2) |
| 6615 screen_char_2(off_to, row, col + coloff); | |
| 6616 else | |
| 6617 screen_char(off_to, row, col + coloff); | |
| 6618 } | |
| 6619 else if ( p_wiv | |
| 6620 #ifdef FEAT_GUI | |
| 6621 && !gui.in_use | |
| 6622 #endif | |
| 6623 && col + coloff > 0) | |
| 6624 { | |
| 6625 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6626 { | |
| 6627 /* | |
| 6628 * Don't output stop-highlight when moving the cursor, it will | |
| 6629 * stop the highlighting when it should continue. | |
| 6630 */ | |
| 6631 screen_attr = 0; | |
| 6632 } | |
| 6633 else if (screen_attr != 0) | |
| 6634 screen_stop_highlight(); | |
| 6635 } | |
| 6636 | |
| 6637 off_to += CHAR_CELLS; | |
| 6638 off_from += CHAR_CELLS; | |
| 6639 col += CHAR_CELLS; | |
| 6640 } | |
| 6641 | |
| 6642 if (clear_next) | |
| 6643 { | |
| 6644 /* Clear the second half of a double-wide character of which the left | |
| 6645 * half was overwritten with a single-wide character. */ | |
| 6646 ScreenLines[off_to] = ' '; | |
| 6647 if (enc_utf8) | |
| 6648 ScreenLinesUC[off_to] = 0; | |
| 6649 screen_char(off_to, row, col + coloff); | |
| 6650 } | |
| 6651 | |
| 6652 if (clear_width > 0 | |
| 6653 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6654 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6655 #endif |
| 6656 ) | |
| 6657 { | |
| 6658 #ifdef FEAT_GUI | |
| 6659 int startCol = col; | |
| 6660 #endif | |
| 6661 | |
| 6662 /* blank out the rest of the line */ | |
| 6663 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6664 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6665 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6666 { |
| 6667 ++off_to; | |
| 6668 ++col; | |
| 6669 } | |
| 6670 if (col < clear_width) | |
| 6671 { | |
| 6672 #ifdef FEAT_GUI | |
| 6673 /* | |
| 6674 * In the GUI, clearing the rest of the line may leave pixels | |
| 6675 * behind if the first character cleared was bold. Some bold | |
| 6676 * fonts spill over the left. In this case we redraw the previous | |
| 6677 * character too. If we didn't skip any blanks above, then we | |
| 6678 * only redraw if the character wasn't already redrawn anyway. | |
| 6679 */ | |
| 996 | 6680 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6681 { |
| 6682 hl = ScreenAttrs[off_to]; | |
| 6683 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6684 { |
| 6685 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6686 |
| 996 | 6687 if (enc_utf8) |
| 6688 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6689 * that its width is 2. */ | |
| 6690 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6691 else if (enc_dbcs != 0) | |
| 6692 { | |
| 6693 /* find previous character by counting from first | |
| 6694 * column and get its width. */ | |
| 6695 unsigned off = LineOffset[row]; | |
| 1378 | 6696 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6697 |
| 6698 while (off < off_to) | |
| 6699 { | |
| 1378 | 6700 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6701 off += prev_cells; |
| 6702 } | |
| 6703 } | |
| 6704 | |
| 6705 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6706 screen_char_2(off_to - prev_cells, row, | |
| 6707 col + coloff - prev_cells); | |
| 6708 else | |
| 6709 screen_char(off_to - prev_cells, row, | |
| 6710 col + coloff - prev_cells); | |
| 6711 } | |
| 7 | 6712 } |
| 6713 #endif | |
| 6714 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6715 ' ', ' ', 0); | |
| 6716 off_to += clear_width - col; | |
| 6717 col = clear_width; | |
| 6718 } | |
| 6719 } | |
| 6720 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6721 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6722 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6723 && !(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
|
6724 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6725 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6726 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6727 // For a window that has a right neighbor, draw the separator char |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6728 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6729 if (coloff + col < Columns) |
| 7 | 6730 { |
| 6731 int c; | |
| 6732 | |
| 6733 c = fillchar_vsep(&hl); | |
| 6477 | 6734 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6735 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6736 != (c >= 0x80 ? c : 0)) | |
| 7 | 6737 || ScreenAttrs[off_to] != hl) |
| 6738 { | |
| 6739 ScreenLines[off_to] = c; | |
| 6740 ScreenAttrs[off_to] = hl; | |
| 6741 if (enc_utf8) | |
| 6742 { | |
| 6743 if (c >= 0x80) | |
| 6744 { | |
| 6745 ScreenLinesUC[off_to] = c; | |
| 714 | 6746 ScreenLinesC[0][off_to] = 0; |
| 7 | 6747 } |
| 6748 else | |
| 6749 ScreenLinesUC[off_to] = 0; | |
| 6750 } | |
| 6751 screen_char(off_to, row, col + coloff); | |
| 6752 } | |
| 6753 } | |
| 6754 else | |
| 6755 LineWraps[row] = FALSE; | |
| 6756 } | |
| 6757 } | |
| 6758 | |
| 474 | 6759 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6760 /* |
| 474 | 6761 * Mirror text "str" for right-left displaying. |
| 6762 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6763 */ |
| 474 | 6764 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6765 rl_mirror(char_u *str) |
| 7 | 6766 { |
| 6767 char_u *p1, *p2; | |
| 6768 int t; | |
| 6769 | |
| 6770 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6771 { | |
| 6772 t = *p1; | |
| 6773 *p1 = *p2; | |
| 6774 *p2 = t; | |
| 6775 } | |
| 6776 } | |
| 6777 #endif | |
| 6778 | |
| 6779 /* | |
| 6780 * mark all status lines for redraw; used after first :cd | |
| 6781 */ | |
| 6782 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6783 status_redraw_all(void) |
| 7 | 6784 { |
| 6785 win_T *wp; | |
| 6786 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6787 FOR_ALL_WINDOWS(wp) |
| 7 | 6788 if (wp->w_status_height) |
| 6789 { | |
| 6790 wp->w_redr_status = TRUE; | |
| 6791 redraw_later(VALID); | |
| 6792 } | |
| 6793 } | |
| 6794 | |
| 6795 /* | |
| 6796 * mark all status lines of the current buffer for redraw | |
| 6797 */ | |
| 6798 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6799 status_redraw_curbuf(void) |
| 7 | 6800 { |
| 6801 win_T *wp; | |
| 6802 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6803 FOR_ALL_WINDOWS(wp) |
| 7 | 6804 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6805 { | |
| 6806 wp->w_redr_status = TRUE; | |
| 6807 redraw_later(VALID); | |
| 6808 } | |
| 6809 } | |
| 6810 | |
| 6811 /* | |
| 6812 * Redraw all status lines that need to be redrawn. | |
| 6813 */ | |
| 6814 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6815 redraw_statuslines(void) |
| 7 | 6816 { |
| 6817 win_T *wp; | |
| 6818 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6819 FOR_ALL_WINDOWS(wp) |
| 7 | 6820 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
|
6821 win_redr_status(wp, FALSE); |
| 673 | 6822 if (redraw_tabline) |
| 677 | 6823 draw_tabline(); |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6824 |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6825 #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
|
6826 // Display popup windows on top of the status lines. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6827 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6828 #endif |
| 7 | 6829 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6830 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6831 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6832 /* |
| 6833 * Redraw all status lines at the bottom of frame "frp". | |
| 6834 */ | |
| 6835 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6836 win_redraw_last_status(frame_T *frp) |
| 7 | 6837 { |
| 6838 if (frp->fr_layout == FR_LEAF) | |
| 6839 frp->fr_win->w_redr_status = TRUE; | |
| 6840 else if (frp->fr_layout == FR_ROW) | |
| 6841 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6842 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6843 win_redraw_last_status(frp); |
| 6844 } | |
| 6845 else /* frp->fr_layout == FR_COL */ | |
| 6846 { | |
| 6847 frp = frp->fr_child; | |
| 6848 while (frp->fr_next != NULL) | |
| 6849 frp = frp->fr_next; | |
| 6850 win_redraw_last_status(frp); | |
| 6851 } | |
| 6852 } | |
| 6853 #endif | |
| 6854 | |
| 6855 /* | |
| 6856 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6857 */ | |
| 6858 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6859 draw_vsep_win(win_T *wp, int row) |
| 7 | 6860 { |
| 6861 int hl; | |
| 6862 int c; | |
| 6863 | |
| 6864 if (wp->w_vsep_width) | |
| 6865 { | |
| 6866 /* draw the vertical separator right of this window */ | |
| 6867 c = fillchar_vsep(&hl); | |
| 6868 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6869 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6870 c, ' ', hl); | |
| 6871 } | |
| 6872 } | |
| 6873 | |
| 6874 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6875 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6876 |
| 6877 /* | |
| 1378 | 6878 * Get the length of an item as it will be shown in the status line. |
| 7 | 6879 */ |
| 6880 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6881 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6882 { |
| 6883 int len = 0; | |
| 6884 | |
| 6885 #ifdef FEAT_MENU | |
| 6886 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6887 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6888 | |
| 6889 /* Check for menu separators - replace with '|'. */ | |
| 6890 if (emenu && menu_is_separator(s)) | |
| 6891 return 1; | |
| 6892 #endif | |
| 6893 | |
| 6894 while (*s != NUL) | |
| 6895 { | |
| 1685 | 6896 s += skip_status_match_char(xp, s); |
| 42 | 6897 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6898 MB_PTR_ADV(s); |
| 7 | 6899 } |
| 6900 | |
| 6901 return len; | |
| 6902 } | |
| 6903 | |
| 6904 /* | |
| 1685 | 6905 * Return the number of characters that should be skipped in a status match. |
| 277 | 6906 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6907 */ | |
| 6908 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6909 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6910 { |
| 1685 | 6911 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6912 #ifdef FEAT_MENU |
| 6913 || ((xp->xp_context == EXPAND_MENUS | |
| 6914 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6915 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6916 #endif | |
| 1685 | 6917 ) |
| 6918 { | |
| 6919 #ifndef BACKSLASH_IN_FILENAME | |
| 6920 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6921 return 2; | |
| 6922 #endif | |
| 6923 return 1; | |
| 6924 } | |
| 6925 return 0; | |
| 277 | 6926 } |
| 6927 | |
| 6928 /* | |
| 7 | 6929 * Show wildchar matches in the status line. |
| 6930 * Show at least the "match" item. | |
| 6931 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6932 * | |
| 6933 * If inversion is possible we use it. Else '=' characters are used. | |
| 6934 */ | |
| 6935 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6936 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6937 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6938 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6939 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6940 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6941 int showtail) |
| 7 | 6942 { |
| 6943 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6944 int row; | |
| 6945 char_u *buf; | |
| 6946 int len; | |
| 1378 | 6947 int clen; /* length in screen cells */ |
| 7 | 6948 int fillchar; |
| 6949 int attr; | |
| 6950 int i; | |
| 6951 int highlight = TRUE; | |
| 6952 char_u *selstart = NULL; | |
| 6953 int selstart_col = 0; | |
| 6954 char_u *selend = NULL; | |
| 6955 static int first_match = 0; | |
| 6956 int add_left = FALSE; | |
| 6957 char_u *s; | |
| 6958 #ifdef FEAT_MENU | |
| 6959 int emenu; | |
| 6960 #endif | |
| 6961 int l; | |
| 6962 | |
| 6963 if (matches == NULL) /* interrupted completion? */ | |
| 6964 return; | |
| 6965 | |
| 39 | 6966 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
|
6967 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6968 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
|
6969 buf = alloc(Columns + 1); |
| 7 | 6970 if (buf == NULL) |
| 6971 return; | |
| 6972 | |
| 6973 if (match == -1) /* don't show match but original text */ | |
| 6974 { | |
| 6975 match = 0; | |
| 6976 highlight = FALSE; | |
| 6977 } | |
| 6978 /* count 1 for the ending ">" */ | |
| 6979 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6980 if (match == 0) | |
| 6981 first_match = 0; | |
| 6982 else if (match < first_match) | |
| 6983 { | |
| 6984 /* jumping left, as far as we can go */ | |
| 6985 first_match = match; | |
| 6986 add_left = TRUE; | |
| 6987 } | |
| 6988 else | |
| 6989 { | |
| 6990 /* check if match fits on the screen */ | |
| 6991 for (i = first_match; i < match; ++i) | |
| 6992 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6993 if (first_match > 0) | |
| 6994 clen += 2; | |
| 6995 /* jumping right, put match at the left */ | |
| 6996 if ((long)clen > Columns) | |
| 6997 { | |
| 6998 first_match = match; | |
| 6999 /* if showing the last match, we can add some on the left */ | |
| 7000 clen = 2; | |
| 7001 for (i = match; i < num_matches; ++i) | |
| 7002 { | |
| 7003 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 7004 if ((long)clen >= Columns) | |
| 7005 break; | |
| 7006 } | |
| 7007 if (i == num_matches) | |
| 7008 add_left = TRUE; | |
| 7009 } | |
| 7010 } | |
| 7011 if (add_left) | |
| 7012 while (first_match > 0) | |
| 7013 { | |
| 7014 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 7015 if ((long)clen >= Columns) | |
| 7016 break; | |
| 7017 --first_match; | |
| 7018 } | |
| 7019 | |
|
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
|
7020 fillchar = fillchar_status(&attr, curwin); |
| 7 | 7021 |
| 7022 if (first_match == 0) | |
| 7023 { | |
| 7024 *buf = NUL; | |
| 7025 len = 0; | |
| 7026 } | |
| 7027 else | |
| 7028 { | |
| 7029 STRCPY(buf, "< "); | |
| 7030 len = 2; | |
| 7031 } | |
| 7032 clen = len; | |
| 7033 | |
| 7034 i = first_match; | |
| 7035 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 7036 { | |
| 7037 if (i == match) | |
| 7038 { | |
| 7039 selstart = buf + len; | |
| 7040 selstart_col = clen; | |
| 7041 } | |
| 7042 | |
| 7043 s = L_MATCH(i); | |
| 7044 /* Check for menu separators - replace with '|' */ | |
| 7045 #ifdef FEAT_MENU | |
| 7046 emenu = (xp->xp_context == EXPAND_MENUS | |
| 7047 || xp->xp_context == EXPAND_MENUNAMES); | |
| 7048 if (emenu && menu_is_separator(s)) | |
| 7049 { | |
| 7050 STRCPY(buf + len, transchar('|')); | |
| 7051 l = (int)STRLEN(buf + len); | |
| 7052 len += l; | |
| 7053 clen += l; | |
| 7054 } | |
| 7055 else | |
| 7056 #endif | |
| 7057 for ( ; *s != NUL; ++s) | |
| 7058 { | |
| 1685 | 7059 s += skip_status_match_char(xp, s); |
| 7 | 7060 clen += ptr2cells(s); |
| 474 | 7061 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 7062 { |
| 7063 STRNCPY(buf + len, s, l); | |
| 7064 s += l - 1; | |
| 7065 len += l; | |
| 7066 } | |
| 7067 else | |
| 7068 { | |
| 7069 STRCPY(buf + len, transchar_byte(*s)); | |
| 7070 len += (int)STRLEN(buf + len); | |
| 7071 } | |
| 7072 } | |
| 7073 if (i == match) | |
| 7074 selend = buf + len; | |
| 7075 | |
| 7076 *(buf + len++) = ' '; | |
| 7077 *(buf + len++) = ' '; | |
| 7078 clen += 2; | |
| 7079 if (++i == num_matches) | |
| 7080 break; | |
| 7081 } | |
| 7082 | |
| 7083 if (i != num_matches) | |
| 7084 { | |
| 7085 *(buf + len++) = '>'; | |
| 7086 ++clen; | |
| 7087 } | |
| 7088 | |
| 7089 buf[len] = NUL; | |
| 7090 | |
| 7091 row = cmdline_row - 1; | |
| 7092 if (row >= 0) | |
| 7093 { | |
| 7094 if (wild_menu_showing == 0) | |
| 7095 { | |
| 7096 if (msg_scrolled > 0) | |
| 7097 { | |
| 7098 /* Put the wildmenu just above the command line. If there is | |
| 7099 * no room, scroll the screen one line up. */ | |
| 7100 if (cmdline_row == Rows - 1) | |
| 7101 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
7102 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 7103 ++msg_scrolled; |
| 7104 } | |
| 7105 else | |
| 7106 { | |
| 7107 ++cmdline_row; | |
| 7108 ++row; | |
| 7109 } | |
| 7110 wild_menu_showing = WM_SCROLLED; | |
| 7111 } | |
| 7112 else | |
| 7113 { | |
| 7114 /* Create status line if needed by setting 'laststatus' to 2. | |
| 7115 * Set 'winminheight' to zero to avoid that the window is | |
| 7116 * resized. */ | |
| 7117 if (lastwin->w_status_height == 0) | |
| 7118 { | |
| 7119 save_p_ls = p_ls; | |
| 7120 save_p_wmh = p_wmh; | |
| 7121 p_ls = 2; | |
| 7122 p_wmh = 0; | |
| 7123 last_status(FALSE); | |
| 7124 } | |
| 7125 wild_menu_showing = WM_SHOWN; | |
| 7126 } | |
| 7127 } | |
| 7128 | |
| 7129 screen_puts(buf, row, 0, attr); | |
| 7130 if (selstart != NULL && highlight) | |
| 7131 { | |
| 7132 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7133 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 7134 } |
| 7135 | |
| 7136 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 7137 } | |
| 7138 | |
| 7139 win_redraw_last_status(topframe); | |
| 7140 vim_free(buf); | |
| 7141 } | |
| 7142 #endif | |
| 7143 | |
| 7144 /* | |
| 7145 * Redraw the status line of window wp. | |
| 7146 * | |
| 7147 * 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
|
7148 * 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
|
7149 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7150 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7151 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7152 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7153 { |
| 7154 int row; | |
| 7155 char_u *p; | |
| 7156 int len; | |
| 7157 int fillchar; | |
| 7158 int attr; | |
| 7159 int this_ru_col; | |
| 1910 | 7160 static int busy = FALSE; |
| 7161 | |
| 7162 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7163 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7164 if (busy) | |
| 7165 return; | |
| 7166 busy = TRUE; | |
| 7 | 7167 |
| 7168 wp->w_redr_status = FALSE; | |
| 7169 if (wp->w_status_height == 0) | |
| 7170 { | |
| 7171 /* no status line, can only be last window */ | |
| 7172 redraw_cmdline = TRUE; | |
| 7173 } | |
| 540 | 7174 else if (!redrawing() |
| 7175 #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
|
7176 // 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
|
7177 // 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
|
7178 || (!ignore_pum && pum_visible()) |
| 540 | 7179 #endif |
| 7180 ) | |
| 7 | 7181 { |
| 7182 /* Don't redraw right now, do it later. */ | |
| 7183 wp->w_redr_status = TRUE; | |
| 7184 } | |
| 7185 #ifdef FEAT_STL_OPT | |
| 40 | 7186 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7187 { |
| 7188 /* redraw custom status line */ | |
| 1983 | 7189 redraw_custom_statusline(wp); |
| 7 | 7190 } |
| 7191 #endif | |
| 7192 else | |
| 7193 { | |
|
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
|
7194 fillchar = fillchar_status(&attr, wp); |
| 7 | 7195 |
| 685 | 7196 get_trans_bufname(wp->w_buffer); |
| 7 | 7197 p = NameBuff; |
| 7198 len = (int)STRLEN(p); | |
| 7199 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7200 if (bt_help(wp->w_buffer) |
| 7 | 7201 #ifdef FEAT_QUICKFIX |
| 7202 || wp->w_p_pvw | |
| 7203 #endif | |
| 7204 || bufIsChanged(wp->w_buffer) | |
| 7205 || wp->w_buffer->b_p_ro) | |
| 7206 *(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
|
7207 if (bt_help(wp->w_buffer)) |
| 7 | 7208 { |
| 809 | 7209 STRCPY(p + len, _("[Help]")); |
| 7 | 7210 len += (int)STRLEN(p + len); |
| 7211 } | |
| 7212 #ifdef FEAT_QUICKFIX | |
| 7213 if (wp->w_p_pvw) | |
| 7214 { | |
| 7215 STRCPY(p + len, _("[Preview]")); | |
| 7216 len += (int)STRLEN(p + len); | |
| 7217 } | |
| 7218 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7219 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
|
7220 #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
|
7221 && !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
|
7222 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7223 ) |
| 7 | 7224 { |
| 7225 STRCPY(p + len, "[+]"); | |
| 7226 len += 3; | |
| 7227 } | |
| 7228 if (wp->w_buffer->b_p_ro) | |
| 7229 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7230 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
|
7231 len += (int)STRLEN(p + len); |
| 7 | 7232 } |
| 7233 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7234 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
|
7235 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
|
7236 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7237 if (this_ru_col <= 1) |
| 7238 { | |
| 7239 p = (char_u *)"<"; /* No room for file name! */ | |
| 7240 len = 1; | |
| 7241 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7242 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7243 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7244 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7245 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7246 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7247 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7248 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7249 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7250 * 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
|
7251 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
|
7252 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7253 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7254 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7255 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7256 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7257 p = p + i - 1; |
| 7 | 7258 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7259 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7260 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7261 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7262 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7263 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7264 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7265 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7266 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7267 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7268 } |
| 7 | 7269 |
| 7270 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
|
7271 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
|
7272 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
|
7273 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7274 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7275 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7276 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7277 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
|
7278 - 1 + wp->w_wincol), attr); |
| 7 | 7279 |
| 7280 #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
|
7281 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7282 #endif |
| 7283 } | |
| 7284 | |
| 7285 /* | |
| 7286 * May need to draw the character below the vertical separator. | |
| 7287 */ | |
| 7288 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7289 { | |
| 7290 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
|
7291 fillchar = fillchar_status(&attr, wp); |
| 7 | 7292 else |
| 7293 fillchar = fillchar_vsep(&attr); | |
| 7294 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7295 attr); | |
| 7296 } | |
| 1910 | 7297 busy = FALSE; |
| 7 | 7298 } |
| 7299 | |
| 680 | 7300 #ifdef FEAT_STL_OPT |
| 7301 /* | |
| 7302 * Redraw the status line according to 'statusline' and take care of any | |
| 7303 * errors encountered. | |
| 7304 */ | |
| 7305 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7306 redraw_custom_statusline(win_T *wp) |
| 680 | 7307 { |
| 1983 | 7308 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7309 int saved_did_emsg = did_emsg; |
| 1983 | 7310 |
| 7311 /* When called recursively return. This can happen when the statusline | |
| 7312 * contains an expression that triggers a redraw. */ | |
| 7313 if (entered) | |
| 7314 return; | |
| 7315 entered = TRUE; | |
| 680 | 7316 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7317 did_emsg = FALSE; |
| 680 | 7318 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7319 if (did_emsg) |
| 1983 | 7320 { |
| 7321 /* When there is an error disable the statusline, otherwise the | |
| 7322 * display is messed up with errors and a redraw triggers the problem | |
| 7323 * again and again. */ | |
| 680 | 7324 set_string_option_direct((char_u *)"statusline", -1, |
| 7325 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7326 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7327 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7328 did_emsg |= saved_did_emsg; |
| 1983 | 7329 entered = FALSE; |
| 680 | 7330 } |
| 7331 #endif | |
| 7332 | |
| 7 | 7333 /* |
| 7334 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7335 * line of the window right of it. If not, then it's a vertical separator. | |
| 7336 * Only call if (wp->w_vsep_width != 0). | |
| 7337 */ | |
| 7338 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7339 stl_connected(win_T *wp) |
| 7 | 7340 { |
| 7341 frame_T *fr; | |
| 7342 | |
| 7343 fr = wp->w_frame; | |
| 7344 while (fr->fr_parent != NULL) | |
| 7345 { | |
| 7346 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7347 { | |
| 7348 if (fr->fr_next != NULL) | |
| 7349 break; | |
| 7350 } | |
| 7351 else | |
| 7352 { | |
| 7353 if (fr->fr_next != NULL) | |
| 7354 return TRUE; | |
| 7355 } | |
| 7356 fr = fr->fr_parent; | |
| 7357 } | |
| 7358 return FALSE; | |
| 7359 } | |
| 7360 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7361 |
| 7 | 7362 /* |
| 7363 * Get the value to show for the language mappings, active 'keymap'. | |
| 7364 */ | |
| 7365 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7366 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7367 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7368 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
|
7369 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
|
7370 int len) /* length of buffer */ |
| 7 | 7371 { |
| 7372 char_u *p; | |
| 7373 | |
| 7374 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7375 return FALSE; | |
| 7376 | |
| 7377 { | |
| 7378 #ifdef FEAT_EVAL | |
| 7379 buf_T *old_curbuf = curbuf; | |
| 7380 win_T *old_curwin = curwin; | |
| 7381 char_u *s; | |
| 7382 | |
| 7383 curbuf = wp->w_buffer; | |
| 7384 curwin = wp; | |
| 7385 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7386 ++emsg_skip; | |
| 714 | 7387 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7388 --emsg_skip; |
| 7389 curbuf = old_curbuf; | |
| 7390 curwin = old_curwin; | |
| 7391 if (p == NULL || *p == NUL) | |
| 7392 #endif | |
| 7393 { | |
| 7394 #ifdef FEAT_KEYMAP | |
| 7395 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7396 p = wp->w_buffer->b_p_keymap; | |
| 7397 else | |
| 7398 #endif | |
| 7399 p = (char_u *)"lang"; | |
| 7400 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7401 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7402 buf[0] = NUL; |
| 7403 #ifdef FEAT_EVAL | |
| 7404 vim_free(s); | |
| 7405 #endif | |
| 7406 } | |
| 7407 return buf[0] != NUL; | |
| 7408 } | |
| 7409 | |
| 7410 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7411 /* | |
| 677 | 7412 * Redraw the status line or ruler of window "wp". |
| 7413 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7414 */ |
| 7415 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7416 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7417 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7418 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7419 { |
| 5539 | 7420 static int entered = FALSE; |
| 7 | 7421 int attr; |
| 7422 int curattr; | |
| 7423 int row; | |
| 7424 int col = 0; | |
| 7425 int maxwidth; | |
| 7426 int width; | |
| 7427 int n; | |
| 7428 int len; | |
| 7429 int fillchar; | |
| 7430 char_u buf[MAXPATHL]; | |
| 1983 | 7431 char_u *stl; |
| 7 | 7432 char_u *p; |
| 681 | 7433 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7434 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7435 int use_sandbox = FALSE; |
| 2693 | 7436 win_T *ewp; |
| 7437 int p_crb_save; | |
| 7 | 7438 |
| 5539 | 7439 /* There is a tiny chance that this gets called recursively: When |
| 7440 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7441 * Avoid trouble by not allowing recursion. */ | |
| 7442 if (entered) | |
| 7443 return; | |
| 7444 entered = TRUE; | |
| 7445 | |
| 7 | 7446 /* setup environment for the task at hand */ |
| 677 | 7447 if (wp == NULL) |
| 7448 { | |
| 7449 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7450 stl = p_tal; |
| 677 | 7451 row = 0; |
| 707 | 7452 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7453 attr = HL_ATTR(HLF_TPF); |
| 677 | 7454 maxwidth = Columns; |
| 7455 # ifdef FEAT_EVAL | |
| 681 | 7456 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7457 # endif |
| 7458 } | |
| 40 | 7459 else |
| 677 | 7460 { |
| 7461 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
|
7462 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
|
7463 maxwidth = wp->w_width; |
| 677 | 7464 |
| 7465 if (draw_ruler) | |
| 7466 { | |
| 1983 | 7467 stl = p_ruf; |
| 677 | 7468 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7469 if (*stl == '%') |
| 7470 { | |
| 7471 if (*++stl == '-') | |
| 7472 stl++; | |
| 7473 if (atoi((char *)stl)) | |
| 7474 while (VIM_ISDIGIT(*stl)) | |
| 7475 stl++; | |
| 7476 if (*stl++ != '(') | |
| 7477 stl = p_ruf; | |
| 677 | 7478 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7479 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
|
7480 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
|
7481 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
|
7482 maxwidth = wp->w_width - col; |
| 677 | 7483 if (!wp->w_status_height) |
| 7484 { | |
| 7485 row = Rows - 1; | |
| 7486 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7487 fillchar = ' '; | |
| 7488 attr = 0; | |
| 7489 } | |
| 7490 | |
| 7491 # ifdef FEAT_EVAL | |
| 681 | 7492 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7493 # endif |
| 7494 } | |
| 7495 else | |
| 7496 { | |
| 7497 if (*wp->w_p_stl != NUL) | |
| 1983 | 7498 stl = wp->w_p_stl; |
| 677 | 7499 else |
| 1983 | 7500 stl = p_stl; |
| 677 | 7501 # ifdef FEAT_EVAL |
| 681 | 7502 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7503 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7504 # endif |
| 7505 } | |
| 7506 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7507 col += wp->w_wincol; |
| 677 | 7508 } |
| 7509 | |
| 7 | 7510 if (maxwidth <= 0) |
| 5539 | 7511 goto theend; |
| 677 | 7512 |
| 2693 | 7513 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7514 * the cursor away and back. */ | |
| 7515 ewp = wp == NULL ? curwin : wp; | |
| 7516 p_crb_save = ewp->w_p_crb; | |
| 7517 ewp->w_p_crb = FALSE; | |
| 7518 | |
| 1983 | 7519 /* Make a copy, because the statusline may include a function call that |
| 7520 * might change the option value and free the memory. */ | |
| 7521 stl = vim_strsave(stl); | |
| 2693 | 7522 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7523 stl, use_sandbox, |
| 681 | 7524 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7525 vim_free(stl); |
| 2693 | 7526 ewp->w_p_crb = p_crb_save; |
| 2661 | 7527 |
| 7528 /* Make all characters printable. */ | |
| 7529 p = transstr(buf); | |
| 7530 if (p != NULL) | |
| 7531 { | |
| 7532 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7533 vim_free(p); | |
| 7534 } | |
| 7535 | |
| 7536 /* fill up with "fillchar" */ | |
| 835 | 7537 len = (int)STRLEN(buf); |
| 1883 | 7538 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7539 { |
| 7540 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7541 ++width; | |
| 7542 } | |
| 7543 buf[len] = NUL; | |
| 7544 | |
| 681 | 7545 /* |
| 7546 * Draw each snippet with the specified highlighting. | |
| 7547 */ | |
| 7 | 7548 curattr = attr; |
| 7549 p = buf; | |
| 681 | 7550 for (n = 0; hltab[n].start != NULL; n++) |
| 7551 { | |
| 7552 len = (int)(hltab[n].start - p); | |
| 7 | 7553 screen_puts_len(p, len, row, col, curattr); |
| 7554 col += vim_strnsize(p, len); | |
| 681 | 7555 p = hltab[n].start; |
| 7556 | |
| 7557 if (hltab[n].userhl == 0) | |
| 7 | 7558 curattr = attr; |
| 681 | 7559 else if (hltab[n].userhl < 0) |
| 7560 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
|
7561 #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
|
7562 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
|
7563 && 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
|
7564 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
|
7565 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
|
7566 && 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
|
7567 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
|
7568 #endif |
| 680 | 7569 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7570 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7571 else |
| 681 | 7572 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7573 } |
| 7574 screen_puts(p, row, col, curattr); | |
| 681 | 7575 |
| 7576 if (wp == NULL) | |
| 7577 { | |
| 7578 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7579 col = 0; | |
| 7580 len = 0; | |
| 7581 p = buf; | |
| 7582 fillchar = 0; | |
| 7583 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7584 { | |
| 7585 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7586 while (col < len) | |
| 7587 TabPageIdxs[col++] = fillchar; | |
| 7588 p = tabtab[n].start; | |
| 7589 fillchar = tabtab[n].userhl; | |
| 7590 } | |
| 7591 while (col < Columns) | |
| 7592 TabPageIdxs[col++] = fillchar; | |
| 7593 } | |
| 5539 | 7594 |
| 7595 theend: | |
| 7596 entered = FALSE; | |
| 7 | 7597 } |
| 7598 | |
| 7599 #endif /* FEAT_STL_OPT */ | |
| 7600 | |
| 7601 /* | |
| 7602 * Output a single character directly to the screen and update ScreenLines. | |
| 7603 */ | |
| 7604 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7605 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7606 { |
| 3549 | 7607 char_u buf[MB_MAXBYTES + 1]; |
| 7608 | |
| 7609 if (has_mbyte) | |
| 7610 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7611 else | |
| 7612 { | |
| 7613 buf[0] = c; | |
| 7614 buf[1] = NUL; | |
| 7615 } | |
| 7 | 7616 screen_puts(buf, row, col, attr); |
| 7617 } | |
| 7618 | |
| 7619 /* | |
| 7620 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7621 * Also return its attribute in *attrp; | |
| 7622 */ | |
| 7623 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7624 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7625 { |
| 7626 unsigned off; | |
| 7627 | |
| 7628 /* safety check */ | |
| 7629 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7630 { | |
| 7631 off = LineOffset[row] + col; | |
| 7632 *attrp = ScreenAttrs[off]; | |
| 7633 bytes[0] = ScreenLines[off]; | |
| 7634 bytes[1] = NUL; | |
| 7635 | |
| 7636 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7637 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7638 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7639 { | |
| 7640 bytes[0] = ScreenLines[off]; | |
| 7641 bytes[1] = ScreenLines2[off]; | |
| 7642 bytes[2] = NUL; | |
| 7643 } | |
| 7644 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7645 { | |
| 7646 bytes[1] = ScreenLines[off + 1]; | |
| 7647 bytes[2] = NUL; | |
| 7648 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7649 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7650 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7651 |
| 714 | 7652 /* |
| 7653 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7654 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7655 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7656 */ |
| 7657 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7658 screen_comp_differs(int off, int *u8cc) |
| 714 | 7659 { |
| 7660 int i; | |
| 7661 | |
| 7662 for (i = 0; i < Screen_mco; ++i) | |
| 7663 { | |
| 7664 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7665 return TRUE; | |
| 7666 if (u8cc[i] == 0) | |
| 7667 break; | |
| 7668 } | |
| 7669 return FALSE; | |
| 7670 } | |
| 7671 | |
| 7 | 7672 /* |
| 7673 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7674 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7675 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7676 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7677 */ | |
| 7678 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7679 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7680 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7681 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7682 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7683 int attr) |
| 7 | 7684 { |
| 7685 screen_puts_len(text, -1, row, col, attr); | |
| 7686 } | |
| 7687 | |
| 7688 /* | |
| 7689 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7690 * a NUL. | |
| 7691 */ | |
| 7692 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7693 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7694 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7695 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7696 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7697 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7698 int attr) |
| 7 | 7699 { |
| 7700 unsigned off; | |
| 7701 char_u *ptr = text; | |
| 5923 | 7702 int len = textlen; |
| 7 | 7703 int c; |
| 1378 | 7704 unsigned max_off; |
| 7 | 7705 int mbyte_blen = 1; |
| 7706 int mbyte_cells = 1; | |
| 7707 int u8c = 0; | |
| 714 | 7708 int u8cc[MAX_MCO]; |
| 7 | 7709 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7710 #ifdef FEAT_ARABIC |
| 7 | 7711 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7712 int pc, nc, nc1; |
| 7713 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7714 #endif |
| 1843 | 7715 int force_redraw_this; |
| 7716 int force_redraw_next = FALSE; | |
| 7717 int need_redraw; | |
| 7 | 7718 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7719 // 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
|
7720 // #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
|
7721 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7722 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7723 || col >= screen_Columns || col < 0) |
| 7 | 7724 return; |
| 1843 | 7725 off = LineOffset[row] + col; |
| 7 | 7726 |
| 1668 | 7727 /* When drawing over the right halve of a double-wide char clear out the |
| 7728 * left halve. Only needed in a terminal. */ | |
| 1685 | 7729 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
|
7730 #ifdef FEAT_GUI |
| 1668 | 7731 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7732 #endif |
| 1668 | 7733 && mb_fix_col(col, row) != col) |
| 1843 | 7734 { |
| 7735 ScreenLines[off - 1] = ' '; | |
| 7736 ScreenAttrs[off - 1] = 0; | |
| 7737 if (enc_utf8) | |
| 7738 { | |
| 7739 ScreenLinesUC[off - 1] = 0; | |
| 7740 ScreenLinesC[0][off - 1] = 0; | |
| 7741 } | |
| 7742 /* redraw the previous cell, make it empty */ | |
| 7743 screen_char(off - 1, row, col - 1); | |
| 7744 /* force the cell at "col" to be redrawn */ | |
| 7745 force_redraw_next = TRUE; | |
| 7746 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7747 |
| 1378 | 7748 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7749 while (col < screen_Columns |
| 7750 && (len < 0 || (int)(ptr - text) < len) | |
| 7751 && *ptr != NUL) | |
| 7 | 7752 { |
| 7753 c = *ptr; | |
| 7754 /* check if this is the first byte of a multibyte */ | |
| 7755 if (has_mbyte) | |
| 7756 { | |
| 7757 if (enc_utf8 && len > 0) | |
| 474 | 7758 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7759 else |
| 474 | 7760 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7761 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7762 mbyte_cells = 1; | |
| 7763 else if (enc_dbcs != 0) | |
| 7764 mbyte_cells = mbyte_blen; | |
| 7765 else /* enc_utf8 */ | |
| 7766 { | |
| 7767 if (len >= 0) | |
| 714 | 7768 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7769 (int)((text + len) - ptr)); |
| 7770 else | |
| 714 | 7771 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7772 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7773 #ifdef FEAT_ARABIC |
| 7 | 7774 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7775 { | |
| 7776 /* Do Arabic shaping. */ | |
| 7777 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7778 { | |
| 7779 /* Past end of string to be displayed. */ | |
| 7780 nc = NUL; | |
| 7781 nc1 = NUL; | |
| 7782 } | |
| 7783 else | |
| 714 | 7784 { |
| 1994 | 7785 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7786 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7787 nc1 = pcc[0]; |
| 7788 } | |
| 7 | 7789 pc = prev_c; |
| 7790 prev_c = u8c; | |
| 714 | 7791 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7792 } |
| 7793 else | |
| 7794 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7795 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7796 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7797 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7798 /* 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
|
7799 * 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
|
7800 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7801 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7802 } |
| 7 | 7803 } |
| 7804 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7805 |
| 1843 | 7806 force_redraw_this = force_redraw_next; |
| 7807 force_redraw_next = FALSE; | |
| 7808 | |
| 7809 need_redraw = ScreenLines[off] != c | |
| 7 | 7810 || (mbyte_cells == 2 |
| 7811 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7812 || (enc_dbcs == DBCS_JPNU | |
| 7813 && c == 0x8e | |
| 7814 && ScreenLines2[off] != ptr[1]) | |
| 7815 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7816 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7817 (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
|
7818 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7819 && screen_comp_differs(off, u8cc)))) |
| 7 | 7820 || ScreenAttrs[off] != attr |
| 1843 | 7821 || exmode_active; |
| 7822 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7823 if (need_redraw || force_redraw_this) |
| 7 | 7824 { |
| 7825 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7826 /* The bold trick makes a single row of pixels appear in the next | |
| 7827 * character. When a bold character is removed, the next | |
| 7828 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7829 * and for some xterms. */ |
| 7830 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7831 # ifdef FEAT_GUI |
| 7832 gui.in_use | |
| 7833 # endif | |
| 7834 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7835 || | |
| 7836 # endif | |
| 7837 # ifdef UNIX | |
| 7838 term_is_xterm | |
| 7839 # endif | |
| 1843 | 7840 )) |
| 7841 { | |
| 7842 int n = ScreenAttrs[off]; | |
| 7843 | |
| 7844 if (n > HL_ALL) | |
| 7845 n = syn_attr2attr(n); | |
| 7846 if (n & HL_BOLD) | |
| 7847 force_redraw_next = TRUE; | |
| 7 | 7848 } |
| 7849 #endif | |
| 7850 /* When at the end of the text and overwriting a two-cell | |
| 7851 * character with a one-cell character, need to clear the next | |
| 7852 * cell. Also when overwriting the left halve of a two-cell char | |
| 7853 * with the right halve of a two-cell char. Do this only once | |
| 7854 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7855 if (clear_next_cell) | |
| 7856 clear_next_cell = FALSE; | |
| 7857 else if (has_mbyte | |
| 7858 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7859 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7860 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7861 || (mbyte_cells == 2 |
| 1378 | 7862 && (*mb_off2cells)(off, max_off) == 1 |
| 7863 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7864 clear_next_cell = TRUE; |
| 7865 | |
| 7866 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7867 * it confuses mb_off2cells(). */ | |
| 7868 if (enc_dbcs | |
| 1378 | 7869 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7870 || (mbyte_cells == 2 |
| 1378 | 7871 && (*mb_off2cells)(off, max_off) == 1 |
| 7872 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7873 ScreenLines[off + mbyte_blen] = 0; |
| 7874 ScreenLines[off] = c; | |
| 7875 ScreenAttrs[off] = attr; | |
| 7876 if (enc_utf8) | |
| 7877 { | |
| 714 | 7878 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7879 ScreenLinesUC[off] = 0; |
| 7880 else | |
| 7881 { | |
| 714 | 7882 int i; |
| 7883 | |
| 7 | 7884 ScreenLinesUC[off] = u8c; |
| 714 | 7885 for (i = 0; i < Screen_mco; ++i) |
| 7886 { | |
| 7887 ScreenLinesC[i][off] = u8cc[i]; | |
| 7888 if (u8cc[i] == 0) | |
| 7889 break; | |
| 7890 } | |
| 7 | 7891 } |
| 7892 if (mbyte_cells == 2) | |
| 7893 { | |
| 7894 ScreenLines[off + 1] = 0; | |
| 7895 ScreenAttrs[off + 1] = attr; | |
| 7896 } | |
| 7897 screen_char(off, row, col); | |
| 7898 } | |
| 7899 else if (mbyte_cells == 2) | |
| 7900 { | |
| 7901 ScreenLines[off + 1] = ptr[1]; | |
| 7902 ScreenAttrs[off + 1] = attr; | |
| 7903 screen_char_2(off, row, col); | |
| 7904 } | |
| 7905 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7906 { | |
| 7907 ScreenLines2[off] = ptr[1]; | |
| 7908 screen_char(off, row, col); | |
| 7909 } | |
| 7910 else | |
| 7911 screen_char(off, row, col); | |
| 7912 } | |
| 7913 if (has_mbyte) | |
| 7914 { | |
| 7915 off += mbyte_cells; | |
| 7916 col += mbyte_cells; | |
| 7917 ptr += mbyte_blen; | |
| 7918 if (clear_next_cell) | |
| 5923 | 7919 { |
| 7920 /* This only happens at the end, display one space next. */ | |
| 7 | 7921 ptr = (char_u *)" "; |
| 5923 | 7922 len = -1; |
| 7923 } | |
| 7 | 7924 } |
| 7925 else | |
| 7926 { | |
| 7927 ++off; | |
| 7928 ++col; | |
| 7929 ++ptr; | |
| 7930 } | |
| 7931 } | |
| 1843 | 7932 |
| 7933 /* If we detected the next character needs to be redrawn, but the text | |
| 7934 * doesn't extend up to there, update the character here. */ | |
| 7935 if (force_redraw_next && col < screen_Columns) | |
| 7936 { | |
| 7937 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7938 screen_char_2(off, row, col); | |
| 7939 else | |
| 7940 screen_char(off, row, col); | |
| 7941 } | |
| 7 | 7942 } |
| 7943 | |
| 7944 #ifdef FEAT_SEARCH_EXTRA | |
| 7945 /* | |
| 1326 | 7946 * Prepare for 'hlsearch' highlighting. |
| 7 | 7947 */ |
| 7948 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7949 start_search_hl(void) |
| 7 | 7950 { |
| 7951 if (p_hls && !no_hlsearch) | |
| 7952 { | |
| 7953 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
|
7954 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7955 # ifdef FEAT_RELTIME |
| 7956 /* Set the time limit to 'redrawtime'. */ | |
| 7957 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7958 # endif | |
| 7 | 7959 } |
| 7960 } | |
| 7961 | |
| 7962 /* | |
| 1326 | 7963 * Clean up for 'hlsearch' highlighting. |
| 7 | 7964 */ |
| 7965 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7966 end_search_hl(void) |
| 7 | 7967 { |
| 7968 if (search_hl.rm.regprog != NULL) | |
| 7969 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7970 vim_regfree(search_hl.rm.regprog); |
| 7 | 7971 search_hl.rm.regprog = NULL; |
| 7972 } | |
| 7973 } | |
| 7974 | |
| 7975 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7976 * 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
|
7977 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7978 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7979 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
|
7980 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7981 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7982 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7983 /* 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
|
7984 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7985 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7986 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7987 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7988 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7989 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7990 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7991 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7992 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
|
7993 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
|
7994 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7995 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7996 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7997 /* 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
|
7998 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
|
7999 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8000 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8001 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8002 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
|
8003 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8004 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8005 /* 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
|
8006 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8007 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
8008 /* |
| 7 | 8009 * Advance to the match in window "wp" line "lnum" or past it. |
| 8010 */ | |
| 8011 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8012 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 8013 { |
| 1326 | 8014 matchitem_T *cur; /* points to the match list */ |
| 8015 match_T *shl; /* points to search_hl or a match */ | |
| 8016 int shl_flag; /* flag to indicate whether search_hl | |
| 8017 has been processed or not */ | |
| 5979 | 8018 int pos_inprogress; /* marks that position match search is |
| 8019 in progress */ | |
| 7 | 8020 int n; |
| 8021 | |
| 8022 /* | |
| 8023 * When using a multi-line pattern, start searching at the top | |
| 8024 * of the window or just after a closed fold. | |
| 1326 | 8025 * Do this both for search_hl and the match list. |
| 7 | 8026 */ |
| 1326 | 8027 cur = wp->w_match_head; |
| 8028 shl_flag = FALSE; | |
| 8029 while (cur != NULL || shl_flag == FALSE) | |
| 8030 { | |
| 8031 if (shl_flag == FALSE) | |
| 8032 { | |
| 8033 shl = &search_hl; | |
| 8034 shl_flag = TRUE; | |
| 8035 } | |
| 8036 else | |
| 8037 shl = &cur->hl; | |
| 7 | 8038 if (shl->rm.regprog != NULL |
| 8039 && shl->lnum == 0 | |
| 8040 && re_multiline(shl->rm.regprog)) | |
| 8041 { | |
| 8042 if (shl->first_lnum == 0) | |
| 8043 { | |
| 8044 # ifdef FEAT_FOLDING | |
| 8045 for (shl->first_lnum = lnum; | |
| 8046 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 8047 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 8048 NULL, NULL, TRUE, NULL)) | |
| 8049 break; | |
| 8050 # else | |
| 8051 shl->first_lnum = wp->w_topline; | |
| 8052 # endif | |
| 8053 } | |
| 5979 | 8054 if (cur != NULL) |
| 8055 cur->pos.cur = 0; | |
| 8056 pos_inprogress = TRUE; | |
| 7 | 8057 n = 0; |
| 5979 | 8058 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 8059 || (cur != NULL && pos_inprogress))) | |
| 8060 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
8061 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
|
8062 shl == &search_hl ? NULL : cur); |
| 5979 | 8063 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 8064 ? FALSE : TRUE; | |
| 7 | 8065 if (shl->lnum != 0) |
| 8066 { | |
| 8067 shl->first_lnum = shl->lnum | |
| 8068 + shl->rm.endpos[0].lnum | |
| 8069 - shl->rm.startpos[0].lnum; | |
| 8070 n = shl->rm.endpos[0].col; | |
| 8071 } | |
| 8072 else | |
| 8073 { | |
| 8074 ++shl->first_lnum; | |
| 8075 n = 0; | |
| 8076 } | |
| 8077 } | |
| 8078 } | |
| 1326 | 8079 if (shl != &search_hl && cur != NULL) |
| 8080 cur = cur->next; | |
| 7 | 8081 } |
| 8082 } | |
| 8083 | |
| 8084 /* | |
| 1326 | 8085 * Search for a next 'hlsearch' or match. |
| 7 | 8086 * Uses shl->buf. |
| 8087 * Sets shl->lnum and shl->rm contents. | |
| 8088 * Note: Assumes a previous match is always before "lnum", unless | |
| 8089 * shl->lnum is zero. | |
| 8090 * Careful: Any pointers for buffer lines will become invalid. | |
| 8091 */ | |
| 8092 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8093 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8094 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8095 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
|
8096 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8097 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
|
8098 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8099 { |
| 8100 linenr_T l; | |
| 8101 colnr_T matchcol; | |
| 8102 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
|
8103 int save_called_emsg = called_emsg; |
| 7 | 8104 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8105 // 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
|
8106 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
|
8107 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8108 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
|
8109 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8110 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8111 |
| 7 | 8112 if (shl->lnum != 0) |
| 8113 { | |
| 8114 /* Check for three situations: | |
| 8115 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8116 * 2. If the previous match includes "mincol", use it. | |
| 8117 * 3. Continue after the previous match. | |
| 8118 */ | |
| 8119 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8120 if (lnum > l) | |
| 8121 shl->lnum = 0; | |
| 8122 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8123 return; | |
| 8124 } | |
| 8125 | |
| 8126 /* | |
| 8127 * Repeat searching for a match until one is found that includes "mincol" | |
| 8128 * or none is found in this line. | |
| 8129 */ | |
| 8130 called_emsg = FALSE; | |
| 8131 for (;;) | |
| 8132 { | |
| 1521 | 8133 #ifdef FEAT_RELTIME |
| 8134 /* Stop searching after passing the time limit. */ | |
| 8135 if (profile_passed_limit(&(shl->tm))) | |
| 8136 { | |
| 8137 shl->lnum = 0; /* no match found in time */ | |
| 8138 break; | |
| 8139 } | |
| 8140 #endif | |
| 7 | 8141 /* Three situations: |
| 8142 * 1. No useful previous match: search from start of line. | |
| 8143 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8144 * Break the loop if this is beyond the end of the line. | |
| 8145 * 3. Vi compatible searching: continue at end of previous match. | |
| 8146 */ | |
| 8147 if (shl->lnum == 0) | |
| 8148 matchcol = 0; | |
| 8149 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8150 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8151 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8152 { | |
| 688 | 8153 char_u *ml; |
| 685 | 8154 |
| 8155 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8156 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8157 if (*ml == NUL) |
| 8158 { | |
| 8159 ++matchcol; | |
| 7 | 8160 shl->lnum = 0; |
| 8161 break; | |
| 8162 } | |
| 685 | 8163 if (has_mbyte) |
| 8164 matchcol += mb_ptr2len(ml); | |
| 8165 else | |
| 8166 ++matchcol; | |
| 7 | 8167 } |
| 8168 else | |
| 8169 matchcol = shl->rm.endpos[0].col; | |
| 8170 | |
| 8171 shl->lnum = lnum; | |
| 5979 | 8172 if (shl->rm.regprog != NULL) |
| 8173 { | |
| 6394 | 8174 /* Remember whether shl->rm is using a copy of the regprog in |
| 8175 * cur->match. */ | |
| 8176 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8177 && shl == &cur->hl | |
| 8178 && 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
|
8179 int timed_out = FALSE; |
| 6394 | 8180 |
| 5979 | 8181 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8182 matchcol, | |
| 1521 | 8183 #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
|
8184 &(shl->tm), &timed_out |
| 1521 | 8185 #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
|
8186 NULL, NULL |
| 5979 | 8187 #endif |
| 8188 ); | |
| 6394 | 8189 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8190 if (regprog_is_copy) | |
| 8191 cur->match.regprog = cur->hl.rm.regprog; | |
| 8192 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8193 if (called_emsg || got_int || timed_out) |
| 5979 | 8194 { |
| 8195 /* Error while handling regexp: stop using this regexp. */ | |
| 8196 if (shl == &search_hl) | |
| 8197 { | |
| 8198 /* don't free regprog in the match list, it's a copy */ | |
| 8199 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
|
8200 set_no_hlsearch(TRUE); |
| 5979 | 8201 } |
| 8202 shl->rm.regprog = NULL; | |
| 8203 shl->lnum = 0; | |
| 8204 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8205 message */ | |
| 8206 break; | |
| 8207 } | |
| 8208 } | |
| 8209 else if (cur != NULL) | |
| 8210 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8211 else |
| 8212 nmatched = 0; | |
| 7 | 8213 if (nmatched == 0) |
| 8214 { | |
| 8215 shl->lnum = 0; /* no match found */ | |
| 8216 break; | |
| 8217 } | |
| 8218 if (shl->rm.startpos[0].lnum > 0 | |
| 8219 || shl->rm.startpos[0].col >= mincol | |
| 8220 || nmatched > 1 | |
| 8221 || shl->rm.endpos[0].col > mincol) | |
| 8222 { | |
| 8223 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8224 break; /* useful match found */ | |
| 8225 } | |
| 8226 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8227 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8228 // 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
|
8229 called_emsg = save_called_emsg; |
| 7 | 8230 } |
| 8231 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8232 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8233 * 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
|
8234 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8235 */ |
| 5979 | 8236 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8237 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8238 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
|
8239 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8240 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8241 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8242 { |
| 8243 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8244 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8245 |
| 5979 | 8246 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8247 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8248 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8249 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8250 if (pos->lnum == 0) |
| 5979 | 8251 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8252 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8253 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8254 if (pos->lnum == lnum) |
| 5979 | 8255 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8256 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8257 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8258 /* 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
|
8259 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8260 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
|
8261 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8262 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8263 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8264 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8265 posmatch->pos[found] = tmp; |
| 5979 | 8266 } |
| 8267 } | |
| 8268 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8269 found = i; |
| 5979 | 8270 } |
| 8271 } | |
| 8272 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8273 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8274 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8275 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
|
8276 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8277 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
|
8278 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8279 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8280 shl->lnum = lnum; |
| 5979 | 8281 shl->rm.startpos[0].lnum = 0; |
| 8282 shl->rm.startpos[0].col = start; | |
| 8283 shl->rm.endpos[0].lnum = 0; | |
| 8284 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
|
8285 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8286 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8287 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8288 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8289 return 0; |
| 5979 | 8290 } |
| 5985 | 8291 #endif |
| 5979 | 8292 |
| 7 | 8293 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8294 screen_start_highlight(int attr) |
| 7 | 8295 { |
| 8296 attrentry_T *aep = NULL; | |
| 8297 | |
| 8298 screen_attr = attr; | |
| 8299 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8300 #ifdef MSWIN |
| 7 | 8301 && termcap_active |
| 8302 #endif | |
| 8303 ) | |
| 8304 { | |
| 8305 #ifdef FEAT_GUI | |
| 8306 if (gui.in_use) | |
| 8307 { | |
| 8308 char buf[20]; | |
| 8309 | |
| 681 | 8310 /* The GUI handles this internally. */ |
| 8311 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8312 OUT_STR(buf); |
| 8313 } | |
| 8314 else | |
| 8315 #endif | |
| 8316 { | |
| 8317 if (attr > HL_ALL) /* special HL attr. */ | |
| 8318 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8319 if (IS_CTERM) |
| 7 | 8320 aep = syn_cterm_attr2entry(attr); |
| 8321 else | |
| 8322 aep = syn_term_attr2entry(attr); | |
| 8323 if (aep == NULL) /* did ":syntax clear" */ | |
| 8324 attr = 0; | |
| 8325 else | |
| 8326 attr = aep->ae_attr; | |
| 8327 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8328 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8329 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
|
8330 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
|
8331 #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
|
8332 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
|
8333 ? 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
|
8334 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8335 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8336 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8337 /* If the Normal FG color has BOLD attribute and the new HL |
| 8338 * has a FG color defined, clear BOLD. */ | |
| 8339 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
|
8340 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8341 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
|
8342 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
|
8343 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
|
8344 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
|
8345 || ((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
|
8346 && *T_US != NUL) |
| 7 | 8347 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
|
8348 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8349 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
|
8350 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8351 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
|
8352 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
|
8353 out_str(T_STS); |
| 7 | 8354 |
| 8355 /* | |
| 8356 * Output the color or start string after bold etc., in case the | |
| 8357 * bold etc. override the color setting. | |
| 8358 */ | |
| 8359 if (aep != NULL) | |
| 8360 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8361 #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
|
8362 /* 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
|
8363 * 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
|
8364 * 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
|
8365 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
|
8366 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8367 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
|
8368 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
|
8369 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8370 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8371 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8372 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
|
8373 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8374 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
|
8375 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
|
8376 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8377 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8378 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
|
8379 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8380 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
|
8381 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8382 } |
| 8383 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8384 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8385 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
|
8386 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8387 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
|
8388 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
|
8389 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8390 |
|
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
|
8391 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
|
8392 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8393 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
|
8394 out_str(aep->ae_u.term.start); |
| 7 | 8395 } |
| 8396 } | |
| 8397 } | |
| 8398 } | |
| 8399 } | |
| 8400 | |
| 8401 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8402 screen_stop_highlight(void) |
| 7 | 8403 { |
| 8404 int do_ME = FALSE; /* output T_ME code */ | |
| 8405 | |
| 8406 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
|
8407 #ifdef MSWIN |
| 7 | 8408 && termcap_active |
| 8409 #endif | |
| 8410 ) | |
| 8411 { | |
| 8412 #ifdef FEAT_GUI | |
| 8413 if (gui.in_use) | |
| 8414 { | |
| 8415 char buf[20]; | |
| 8416 | |
| 8417 /* use internal GUI code */ | |
| 8418 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8419 OUT_STR(buf); | |
| 8420 } | |
| 8421 else | |
| 8422 #endif | |
| 8423 { | |
| 8424 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8425 { | |
| 8426 attrentry_T *aep; | |
| 8427 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8428 if (IS_CTERM) |
| 7 | 8429 { |
| 8430 /* | |
| 8431 * Assume that t_me restores the original colors! | |
| 8432 */ | |
| 8433 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
|
8434 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8435 #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
|
8436 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
|
8437 ? 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
|
8438 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8439 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8440 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
|
8441 #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
|
8442 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
|
8443 ? 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
|
8444 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8445 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8446 aep->ae_u.cterm.bg_color))) |
| 7 | 8447 do_ME = TRUE; |
| 8448 } | |
| 8449 else | |
| 8450 { | |
| 8451 aep = syn_term_attr2entry(screen_attr); | |
| 8452 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8453 { | |
| 8454 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8455 do_ME = TRUE; | |
| 8456 else | |
| 8457 out_str(aep->ae_u.term.stop); | |
| 8458 } | |
| 8459 } | |
| 8460 if (aep == NULL) /* did ":syntax clear" */ | |
| 8461 screen_attr = 0; | |
| 8462 else | |
| 8463 screen_attr = aep->ae_attr; | |
| 8464 } | |
| 8465 | |
| 8466 /* | |
| 8467 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8468 * same sequence several times. | |
| 8469 */ | |
| 8470 if (screen_attr & HL_STANDOUT) | |
| 8471 { | |
| 8472 if (STRCMP(T_SE, T_ME) == 0) | |
| 8473 do_ME = TRUE; | |
| 8474 else | |
| 8475 out_str(T_SE); | |
| 8476 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8477 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
|
8478 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8479 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
|
8480 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8481 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8482 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
|
8483 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8484 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
|
8485 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8486 { |
| 8487 if (STRCMP(T_UE, T_ME) == 0) | |
| 8488 do_ME = TRUE; | |
| 8489 else | |
| 8490 out_str(T_UE); | |
| 8491 } | |
| 8492 if (screen_attr & HL_ITALIC) | |
| 8493 { | |
| 8494 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8495 do_ME = TRUE; | |
| 8496 else | |
| 8497 out_str(T_CZR); | |
| 8498 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8499 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8500 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8501 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
|
8502 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8503 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8504 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8505 } |
| 7 | 8506 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8507 out_str(T_ME); | |
| 8508 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8509 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8510 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8511 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8512 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
|
8513 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
|
8514 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
|
8515 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
|
8516 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8517 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8518 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8519 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8520 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8521 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8522 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8523 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8524 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
|
8525 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8526 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
|
8527 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8528 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8529 } |
| 7 | 8530 } |
| 8531 } | |
| 8532 } | |
| 8533 screen_attr = 0; | |
| 8534 } | |
| 8535 | |
| 8536 /* | |
| 8537 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8538 * The machine specific code may override this again. | |
| 8539 */ | |
| 8540 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8541 reset_cterm_colors(void) |
| 7 | 8542 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8543 if (IS_CTERM) |
| 7 | 8544 { |
| 8545 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8546 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8547 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
|
8548 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8549 : (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
|
8550 #else |
| 7 | 8551 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
|
8552 #endif |
| 7 | 8553 { |
| 8554 out_str(T_OP); | |
| 8555 screen_attr = -1; | |
| 8556 } | |
| 8557 if (cterm_normal_fg_bold) | |
| 8558 { | |
| 8559 out_str(T_ME); | |
| 8560 screen_attr = -1; | |
| 8561 } | |
| 8562 } | |
| 8563 } | |
| 8564 | |
| 8565 /* | |
| 8566 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8567 * using the attributes from ScreenAttrs["off"]. | |
| 8568 */ | |
| 8569 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8570 screen_char(unsigned off, int row, int col) |
| 7 | 8571 { |
| 8572 int attr; | |
| 8573 | |
| 8574 /* Check for illegal values, just in case (could happen just after | |
| 8575 * resizing). */ | |
| 8576 if (row >= screen_Rows || col >= screen_Columns) | |
| 8577 return; | |
| 8578 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8579 #ifdef FEAT_INS_EXPAND |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8580 if (pum_under_menu(row, col)) |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8581 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8582 #endif |
| 6602 | 8583 /* Outputting a character in the last cell on the screen may scroll the |
| 8584 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8585 * mark the character invalid (update it when scrolled up). */ | |
| 8586 if (*T_XN == NUL | |
| 8587 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8588 #ifdef FEAT_RIGHTLEFT |
| 8589 /* account for first command-line character in rightleft mode */ | |
| 8590 && !cmdmsg_rl | |
| 8591 #endif | |
| 8592 ) | |
| 8593 { | |
| 8594 ScreenAttrs[off] = (sattr_T)-1; | |
| 8595 return; | |
| 8596 } | |
| 8597 | |
| 8598 /* | |
| 8599 * Stop highlighting first, so it's easier to move the cursor. | |
| 8600 */ | |
| 8601 if (screen_char_attr != 0) | |
| 8602 attr = screen_char_attr; | |
| 8603 else | |
| 8604 attr = ScreenAttrs[off]; | |
| 8605 if (screen_attr != attr) | |
| 8606 screen_stop_highlight(); | |
| 8607 | |
| 8608 windgoto(row, col); | |
| 8609 | |
| 8610 if (screen_attr != attr) | |
| 8611 screen_start_highlight(attr); | |
| 8612 | |
| 8613 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8614 { | |
| 8615 char_u buf[MB_MAXBYTES + 1]; | |
| 8616 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8617 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
|
8618 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8619 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8620 #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
|
8621 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8622 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8623 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8624 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8625 /* 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
|
8626 * 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
|
8627 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
|
8628 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
|
8629 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8630 /* 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
|
8631 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8632 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
|
8633 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8634 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8635 ++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
|
8636 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8637 /* 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
|
8638 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
|
8639 out_str(buf); |
| 7 | 8640 } |
| 8641 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8642 { |
| 7 | 8643 out_flush_check(); |
| 8644 out_char(ScreenLines[off]); | |
| 8645 /* double-byte character in single-width cell */ | |
| 8646 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8647 out_char(ScreenLines2[off]); | |
| 8648 } | |
| 8649 | |
| 8650 screen_cur_col++; | |
| 8651 } | |
| 8652 | |
| 8653 /* | |
| 8654 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8655 * on the screen at position 'row' and 'col'. | |
| 8656 * The attributes of the first byte is used for all. This is required to | |
| 8657 * output the two bytes of a double-byte character with nothing in between. | |
| 8658 */ | |
| 8659 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8660 screen_char_2(unsigned off, int row, int col) |
| 7 | 8661 { |
| 8662 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8663 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8664 return; | |
| 8665 | |
| 8666 /* Outputting the last character on the screen may scrollup the screen. | |
| 8667 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8668 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8669 { | |
| 8670 ScreenAttrs[off] = (sattr_T)-1; | |
| 8671 return; | |
| 8672 } | |
| 8673 | |
| 8674 /* Output the first byte normally (positions the cursor), then write the | |
| 8675 * second byte directly. */ | |
| 8676 screen_char(off, row, col); | |
| 8677 out_char(ScreenLines[off + 1]); | |
| 8678 ++screen_cur_col; | |
| 8679 } | |
| 8680 | |
| 8681 /* | |
| 8682 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8683 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8684 */ | |
| 8685 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8686 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8687 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8688 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8689 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8690 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8691 int invert) |
| 7 | 8692 { |
| 8693 int r, c; | |
| 8694 int off; | |
| 1378 | 8695 int max_off; |
| 7 | 8696 |
| 534 | 8697 /* Can't use ScreenLines unless initialized */ |
| 8698 if (ScreenLines == NULL) | |
| 8699 return; | |
| 8700 | |
| 7 | 8701 if (invert) |
| 8702 screen_char_attr = HL_INVERSE; | |
| 8703 for (r = row; r < row + height; ++r) | |
| 8704 { | |
| 8705 off = LineOffset[r]; | |
| 1378 | 8706 max_off = off + screen_Columns; |
| 7 | 8707 for (c = col; c < col + width; ++c) |
| 8708 { | |
| 1378 | 8709 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8710 { |
| 8711 screen_char_2(off + c, r, c); | |
| 8712 ++c; | |
| 8713 } | |
| 8714 else | |
| 8715 { | |
| 8716 screen_char(off + c, r, c); | |
| 1378 | 8717 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8718 ++c; |
| 8719 } | |
| 8720 } | |
| 8721 } | |
| 8722 screen_char_attr = 0; | |
| 8723 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8724 |
| 7 | 8725 /* |
| 8726 * Redraw the characters for a vertically split window. | |
| 8727 */ | |
| 8728 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8729 redraw_block(int row, int end, win_T *wp) |
| 7 | 8730 { |
| 8731 int col; | |
| 8732 int width; | |
| 8733 | |
| 8734 # ifdef FEAT_CLIPBOARD | |
| 8735 clip_may_clear_selection(row, end - 1); | |
| 8736 # endif | |
| 8737 | |
| 8738 if (wp == NULL) | |
| 8739 { | |
| 8740 col = 0; | |
| 8741 width = Columns; | |
| 8742 } | |
| 8743 else | |
| 8744 { | |
| 8745 col = wp->w_wincol; | |
| 8746 width = wp->w_width; | |
| 8747 } | |
| 8748 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8749 } | |
| 8750 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8751 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8752 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
|
8753 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8754 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8755 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8756 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8757 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8758 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8759 |
| 7 | 8760 /* |
| 8761 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8762 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8763 * Use attributes 'attr'. | |
| 8764 */ | |
| 8765 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8766 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8767 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8768 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8769 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8770 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8771 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8772 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8773 int attr) |
| 7 | 8774 { |
| 8775 int row; | |
| 8776 int col; | |
| 8777 int off; | |
| 8778 int end_off; | |
| 8779 int did_delete; | |
| 8780 int c; | |
| 8781 int norm_term; | |
| 8782 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8783 int force_next = FALSE; | |
| 8784 #endif | |
| 8785 | |
| 8786 if (end_row > screen_Rows) /* safety check */ | |
| 8787 end_row = screen_Rows; | |
| 8788 if (end_col > screen_Columns) /* safety check */ | |
| 8789 end_col = screen_Columns; | |
| 8790 if (ScreenLines == NULL | |
| 8791 || start_row >= end_row | |
| 8792 || start_col >= end_col) /* nothing to do */ | |
| 8793 return; | |
| 8794 | |
| 8795 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8796 norm_term = ( | |
| 8797 #ifdef FEAT_GUI | |
| 8798 !gui.in_use && | |
| 8799 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8800 !IS_CTERM); |
| 7 | 8801 for (row = start_row; row < end_row; ++row) |
| 8802 { | |
| 1668 | 8803 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8804 #ifdef FEAT_GUI |
| 1668 | 8805 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8806 #endif |
| 1668 | 8807 ) |
| 8808 { | |
| 8809 /* When drawing over the right halve of a double-wide char clear | |
| 8810 * out the left halve. When drawing over the left halve of a | |
| 8811 * double wide-char clear out the right halve. Only needed in a | |
| 8812 * terminal. */ | |
| 1685 | 8813 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8814 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8815 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8816 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8817 } |
| 7 | 8818 /* |
| 8819 * Try to use delete-line termcap code, when no attributes or in a | |
| 8820 * "normal" terminal, where a bold/italic space is just a | |
| 8821 * space. | |
| 8822 */ | |
| 8823 did_delete = FALSE; | |
| 8824 if (c2 == ' ' | |
| 8825 && end_col == Columns | |
| 8826 && can_clear(T_CE) | |
| 8827 && (attr == 0 | |
| 8828 || (norm_term | |
| 8829 && attr <= HL_ALL | |
| 8830 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8831 { | |
| 8832 /* | |
| 8833 * check if we really need to clear something | |
| 8834 */ | |
| 8835 col = start_col; | |
| 8836 if (c1 != ' ') /* don't clear first char */ | |
| 8837 ++col; | |
| 8838 | |
| 8839 off = LineOffset[row] + col; | |
| 8840 end_off = LineOffset[row] + end_col; | |
| 8841 | |
| 8842 /* skip blanks (used often, keep it fast!) */ | |
| 8843 if (enc_utf8) | |
| 8844 while (off < end_off && ScreenLines[off] == ' ' | |
| 8845 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8846 ++off; | |
| 8847 else | |
| 8848 while (off < end_off && ScreenLines[off] == ' ' | |
| 8849 && ScreenAttrs[off] == 0) | |
| 8850 ++off; | |
| 8851 if (off < end_off) /* something to be cleared */ | |
| 8852 { | |
| 8853 col = off - LineOffset[row]; | |
| 8854 screen_stop_highlight(); | |
| 8855 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8856 out_str(T_CE); | |
| 8857 screen_start(); /* don't know where cursor is now */ | |
| 8858 col = end_col - col; | |
| 8859 while (col--) /* clear chars in ScreenLines */ | |
| 8860 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8861 space_to_screenline(off, 0); |
| 7 | 8862 ++off; |
| 8863 } | |
| 8864 } | |
| 8865 did_delete = TRUE; /* the chars are cleared now */ | |
| 8866 } | |
| 8867 | |
| 8868 off = LineOffset[row] + start_col; | |
| 8869 c = c1; | |
| 8870 for (col = start_col; col < end_col; ++col) | |
| 8871 { | |
| 8872 if (ScreenLines[off] != c | |
| 714 | 8873 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8874 != (c >= 0x80 ? c : 0)) | |
| 7 | 8875 || ScreenAttrs[off] != attr |
| 8876 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8877 || force_next | |
| 8878 #endif | |
| 8879 ) | |
| 8880 { | |
| 8881 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8882 /* The bold trick may make a single row of pixels appear in | |
| 8883 * the next character. When a bold character is removed, the | |
| 8884 * next character should be redrawn too. This happens for our | |
| 8885 * own GUI and for some xterms. */ | |
| 8886 if ( | |
| 8887 # ifdef FEAT_GUI | |
| 8888 gui.in_use | |
| 8889 # endif | |
| 8890 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8891 || | |
| 8892 # endif | |
| 8893 # ifdef UNIX | |
| 8894 term_is_xterm | |
| 8895 # endif | |
| 8896 ) | |
| 8897 { | |
| 8898 if (ScreenLines[off] != ' ' | |
| 8899 && (ScreenAttrs[off] > HL_ALL | |
| 8900 || ScreenAttrs[off] & HL_BOLD)) | |
| 8901 force_next = TRUE; | |
| 8902 else | |
| 8903 force_next = FALSE; | |
| 8904 } | |
| 8905 #endif | |
| 8906 ScreenLines[off] = c; | |
| 8907 if (enc_utf8) | |
| 8908 { | |
| 8909 if (c >= 0x80) | |
| 8910 { | |
| 8911 ScreenLinesUC[off] = c; | |
| 714 | 8912 ScreenLinesC[0][off] = 0; |
| 7 | 8913 } |
| 8914 else | |
| 8915 ScreenLinesUC[off] = 0; | |
| 8916 } | |
| 8917 ScreenAttrs[off] = attr; | |
| 8918 if (!did_delete || c != ' ') | |
| 8919 screen_char(off, row, col); | |
| 8920 } | |
| 8921 ++off; | |
| 8922 if (col == start_col) | |
| 8923 { | |
| 8924 if (did_delete) | |
| 8925 break; | |
| 8926 c = c2; | |
| 8927 } | |
| 8928 } | |
| 8929 if (end_col == Columns) | |
| 8930 LineWraps[row] = FALSE; | |
| 8931 if (row == Rows - 1) /* overwritten the command line */ | |
| 8932 { | |
| 8933 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
|
8934 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
|
8935 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8936 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8937 if (start_col == 0) |
| 8938 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8939 } |
| 8940 } | |
| 8941 } | |
| 8942 | |
| 8943 /* | |
| 8944 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8945 * screen or the command line. | |
| 8946 */ | |
| 8947 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8948 check_for_delay(int check_msg_scroll) |
| 7 | 8949 { |
| 8950 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8951 && !did_wait_return | |
| 8952 && emsg_silent == 0) | |
| 8953 { | |
| 8954 out_flush(); | |
| 8955 ui_delay(1000L, TRUE); | |
| 8956 emsg_on_display = FALSE; | |
| 8957 if (check_msg_scroll) | |
| 8958 msg_scroll = FALSE; | |
| 8959 } | |
| 8960 } | |
| 8961 | |
| 8962 /* | |
|
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
|
8963 * 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
|
8964 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8965 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
|
8966 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
|
8967 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8968 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
|
8969 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8970 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
|
8971 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
|
8972 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8973 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8974 /* |
| 7 | 8975 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8976 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8977 * Returns TRUE if there is a valid screen to write to. |
| 8978 * Returns FALSE when starting up and screen not initialized yet. | |
| 8979 */ | |
| 8980 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8981 screen_valid(int doclear) |
| 7 | 8982 { |
| 3263 | 8983 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8984 return (ScreenLines != NULL); |
| 8985 } | |
| 8986 | |
| 8987 /* | |
| 8988 * Resize the shell to Rows and Columns. | |
| 8989 * Allocate ScreenLines[] and associated items. | |
| 8990 * | |
| 8991 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8992 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8993 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8994 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8995 * final size of the shell is needed. | |
| 8996 */ | |
| 8997 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8998 screenalloc(int doclear) |
| 7 | 8999 { |
| 9000 int new_row, old_row; | |
| 9001 #ifdef FEAT_GUI | |
| 9002 int old_Rows; | |
| 9003 #endif | |
| 9004 win_T *wp; | |
| 9005 int outofmem = FALSE; | |
| 9006 int len; | |
| 9007 schar_T *new_ScreenLines; | |
| 9008 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 9009 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 9010 schar_T *new_ScreenLines2 = NULL; |
| 714 | 9011 int i; |
| 7 | 9012 sattr_T *new_ScreenAttrs; |
| 9013 unsigned *new_LineOffset; | |
| 9014 char_u *new_LineWraps; | |
| 681 | 9015 short *new_TabPageIdxs; |
| 671 | 9016 tabpage_T *tp; |
| 7 | 9017 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 9018 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 9019 int retry_count = 0; |
| 9020 | |
| 9021 retry: | |
| 7 | 9022 /* |
| 9023 * Allocation of the screen buffers is done only when the size changes and | |
| 9024 * when Rows and Columns have been set and we have started doing full | |
| 9025 * screen stuff. | |
| 9026 */ | |
| 9027 if ((ScreenLines != NULL | |
| 9028 && Rows == screen_Rows | |
| 9029 && Columns == screen_Columns | |
| 9030 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 9031 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9032 && p_mco == Screen_mco) |
| 7 | 9033 || Rows == 0 |
| 9034 || Columns == 0 | |
| 9035 || (!full_screen && ScreenLines == NULL)) | |
| 9036 return; | |
| 9037 | |
| 9038 /* | |
| 9039 * It's possible that we produce an out-of-memory message below, which | |
| 9040 * will cause this function to be called again. To break the loop, just | |
| 9041 * return here. | |
| 9042 */ | |
| 9043 if (entered) | |
| 9044 return; | |
| 9045 entered = TRUE; | |
| 9046 | |
| 911 | 9047 /* |
| 9048 * Note that the window sizes are updated before reallocating the arrays, | |
| 9049 * thus we must not redraw here! | |
| 9050 */ | |
| 9051 ++RedrawingDisabled; | |
| 9052 | |
| 7 | 9053 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 9054 | |
| 9055 comp_col(); /* recompute columns for shown command and ruler */ | |
| 9056 | |
| 9057 /* | |
| 9058 * We're changing the size of the screen. | |
| 9059 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 9060 * - Move lines from the old arrays into the new arrays, clear extra | |
| 9061 * lines (unless the screen is going to be cleared). | |
| 9062 * - Free the old arrays. | |
| 9063 * | |
| 9064 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 9065 * Continuing with the old ScreenLines may result in a crash, because the | |
| 9066 * size is wrong. | |
| 9067 */ | |
| 671 | 9068 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9069 win_free_lsize(wp); |
| 1946 | 9070 if (aucmd_win != NULL) |
| 9071 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
|
9072 #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
|
9073 // 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
|
9074 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
|
9075 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
|
9076 // 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
|
9077 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
|
9078 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
|
9079 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
|
9080 #endif |
| 7 | 9081 |
|
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
|
9082 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
|
9083 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9084 if (enc_utf8) |
| 9085 { | |
|
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
|
9086 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 9087 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
|
9088 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
|
9089 (Rows + 1) * Columns); |
| 7 | 9090 } |
| 9091 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
|
9092 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
|
9093 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
|
9094 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
|
9095 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
|
9096 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
| 7 | 9097 |
| 677 | 9098 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9099 { |
| 9100 if (win_alloc_lines(wp) == FAIL) | |
| 9101 { | |
| 9102 outofmem = TRUE; | |
| 1819 | 9103 goto give_up; |
| 9104 } | |
| 9105 } | |
| 1946 | 9106 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9107 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9108 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
|
9109 #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
|
9110 // 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
|
9111 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
|
9112 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
|
9113 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9114 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
|
9115 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
|
9116 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9117 // 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
|
9118 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
|
9119 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
|
9120 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
|
9121 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9122 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
|
9123 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
|
9124 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9125 #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
|
9126 |
| 1819 | 9127 give_up: |
| 7 | 9128 |
| 714 | 9129 for (i = 0; i < p_mco; ++i) |
| 9130 if (new_ScreenLinesC[i] == NULL) | |
| 9131 break; | |
| 7 | 9132 if (new_ScreenLines == NULL |
| 714 | 9133 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9134 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9135 || new_ScreenAttrs == NULL | |
| 9136 || new_LineOffset == NULL | |
| 9137 || new_LineWraps == NULL | |
| 671 | 9138 || new_TabPageIdxs == NULL |
| 7 | 9139 || outofmem) |
| 9140 { | |
| 944 | 9141 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9142 { |
| 9143 /* guess the size */ | |
| 9144 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9145 | |
| 9146 /* Remember we did this to avoid getting outofmem messages over | |
| 9147 * and over again. */ | |
| 944 | 9148 done_outofmem_msg = TRUE; |
| 534 | 9149 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9150 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9151 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9152 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
|
9153 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
|
9154 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9155 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9156 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9157 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9158 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 9159 } |
| 9160 else | |
| 9161 { | |
| 944 | 9162 done_outofmem_msg = FALSE; |
| 534 | 9163 |
| 7 | 9164 for (new_row = 0; new_row < Rows; ++new_row) |
| 9165 { | |
| 9166 new_LineOffset[new_row] = new_row * Columns; | |
| 9167 new_LineWraps[new_row] = FALSE; | |
| 9168 | |
| 9169 /* | |
| 9170 * If the screen is not going to be cleared, copy as much as | |
| 9171 * possible from the old screen to the new one and clear the rest | |
| 9172 * (used when resizing the window at the "--more--" prompt or when | |
| 9173 * executing an external command, for the GUI). | |
| 9174 */ | |
| 3263 | 9175 if (!doclear) |
| 7 | 9176 { |
| 9177 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9178 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9179 if (enc_utf8) | |
| 9180 { | |
| 9181 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9182 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9183 for (i = 0; i < p_mco; ++i) |
| 9184 (void)vim_memset(new_ScreenLinesC[i] | |
| 9185 + new_row * Columns, | |
| 7 | 9186 0, (size_t)Columns * sizeof(u8char_T)); |
| 9187 } | |
| 9188 if (enc_dbcs == DBCS_JPNU) | |
| 9189 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9190 0, (size_t)Columns * sizeof(schar_T)); | |
| 9191 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9192 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9193 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9194 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9195 { |
| 9196 if (screen_Columns < Columns) | |
| 9197 len = screen_Columns; | |
| 9198 else | |
| 9199 len = Columns; | |
| 571 | 9200 /* When switching to utf-8 don't copy characters, they |
| 714 | 9201 * may be invalid now. Also when p_mco changes. */ |
| 9202 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9203 && p_mco == Screen_mco) | |
| 26 | 9204 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9205 ScreenLines + LineOffset[old_row], | |
| 9206 (size_t)len * sizeof(schar_T)); | |
| 714 | 9207 if (enc_utf8 && ScreenLinesUC != NULL |
| 9208 && p_mco == Screen_mco) | |
| 7 | 9209 { |
| 9210 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9211 ScreenLinesUC + LineOffset[old_row], | |
| 9212 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9213 for (i = 0; i < p_mco; ++i) |
| 9214 mch_memmove(new_ScreenLinesC[i] | |
| 9215 + new_LineOffset[new_row], | |
| 9216 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9217 (size_t)len * sizeof(u8char_T)); |
| 9218 } | |
| 9219 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9220 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9221 ScreenLines2 + LineOffset[old_row], | |
| 9222 (size_t)len * sizeof(schar_T)); | |
| 9223 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9224 ScreenAttrs + LineOffset[old_row], | |
| 9225 (size_t)len * sizeof(sattr_T)); | |
| 9226 } | |
| 9227 } | |
| 9228 } | |
| 9229 /* Use the last line of the screen for the current line. */ | |
| 9230 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9231 } | |
| 9232 | |
| 356 | 9233 free_screenlines(); |
| 9234 | |
| 7 | 9235 ScreenLines = new_ScreenLines; |
| 9236 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9237 for (i = 0; i < p_mco; ++i) |
| 9238 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9239 Screen_mco = p_mco; | |
| 7 | 9240 ScreenLines2 = new_ScreenLines2; |
| 9241 ScreenAttrs = new_ScreenAttrs; | |
| 9242 LineOffset = new_LineOffset; | |
| 9243 LineWraps = new_LineWraps; | |
| 671 | 9244 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9245 |
| 9246 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9247 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9248 #ifdef FEAT_GUI | |
| 9249 old_Rows = screen_Rows; | |
| 9250 #endif | |
| 9251 screen_Rows = Rows; | |
| 9252 screen_Columns = Columns; | |
| 9253 | |
| 9254 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9255 if (doclear) |
| 7 | 9256 screenclear2(); |
| 9257 #ifdef FEAT_GUI | |
| 9258 else if (gui.in_use | |
| 9259 && !gui.starting | |
| 9260 && ScreenLines != NULL | |
| 9261 && old_Rows != Rows) | |
| 9262 { | |
| 9263 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9264 /* | |
| 9265 * Adjust the position of the cursor, for when executing an external | |
| 9266 * command. | |
| 9267 */ | |
| 9268 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9269 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9270 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9271 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9272 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9273 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9274 } | |
| 9275 #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
|
9276 clear_TabPageIdxs(); |
| 7 | 9277 |
| 9278 entered = FALSE; | |
| 911 | 9279 --RedrawingDisabled; |
| 766 | 9280 |
| 1824 | 9281 /* |
| 9282 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9283 * in case applying autocommands always changes Rows or Columns. | |
| 9284 */ | |
| 9285 if (starting == 0 && ++retry_count <= 3) | |
| 9286 { | |
| 766 | 9287 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9288 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9289 * jump back to check if we need to allocate the screen again. */ | |
| 9290 goto retry; | |
| 9291 } | |
| 7 | 9292 } |
| 9293 | |
| 9294 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9295 free_screenlines(void) |
| 356 | 9296 { |
| 714 | 9297 int i; |
| 9298 | |
| 356 | 9299 vim_free(ScreenLinesUC); |
| 714 | 9300 for (i = 0; i < Screen_mco; ++i) |
| 9301 vim_free(ScreenLinesC[i]); | |
| 356 | 9302 vim_free(ScreenLines2); |
| 714 | 9303 vim_free(ScreenLines); |
| 356 | 9304 vim_free(ScreenAttrs); |
| 9305 vim_free(LineOffset); | |
| 9306 vim_free(LineWraps); | |
| 671 | 9307 vim_free(TabPageIdxs); |
| 356 | 9308 } |
| 9309 | |
| 9310 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9311 screenclear(void) |
| 7 | 9312 { |
| 9313 check_for_delay(FALSE); | |
| 9314 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9315 screenclear2(); /* clear the screen */ | |
| 9316 } | |
| 9317 | |
| 9318 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9319 screenclear2(void) |
| 7 | 9320 { |
| 9321 int i; | |
| 9322 | |
| 9323 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9324 #ifdef FEAT_GUI | |
| 9325 || (gui.in_use && gui.starting) | |
| 9326 #endif | |
| 9327 ) | |
| 9328 return; | |
| 9329 | |
| 9330 #ifdef FEAT_GUI | |
| 9331 if (!gui.in_use) | |
| 9332 #endif | |
| 9333 screen_attr = -1; /* force setting the Normal colors */ | |
| 9334 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9335 | |
| 9336 #ifdef FEAT_CLIPBOARD | |
| 9337 /* disable selection without redrawing it */ | |
| 9338 clip_scroll_selection(9999); | |
| 9339 #endif | |
| 9340 | |
| 9341 /* blank out ScreenLines */ | |
| 9342 for (i = 0; i < Rows; ++i) | |
| 9343 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9344 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9345 LineWraps[i] = FALSE; |
| 9346 } | |
| 9347 | |
| 9348 if (can_clear(T_CL)) | |
| 9349 { | |
| 9350 out_str(T_CL); /* clear the display */ | |
| 9351 clear_cmdline = FALSE; | |
| 644 | 9352 mode_displayed = FALSE; |
| 7 | 9353 } |
| 9354 else | |
| 9355 { | |
| 9356 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9357 for (i = 0; i < Rows; ++i) | |
| 9358 lineinvalid(LineOffset[i], (int)Columns); | |
| 9359 clear_cmdline = TRUE; | |
| 9360 } | |
| 9361 | |
| 9362 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9363 | |
| 9364 win_rest_invalid(firstwin); | |
| 9365 redraw_cmdline = TRUE; | |
| 673 | 9366 redraw_tabline = TRUE; |
| 7 | 9367 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9368 must_redraw = NOT_VALID; | |
| 9369 compute_cmdrow(); | |
| 9370 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9371 msg_col = 0; | |
| 9372 screen_start(); /* don't know where cursor is now */ | |
| 9373 msg_scrolled = 0; /* can't scroll back */ | |
| 9374 msg_didany = FALSE; | |
| 9375 msg_didout = FALSE; | |
| 9376 } | |
| 9377 | |
| 9378 /* | |
| 9379 * Clear one line in ScreenLines. | |
| 9380 */ | |
| 9381 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9382 lineclear(unsigned off, int width, int attr) |
| 7 | 9383 { |
| 9384 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9385 if (enc_utf8) | |
| 9386 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9387 (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
|
9388 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9389 } |
| 9390 | |
| 9391 /* | |
| 9392 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9393 * invalid value. | |
| 9394 */ | |
| 9395 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9396 lineinvalid(unsigned off, int width) |
| 7 | 9397 { |
| 9398 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9399 } | |
| 9400 | |
| 9401 /* | |
| 9402 * Copy part of a Screenline for vertically split window "wp". | |
| 9403 */ | |
| 9404 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9405 linecopy(int to, int from, win_T *wp) |
| 7 | 9406 { |
| 9407 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9408 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9409 | |
| 9410 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9411 wp->w_width * sizeof(schar_T)); | |
| 9412 if (enc_utf8) | |
| 9413 { | |
| 714 | 9414 int i; |
| 9415 | |
| 7 | 9416 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9417 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9418 for (i = 0; i < p_mco; ++i) |
| 9419 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9420 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9421 } |
| 9422 if (enc_dbcs == DBCS_JPNU) | |
| 9423 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9424 wp->w_width * sizeof(schar_T)); | |
| 9425 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9426 wp->w_width * sizeof(sattr_T)); | |
| 9427 } | |
| 9428 | |
| 9429 /* | |
| 9430 * Return TRUE if clearing with term string "p" would work. | |
| 9431 * It can't work when the string is empty or it won't set the right background. | |
| 9432 */ | |
| 9433 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9434 can_clear(char_u *p) |
| 7 | 9435 { |
| 9436 return (*p != NUL && (t_colors <= 1 | |
| 9437 #ifdef FEAT_GUI | |
| 9438 || gui.in_use | |
| 9439 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9440 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9441 || (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
|
9442 || (!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
|
9443 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9444 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9445 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9446 || *T_UT != NUL)); |
| 7 | 9447 } |
| 9448 | |
| 9449 /* | |
| 9450 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9451 * something directly to the screen (shell commands) or a terminal control | |
| 9452 * code. | |
| 9453 */ | |
| 9454 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9455 screen_start(void) |
| 7 | 9456 { |
| 9457 screen_cur_row = screen_cur_col = 9999; | |
| 9458 } | |
| 9459 | |
| 9460 /* | |
| 9461 * Move the cursor to position "row","col" in the screen. | |
| 9462 * This tries to find the most efficient way to move, minimizing the number of | |
| 9463 * characters sent to the terminal. | |
| 9464 */ | |
| 9465 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9466 windgoto(int row, int col) |
| 7 | 9467 { |
| 205 | 9468 sattr_T *p; |
| 7 | 9469 int i; |
| 9470 int plan; | |
| 9471 int cost; | |
| 9472 int wouldbe_col; | |
| 9473 int noinvcurs; | |
| 9474 char_u *bs; | |
| 9475 int goto_cost; | |
| 9476 int attr; | |
| 9477 | |
| 1213 | 9478 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9479 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9480 | |
| 9481 #define PLAN_LE 1 | |
| 9482 #define PLAN_CR 2 | |
| 9483 #define PLAN_NL 3 | |
| 9484 #define PLAN_WRITE 4 | |
| 9485 /* Can't use ScreenLines unless initialized */ | |
| 9486 if (ScreenLines == NULL) | |
| 9487 return; | |
| 9488 | |
| 9489 if (col != screen_cur_col || row != screen_cur_row) | |
| 9490 { | |
| 9491 /* Check for valid position. */ | |
| 9492 if (row < 0) /* window without text lines? */ | |
| 9493 row = 0; | |
| 9494 if (row >= screen_Rows) | |
| 9495 row = screen_Rows - 1; | |
| 9496 if (col >= screen_Columns) | |
| 9497 col = screen_Columns - 1; | |
| 9498 | |
| 9499 /* check if no cursor movement is allowed in highlight mode */ | |
| 9500 if (screen_attr && *T_MS == NUL) | |
| 9501 noinvcurs = HIGHL_COST; | |
| 9502 else | |
| 9503 noinvcurs = 0; | |
| 9504 goto_cost = GOTO_COST + noinvcurs; | |
| 9505 | |
| 9506 /* | |
| 9507 * Plan how to do the positioning: | |
| 9508 * 1. Use CR to move it to column 0, same row. | |
| 9509 * 2. Use T_LE to move it a few columns to the left. | |
| 9510 * 3. Use NL to move a few lines down, column 0. | |
| 9511 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9512 * | |
| 9513 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9514 * position is unknown then (some terminals wrap, some don't ) | |
| 9515 * | |
| 1213 | 9516 * First check if the highlighting attributes allow us to write |
| 7 | 9517 * characters to move the cursor to the right. |
| 9518 */ | |
| 9519 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9520 { | |
| 9521 /* | |
| 9522 * If the cursor is in the same row, bigger col, we can use CR | |
| 9523 * or T_LE. | |
| 9524 */ | |
| 9525 bs = NULL; /* init for GCC */ | |
| 9526 attr = screen_attr; | |
| 9527 if (row == screen_cur_row && col < screen_cur_col) | |
| 9528 { | |
| 9529 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9530 if (*T_LE) | |
| 9531 bs = T_LE; /* "cursor left" */ | |
| 9532 else | |
| 9533 bs = T_BC; /* "backspace character (old) */ | |
| 9534 if (*bs) | |
| 9535 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9536 else | |
| 9537 cost = 999; | |
| 9538 if (col + 1 < cost) /* using CR is less characters */ | |
| 9539 { | |
| 9540 plan = PLAN_CR; | |
| 9541 wouldbe_col = 0; | |
| 9542 cost = 1; /* CR is just one character */ | |
| 9543 } | |
| 9544 else | |
| 9545 { | |
| 9546 plan = PLAN_LE; | |
| 9547 wouldbe_col = col; | |
| 9548 } | |
| 9549 if (noinvcurs) /* will stop highlighting */ | |
| 9550 { | |
| 9551 cost += noinvcurs; | |
| 9552 attr = 0; | |
| 9553 } | |
| 9554 } | |
| 9555 | |
| 9556 /* | |
| 9557 * If the cursor is above where we want to be, we can use CR LF. | |
| 9558 */ | |
| 9559 else if (row > screen_cur_row) | |
| 9560 { | |
| 9561 plan = PLAN_NL; | |
| 9562 wouldbe_col = 0; | |
| 9563 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9564 if (noinvcurs) /* will stop highlighting */ | |
| 9565 { | |
| 9566 cost += noinvcurs; | |
| 9567 attr = 0; | |
| 9568 } | |
| 9569 } | |
| 9570 | |
| 9571 /* | |
| 9572 * If the cursor is in the same row, smaller col, just use write. | |
| 9573 */ | |
| 9574 else | |
| 9575 { | |
| 9576 plan = PLAN_WRITE; | |
| 9577 wouldbe_col = screen_cur_col; | |
| 9578 cost = 0; | |
| 9579 } | |
| 9580 | |
| 9581 /* | |
| 9582 * Check if any characters that need to be written have the | |
| 9583 * correct attributes. Also avoid UTF-8 characters. | |
| 9584 */ | |
| 9585 i = col - wouldbe_col; | |
| 9586 if (i > 0) | |
| 9587 cost += i; | |
| 9588 if (cost < goto_cost && i > 0) | |
| 9589 { | |
| 9590 /* | |
| 9591 * Check if the attributes are correct without additionally | |
| 9592 * stopping highlighting. | |
| 9593 */ | |
| 9594 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9595 while (i && *p++ == attr) | |
| 9596 --i; | |
| 9597 if (i != 0) | |
| 9598 { | |
| 9599 /* | |
| 9600 * Try if it works when highlighting is stopped here. | |
| 9601 */ | |
| 9602 if (*--p == 0) | |
| 9603 { | |
| 9604 cost += noinvcurs; | |
| 9605 while (i && *p++ == 0) | |
| 9606 --i; | |
| 9607 } | |
| 9608 if (i != 0) | |
| 9609 cost = 999; /* different attributes, don't do it */ | |
| 9610 } | |
| 9611 if (enc_utf8) | |
| 9612 { | |
| 9613 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9614 for (i = wouldbe_col; i < col; ++i) | |
| 9615 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9616 { | |
| 9617 cost = 999; | |
| 9618 break; | |
| 9619 } | |
| 9620 } | |
| 9621 } | |
| 9622 | |
| 9623 /* | |
| 9624 * We can do it without term_windgoto()! | |
| 9625 */ | |
| 9626 if (cost < goto_cost) | |
| 9627 { | |
| 9628 if (plan == PLAN_LE) | |
| 9629 { | |
| 9630 if (noinvcurs) | |
| 9631 screen_stop_highlight(); | |
| 9632 while (screen_cur_col > col) | |
| 9633 { | |
| 9634 out_str(bs); | |
| 9635 --screen_cur_col; | |
| 9636 } | |
| 9637 } | |
| 9638 else if (plan == PLAN_CR) | |
| 9639 { | |
| 9640 if (noinvcurs) | |
| 9641 screen_stop_highlight(); | |
| 9642 out_char('\r'); | |
| 9643 screen_cur_col = 0; | |
| 9644 } | |
| 9645 else if (plan == PLAN_NL) | |
| 9646 { | |
| 9647 if (noinvcurs) | |
| 9648 screen_stop_highlight(); | |
| 9649 while (screen_cur_row < row) | |
| 9650 { | |
| 9651 out_char('\n'); | |
| 9652 ++screen_cur_row; | |
| 9653 } | |
| 9654 screen_cur_col = 0; | |
| 9655 } | |
| 9656 | |
| 9657 i = col - screen_cur_col; | |
| 9658 if (i > 0) | |
| 9659 { | |
| 9660 /* | |
| 9661 * Use cursor-right if it's one character only. Avoids | |
| 9662 * removing a line of pixels from the last bold char, when | |
| 9663 * using the bold trick in the GUI. | |
| 9664 */ | |
| 9665 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9666 { | |
| 9667 while (i-- > 0) | |
| 9668 out_char(*T_ND); | |
| 9669 } | |
| 9670 else | |
| 9671 { | |
| 9672 int off; | |
| 9673 | |
| 9674 off = LineOffset[row] + screen_cur_col; | |
| 9675 while (i-- > 0) | |
| 9676 { | |
| 9677 if (ScreenAttrs[off] != screen_attr) | |
| 9678 screen_stop_highlight(); | |
| 9679 out_flush_check(); | |
| 9680 out_char(ScreenLines[off]); | |
| 9681 if (enc_dbcs == DBCS_JPNU | |
| 9682 && ScreenLines[off] == 0x8e) | |
| 9683 out_char(ScreenLines2[off]); | |
| 9684 ++off; | |
| 9685 } | |
| 9686 } | |
| 9687 } | |
| 9688 } | |
| 9689 } | |
| 9690 else | |
| 9691 cost = 999; | |
| 9692 | |
| 9693 if (cost >= goto_cost) | |
| 9694 { | |
| 9695 if (noinvcurs) | |
| 9696 screen_stop_highlight(); | |
| 5995 | 9697 if (row == screen_cur_row && (col > screen_cur_col) |
| 9698 && *T_CRI != NUL) | |
| 7 | 9699 term_cursor_right(col - screen_cur_col); |
| 9700 else | |
| 9701 term_windgoto(row, col); | |
| 9702 } | |
| 9703 screen_cur_row = row; | |
| 9704 screen_cur_col = col; | |
| 9705 } | |
| 9706 } | |
| 9707 | |
| 9708 /* | |
| 9709 * Set cursor to its position in the current window. | |
| 9710 */ | |
| 9711 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9712 setcursor(void) |
| 7 | 9713 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9714 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
|
9715 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9716 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9717 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9718 * 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
|
9719 * 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
|
9720 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9721 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9722 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
|
9723 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9724 if (force || redrawing()) |
| 7 | 9725 { |
| 9726 validate_cursor(); | |
| 9727 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
|
9728 curwin->w_wincol + ( |
| 7 | 9729 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9730 /* With 'rightleft' set and the cursor on a double-wide |
| 9731 * 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
|
9732 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
|
9733 - ((has_mbyte |
| 1545 | 9734 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9735 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9736 #endif |
| 9737 curwin->w_wcol)); | |
| 9738 } | |
| 9739 } | |
| 9740 | |
| 9741 | |
| 9742 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9743 * 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
|
9744 * 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
|
9745 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9746 * scrolling. |
| 9747 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9748 */ | |
| 9749 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9750 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9751 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9752 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9753 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9754 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9755 int mayclear) |
| 7 | 9756 { |
| 9757 int did_delete; | |
| 9758 int nextrow; | |
| 9759 int lastrow; | |
| 9760 int retval; | |
| 9761 | |
| 9762 if (invalid) | |
| 9763 wp->w_lines_valid = 0; | |
| 9764 | |
| 9765 if (wp->w_height < 5) | |
| 9766 return FAIL; | |
| 9767 | |
| 9768 if (line_count > wp->w_height - row) | |
| 9769 line_count = wp->w_height - row; | |
| 9770 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9771 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9772 if (retval != MAYBE) |
| 9773 return retval; | |
| 9774 | |
| 9775 /* | |
| 9776 * If there is a next window or a status line, we first try to delete the | |
| 9777 * lines at the bottom to avoid messing what is after the window. | |
| 9778 * If this fails and there are following windows, don't do anything to avoid | |
| 9779 * messing up those windows, better just redraw. | |
| 9780 */ | |
| 9781 did_delete = FALSE; | |
| 9782 if (wp->w_next != NULL || wp->w_status_height) | |
| 9783 { | |
| 9784 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
|
9785 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9786 did_delete = TRUE; |
| 9787 else if (wp->w_next) | |
| 9788 return FAIL; | |
| 9789 } | |
| 9790 /* | |
| 9791 * if no lines deleted, blank the lines that will end up below the window | |
| 9792 */ | |
| 9793 if (!did_delete) | |
| 9794 { | |
| 9795 wp->w_redr_status = TRUE; | |
| 9796 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
|
9797 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9798 lastrow = nextrow + line_count; |
| 9799 if (lastrow > Rows) | |
| 9800 lastrow = Rows; | |
| 9801 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
|
9802 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9803 ' ', ' ', 0); |
| 9804 } | |
| 9805 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9806 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9807 == FAIL) |
| 9808 { | |
| 9809 /* deletion will have messed up other windows */ | |
| 9810 if (did_delete) | |
| 9811 { | |
| 9812 wp->w_redr_status = TRUE; | |
| 9813 win_rest_invalid(W_NEXT(wp)); | |
| 9814 } | |
| 9815 return FAIL; | |
| 9816 } | |
| 9817 | |
| 9818 return OK; | |
| 9819 } | |
| 9820 | |
| 9821 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9822 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9823 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9824 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9825 * scrolling | |
| 9826 * Return OK for success, FAIL if the lines are not deleted. | |
| 9827 */ | |
| 9828 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9829 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9830 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9831 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9832 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9833 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9834 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9835 int clear_attr) /* for clearing lines */ |
| 7 | 9836 { |
| 9837 int retval; | |
| 9838 | |
| 9839 if (invalid) | |
| 9840 wp->w_lines_valid = 0; | |
| 9841 | |
| 9842 if (line_count > wp->w_height - row) | |
| 9843 line_count = wp->w_height - row; | |
| 9844 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9845 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9846 if (retval != MAYBE) |
| 9847 return retval; | |
| 9848 | |
| 9849 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
|
9850 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9851 return FAIL; |
| 9852 | |
| 9853 /* | |
| 9854 * If there are windows or status lines below, try to put them at the | |
| 9855 * correct place. If we can't do that, they have to be redrawn. | |
| 9856 */ | |
| 9857 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9858 { | |
| 9859 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
|
9860 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9861 { |
| 9862 wp->w_redr_status = TRUE; | |
| 9863 win_rest_invalid(wp->w_next); | |
| 9864 } | |
| 9865 } | |
| 9866 /* | |
| 9867 * If this is the last window and there is no status line, redraw the | |
| 9868 * command line later. | |
| 9869 */ | |
| 9870 else | |
| 9871 redraw_cmdline = TRUE; | |
| 9872 return OK; | |
| 9873 } | |
| 9874 | |
| 9875 /* | |
| 9876 * Common code for win_ins_lines() and win_del_lines(). | |
| 9877 * Returns OK or FAIL when the work has been done. | |
| 9878 * Returns MAYBE when not finished yet. | |
| 9879 */ | |
| 9880 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9881 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9882 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9883 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9884 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9885 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9886 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9887 int clear_attr) |
| 7 | 9888 { |
| 9889 int retval; | |
| 9890 | |
| 9891 if (!redrawing() || line_count <= 0) | |
| 9892 return FAIL; | |
| 9893 | |
|
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
|
9894 /* When inserting lines would result in loss of command output, just redraw |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9895 * the lines. */ |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9896 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
|
9897 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
|
9898 |
| 7 | 9899 /* 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
|
9900 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9901 { |
|
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
|
9902 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
|
9903 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9904 return FAIL; |
| 9905 } | |
| 9906 | |
| 9907 /* | |
| 9908 * Delete all remaining lines | |
| 9909 */ | |
| 9910 if (row + line_count >= wp->w_height) | |
| 9911 { | |
| 9912 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
|
9913 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9914 ' ', ' ', 0); |
| 9915 return OK; | |
| 9916 } | |
| 9917 | |
| 9918 /* | |
|
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
|
9919 * When scrolling, the message on the command line should be cleared, |
| 7 | 9920 * 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
|
9921 * Don't do this when avoiding to insert lines. |
| 7 | 9922 */ |
|
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
|
9923 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
|
9924 clear_cmdline = TRUE; |
| 7 | 9925 |
| 9926 /* | |
| 9927 * If the terminal can set a scroll region, use that. | |
| 9928 * Always do this in a vertically split window. This will redraw from | |
| 9929 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9930 * win_line(). | |
| 9931 * 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
|
9932 * 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
|
9933 * scroll-up . |
| 7 | 9934 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9935 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
|
9936 { |
| 7 | 9937 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9938 scroll_region_set(wp, row); | |
| 9939 if (del) | |
| 9940 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
|
9941 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9942 else |
| 9943 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
|
9944 wp->w_height - row, clear_attr, wp); |
| 7 | 9945 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9946 scroll_region_reset(); | |
| 9947 return retval; | |
| 9948 } | |
| 9949 | |
| 9950 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9951 return FAIL; | |
| 9952 | |
| 9953 return MAYBE; | |
| 9954 } | |
| 9955 | |
| 9956 /* | |
| 9957 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9958 */ | |
| 9959 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9960 win_rest_invalid(win_T *wp) |
| 7 | 9961 { |
| 9962 while (wp != NULL) | |
| 9963 { | |
| 9964 redraw_win_later(wp, NOT_VALID); | |
| 9965 wp->w_redr_status = TRUE; | |
| 9966 wp = wp->w_next; | |
| 9967 } | |
| 9968 redraw_cmdline = TRUE; | |
| 9969 } | |
| 9970 | |
| 9971 /* | |
| 9972 * The rest of the routines in this file perform screen manipulations. The | |
| 9973 * given operation is performed physically on the screen. The corresponding | |
| 9974 * change is also made to the internal screen image. In this way, the editor | |
| 9975 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9976 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9977 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9978 * screen changes, and in the meantime, everything still works. | |
| 9979 */ | |
| 9980 | |
| 9981 /* | |
| 9982 * types for inserting or deleting lines | |
| 9983 */ | |
| 9984 #define USE_T_CAL 1 | |
| 9985 #define USE_T_CDL 2 | |
| 9986 #define USE_T_AL 3 | |
| 9987 #define USE_T_CE 4 | |
| 9988 #define USE_T_DL 5 | |
| 9989 #define USE_T_SR 6 | |
| 9990 #define USE_NL 7 | |
| 9991 #define USE_T_CD 8 | |
| 9992 #define USE_REDRAW 9 | |
| 9993 | |
| 9994 /* | |
| 9995 * insert lines on the screen and update ScreenLines[] | |
| 9996 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9997 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9998 * 'row' and 'end' are relative to the start of the region. | |
| 9999 * | |
| 10000 * return FAIL for failure, OK for success. | |
| 10001 */ | |
| 446 | 10002 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10003 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10004 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10005 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10006 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10007 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10008 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10009 win_T *wp) /* NULL or window to use width from */ |
| 7 | 10010 { |
| 10011 int i; | |
| 10012 int j; | |
| 10013 unsigned temp; | |
| 10014 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10015 int cursor_col = 0; |
| 7 | 10016 int type; |
| 10017 int result_empty; | |
| 10018 int can_ce = can_clear(T_CE); | |
| 10019 | |
| 10020 /* | |
| 10021 * FAIL if | |
| 10022 * - there is no valid screen | |
| 10023 * - the screen has to be redrawn completely | |
| 10024 * - the line count is less than one | |
| 10025 * - 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
|
10026 * - redrawing for a callback and there is a modeless selection |
| 7 | 10027 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10028 if (!screen_valid(TRUE) || line_count <= 0 || line_count > p_ttyscroll |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10029 #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
|
10030 || (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
|
10031 && 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
|
10032 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10033 ) |
| 7 | 10034 return FAIL; |
| 10035 | |
| 10036 /* | |
| 10037 * There are seven ways to insert lines: | |
| 10038 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10039 * characters from ScreenLines[]. | |
| 10040 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 10041 * the insert is just empty lines | |
| 10042 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 10043 * present or line_count > 1. It looks better if we do all the inserts | |
| 10044 * at once. | |
| 10045 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 10046 * insert is just empty lines and T_CE is not present or line_count > | |
| 10047 * 1. | |
| 10048 * 4. Use T_AL (insert line) if it exists. | |
| 10049 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 10050 * just empty lines. | |
| 10051 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 10052 * just empty lines. | |
| 10053 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 10054 * the 'da' flag is not set or we have clear line capability. | |
| 10055 * 8. redraw the characters from ScreenLines[]. | |
| 10056 * | |
| 10057 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 10058 * the scrollbar for the window. It does have insert line, use that if it | |
| 10059 * exists. | |
| 10060 */ | |
| 10061 result_empty = (row + line_count >= end); | |
| 10062 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10063 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
|
10064 else if (can_clear(T_CD) && result_empty) |
| 7 | 10065 type = USE_T_CD; |
| 10066 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10067 type = USE_T_CAL; | |
| 10068 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10069 type = USE_T_CDL; | |
| 10070 else if (*T_AL != NUL) | |
| 10071 type = USE_T_AL; | |
| 10072 else if (can_ce && result_empty) | |
| 10073 type = USE_T_CE; | |
| 10074 else if (*T_DL != NUL && result_empty) | |
| 10075 type = USE_T_DL; | |
| 10076 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10077 type = USE_T_SR; | |
| 10078 else | |
| 10079 return FAIL; | |
| 10080 | |
| 10081 /* | |
| 10082 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10083 * care of t_db if necessary. | |
| 10084 */ | |
| 10085 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10086 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
|
10087 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10088 |
| 10089 /* | |
| 10090 * If text is retained below the screen, first clear or delete as many | |
| 10091 * lines at the bottom of the window as are about to be inserted so that | |
| 10092 * the deleted lines won't later surface during a screen_del_lines. | |
| 10093 */ | |
| 10094 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
|
10095 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10096 |
| 10097 #ifdef FEAT_CLIPBOARD | |
| 10098 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10099 * 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
|
10100 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10101 clip_clear_selection(&clip_star); |
| 7 | 10102 else |
| 10103 clip_scroll_selection(-line_count); | |
| 10104 #endif | |
| 10105 | |
| 10106 #ifdef FEAT_GUI | |
| 10107 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10108 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10109 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10110 #endif |
| 10111 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10112 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
|
10113 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
|
10114 |
| 7 | 10115 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10116 cursor_row = row; | |
| 10117 else | |
| 10118 cursor_row = row + off; | |
| 10119 | |
| 10120 /* | |
| 10121 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10122 * Clear the inserted lines in ScreenLines[]. | |
| 10123 */ | |
| 10124 row += off; | |
| 10125 end += off; | |
| 10126 for (i = 0; i < line_count; ++i) | |
| 10127 { | |
| 10128 if (wp != NULL && wp->w_width != Columns) | |
| 10129 { | |
| 10130 /* need to copy part of a line */ | |
| 10131 j = end - 1 - i; | |
| 10132 while ((j -= line_count) >= row) | |
| 10133 linecopy(j + line_count, j, wp); | |
| 10134 j += line_count; | |
| 10135 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
|
10136 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
|
10137 clear_attr); |
| 7 | 10138 else |
| 10139 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10140 LineWraps[j] = FALSE; | |
| 10141 } | |
| 10142 else | |
| 10143 { | |
| 10144 j = end - 1 - i; | |
| 10145 temp = LineOffset[j]; | |
| 10146 while ((j -= line_count) >= row) | |
| 10147 { | |
| 10148 LineOffset[j + line_count] = LineOffset[j]; | |
| 10149 LineWraps[j + line_count] = LineWraps[j]; | |
| 10150 } | |
| 10151 LineOffset[j + line_count] = temp; | |
| 10152 LineWraps[j + line_count] = FALSE; | |
| 10153 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
|
10154 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10155 else |
| 10156 lineinvalid(temp, (int)Columns); | |
| 10157 } | |
| 10158 } | |
| 10159 | |
| 10160 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10161 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
|
10162 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
|
10163 screen_start_highlight(clear_attr); |
| 7 | 10164 |
| 10165 /* redraw the characters */ | |
| 10166 if (type == USE_REDRAW) | |
| 10167 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
|
10168 else if (type == USE_T_CAL) |
| 7 | 10169 { |
| 10170 term_append_lines(line_count); | |
| 10171 screen_start(); /* don't know where cursor is now */ | |
| 10172 } | |
| 10173 else | |
| 10174 { | |
| 10175 for (i = 0; i < line_count; i++) | |
| 10176 { | |
| 10177 if (type == USE_T_AL) | |
| 10178 { | |
| 10179 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
|
10180 windgoto(cursor_row, cursor_col); |
| 7 | 10181 out_str(T_AL); |
| 10182 } | |
| 10183 else /* type == USE_T_SR */ | |
| 10184 out_str(T_SR); | |
| 10185 screen_start(); /* don't know where cursor is now */ | |
| 10186 } | |
| 10187 } | |
| 10188 | |
| 10189 /* | |
| 10190 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10191 * have been scrolled down into the region. | |
| 10192 */ | |
| 10193 if (type == USE_T_SR && *T_DA) | |
| 10194 { | |
| 10195 for (i = 0; i < line_count; ++i) | |
| 10196 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10197 windgoto(off + i, cursor_col); |
| 7 | 10198 out_str(T_CE); |
| 10199 screen_start(); /* don't know where cursor is now */ | |
| 10200 } | |
| 10201 } | |
| 10202 | |
| 10203 #ifdef FEAT_GUI | |
| 10204 gui_can_update_cursor(); | |
| 10205 if (gui.in_use) | |
| 10206 out_flush(); /* always flush after a scroll */ | |
| 10207 #endif | |
| 10208 return OK; | |
| 10209 } | |
| 10210 | |
| 10211 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10212 * 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
|
10213 * "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
|
10214 * 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
|
10215 * "row" and "end" are relative to the start of the region. |
| 7 | 10216 * |
| 10217 * Return OK for success, FAIL if the lines are not deleted. | |
| 10218 */ | |
| 10219 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10220 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10221 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10222 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10223 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10224 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10225 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
|
10226 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
|
10227 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10228 { |
| 10229 int j; | |
| 10230 int i; | |
| 10231 unsigned temp; | |
| 10232 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10233 int cursor_col = 0; |
| 7 | 10234 int cursor_end; |
| 10235 int result_empty; /* result is empty until end of region */ | |
| 10236 int can_delete; /* deleting line codes can be used */ | |
| 10237 int type; | |
| 10238 | |
| 10239 /* | |
| 10240 * FAIL if | |
| 10241 * - there is no valid screen | |
| 10242 * - the screen has to be redrawn completely | |
| 10243 * - the line count is less than one | |
| 10244 * - 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
|
10245 * - redrawing for a callback and there is a modeless selection |
| 7 | 10246 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10247 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
|
10248 || (!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
|
10249 #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
|
10250 || (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
|
10251 && 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
|
10252 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10253 ) |
| 7 | 10254 return FAIL; |
| 10255 | |
| 10256 /* | |
| 10257 * Check if the rest of the current region will become empty. | |
| 10258 */ | |
| 10259 result_empty = row + line_count >= end; | |
| 10260 | |
| 10261 /* | |
| 10262 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10263 * available. | |
| 10264 */ | |
| 10265 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10266 | |
| 10267 /* | |
| 10268 * There are six ways to delete lines: | |
| 10269 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10270 * characters from ScreenLines[]. | |
| 10271 * 1. Use T_CD if it exists and the result is empty. | |
| 10272 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10273 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10274 * none of the other ways work. | |
| 10275 * 4. Use T_CE (erase line) if the result is empty. | |
| 10276 * 5. Use T_DL (delete line) if it exists. | |
| 10277 * 6. redraw the characters from ScreenLines[]. | |
| 10278 */ | |
| 10279 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10280 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
|
10281 else if (can_clear(T_CD) && result_empty) |
| 7 | 10282 type = USE_T_CD; |
| 10283 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10284 /* | |
| 10285 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10286 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10287 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10288 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10289 * the trick... | |
| 10290 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10291 * (Olaf Seibert) | |
| 10292 */ | |
| 10293 else if (row == 0 && T_DB == empty_option | |
| 10294 && (line_count == 1 || *T_CDL == NUL)) | |
| 10295 #else | |
| 10296 else if (row == 0 && ( | |
| 10297 #ifndef AMIGA | |
| 10298 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10299 * up, so use delete-line command */ | |
| 10300 line_count == 1 || | |
| 10301 #endif | |
| 10302 *T_CDL == NUL)) | |
| 10303 #endif | |
| 10304 type = USE_NL; | |
| 10305 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10306 type = USE_T_CDL; | |
| 10307 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
|
10308 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10309 type = USE_T_CE; |
| 10310 else if (*T_DL != NUL && can_delete) | |
| 10311 type = USE_T_DL; | |
| 10312 else if (*T_CDL != NUL && can_delete) | |
| 10313 type = USE_T_CDL; | |
| 10314 else | |
| 10315 return FAIL; | |
| 10316 | |
| 10317 #ifdef FEAT_CLIPBOARD | |
| 10318 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10319 * 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
|
10320 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10321 clip_clear_selection(&clip_star); |
| 7 | 10322 else |
| 10323 clip_scroll_selection(line_count); | |
| 10324 #endif | |
| 10325 | |
| 10326 #ifdef FEAT_GUI | |
| 10327 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10328 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10329 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
|
10330 && gui.cursor_row < end + off); |
| 7 | 10331 #endif |
| 10332 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10333 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
|
10334 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
|
10335 |
| 7 | 10336 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10337 { | |
| 10338 cursor_row = row; | |
| 10339 cursor_end = end; | |
| 10340 } | |
| 10341 else | |
| 10342 { | |
| 10343 cursor_row = row + off; | |
| 10344 cursor_end = end + off; | |
| 10345 } | |
| 10346 | |
| 10347 /* | |
| 10348 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10349 * Clear the inserted lines in ScreenLines[]. | |
| 10350 */ | |
| 10351 row += off; | |
| 10352 end += off; | |
| 10353 for (i = 0; i < line_count; ++i) | |
| 10354 { | |
| 10355 if (wp != NULL && wp->w_width != Columns) | |
| 10356 { | |
| 10357 /* need to copy part of a line */ | |
| 10358 j = row + i; | |
| 10359 while ((j += line_count) <= end - 1) | |
| 10360 linecopy(j - line_count, j, wp); | |
| 10361 j -= line_count; | |
| 10362 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
|
10363 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
|
10364 clear_attr); |
| 7 | 10365 else |
| 10366 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10367 LineWraps[j] = FALSE; | |
| 10368 } | |
| 10369 else | |
| 10370 { | |
| 10371 /* whole width, moving the line pointers is faster */ | |
| 10372 j = row + i; | |
| 10373 temp = LineOffset[j]; | |
| 10374 while ((j += line_count) <= end - 1) | |
| 10375 { | |
| 10376 LineOffset[j - line_count] = LineOffset[j]; | |
| 10377 LineWraps[j - line_count] = LineWraps[j]; | |
| 10378 } | |
| 10379 LineOffset[j - line_count] = temp; | |
| 10380 LineWraps[j - line_count] = FALSE; | |
| 10381 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
|
10382 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10383 else |
| 10384 lineinvalid(temp, (int)Columns); | |
| 10385 } | |
| 10386 } | |
| 10387 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10388 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
|
10389 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10390 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
|
10391 screen_start_highlight(clear_attr); |
| 7 | 10392 |
| 10393 /* redraw the characters */ | |
| 10394 if (type == USE_REDRAW) | |
| 10395 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
|
10396 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10397 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10398 windgoto(cursor_row, cursor_col); |
| 7 | 10399 out_str(T_CD); |
| 10400 screen_start(); /* don't know where cursor is now */ | |
| 10401 } | |
| 10402 else if (type == USE_T_CDL) | |
| 10403 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10404 windgoto(cursor_row, cursor_col); |
| 7 | 10405 term_delete_lines(line_count); |
| 10406 screen_start(); /* don't know where cursor is now */ | |
| 10407 } | |
| 10408 /* | |
| 10409 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10410 * the whole screen (scroll region) up by outputting newlines on the | |
| 10411 * last line. | |
| 10412 */ | |
| 10413 else if (type == USE_NL) | |
| 10414 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10415 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10416 for (i = line_count; --i >= 0; ) |
| 10417 out_char('\n'); /* cursor will remain on same line */ | |
| 10418 } | |
| 10419 else | |
| 10420 { | |
| 10421 for (i = line_count; --i >= 0; ) | |
| 10422 { | |
| 10423 if (type == USE_T_DL) | |
| 10424 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10425 windgoto(cursor_row, cursor_col); |
| 7 | 10426 out_str(T_DL); /* delete a line */ |
| 10427 } | |
| 10428 else /* type == USE_T_CE */ | |
| 10429 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10430 windgoto(cursor_row + i, cursor_col); |
| 7 | 10431 out_str(T_CE); /* erase a line */ |
| 10432 } | |
| 10433 screen_start(); /* don't know where cursor is now */ | |
| 10434 } | |
| 10435 } | |
| 10436 | |
| 10437 /* | |
| 10438 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10439 * scrolled up at the bottom of the region. | |
| 10440 */ | |
| 10441 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10442 { | |
| 10443 for (i = line_count; i > 0; --i) | |
| 10444 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10445 windgoto(cursor_end - i, cursor_col); |
| 7 | 10446 out_str(T_CE); /* erase a line */ |
| 10447 screen_start(); /* don't know where cursor is now */ | |
| 10448 } | |
| 10449 } | |
| 10450 | |
| 10451 #ifdef FEAT_GUI | |
| 10452 gui_can_update_cursor(); | |
| 10453 if (gui.in_use) | |
| 10454 out_flush(); /* always flush after a scroll */ | |
| 10455 #endif | |
| 10456 | |
| 10457 return OK; | |
| 10458 } | |
| 10459 | |
| 10460 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10461 * 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
|
10462 * 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
|
10463 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10464 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10465 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10466 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10467 // 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
|
10468 // 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
|
10469 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10470 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10471 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10472 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10473 { |
|
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
|
10474 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
|
10475 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10476 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10477 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10478 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10479 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10480 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10481 * Show the current mode and ruler. |
| 7 | 10482 * |
| 10483 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10484 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10485 * 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
|
10486 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10487 * Return the length of the message (0 if no message). |
| 10488 */ | |
| 10489 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10490 showmode(void) |
| 7 | 10491 { |
| 10492 int need_clear; | |
| 10493 int length = 0; | |
| 10494 int do_mode; | |
| 10495 int attr; | |
| 10496 int nwr_save; | |
| 10497 #ifdef FEAT_INS_EXPAND | |
| 10498 int sub_attr; | |
| 10499 #endif | |
| 10500 | |
| 642 | 10501 do_mode = ((p_smd && msg_silent == 0) |
| 10502 && ((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
|
10503 || restart_edit != NUL |
| 5735 | 10504 || 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
|
10505 if (do_mode || reg_recording != 0) |
| 7 | 10506 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10507 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10508 return 0; // show mode later |
| 7 | 10509 |
| 10510 nwr_save = need_wait_return; | |
| 10511 | |
| 10512 /* wait a bit before overwriting an important message */ | |
| 10513 check_for_delay(FALSE); | |
| 10514 | |
| 10515 /* if the cmdline is more than one line high, erase top lines */ | |
| 10516 need_clear = clear_cmdline; | |
| 10517 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10518 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10519 | |
| 10520 /* Position on the last line in the window, column 0 */ | |
| 10521 msg_pos_mode(); | |
| 10522 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10523 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10524 if (do_mode) |
| 10525 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10526 msg_puts_attr("--", attr); |
| 7 | 10527 #if defined(FEAT_XIM) |
| 2520 | 10528 if ( |
| 10529 # ifdef FEAT_GUI_GTK | |
| 10530 preedit_get_status() | |
| 1668 | 10531 # else |
| 10532 im_get_status() | |
| 2520 | 10533 # endif |
| 1668 | 10534 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10535 # 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
|
10536 msg_puts_attr(" IM", attr); |
| 7 | 10537 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10538 msg_puts_attr(" XIM", attr); |
| 7 | 10539 # endif |
| 10540 #endif | |
| 10541 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10542 if (gui.in_use) | |
| 10543 { | |
| 10544 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10545 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10546 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10547 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10548 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
|
10549 else |
|
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(" \307\321\261\333", attr); |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10551 } |
| 7 | 10552 } |
| 10553 #endif | |
| 10554 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10555 /* CTRL-X in Insert mode */ |
| 10556 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10557 { |
| 10558 /* These messages can get long, avoid a wrap in a narrow | |
| 10559 * window. Prefer showing edit_submode_extra. */ | |
| 10560 length = (Rows - msg_row) * Columns - 3; | |
| 10561 if (edit_submode_extra != NULL) | |
| 10562 length -= vim_strsize(edit_submode_extra); | |
| 10563 if (length > 0) | |
| 10564 { | |
| 10565 if (edit_submode_pre != NULL) | |
| 10566 length -= vim_strsize(edit_submode_pre); | |
| 10567 if (length - vim_strsize(edit_submode) > 0) | |
| 10568 { | |
| 10569 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
|
10570 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
|
10571 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10572 } |
| 10573 if (edit_submode_extra != NULL) | |
| 10574 { | |
|
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(" ", attr); /* add a space in between */ |
| 7 | 10576 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
|
10577 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10578 else |
| 10579 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10580 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10581 } |
| 10582 } | |
| 10583 } | |
| 10584 else | |
| 10585 #endif | |
| 10586 { | |
| 10587 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
|
10588 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10589 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
|
10590 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10591 else if (State & INSERT) |
| 10592 { | |
| 10593 #ifdef FEAT_RIGHTLEFT | |
| 10594 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10595 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
|
10596 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10597 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10598 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10599 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
|
10600 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10601 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
|
10602 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10603 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
|
10604 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10605 #ifdef FEAT_RIGHTLEFT |
| 10606 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10607 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10608 #endif |
| 10609 #ifdef FEAT_KEYMAP | |
| 10610 if (State & LANGMAP) | |
| 10611 { | |
| 10612 # ifdef FEAT_ARABIC | |
| 10613 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
|
10614 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10615 else |
| 10616 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10617 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
|
10618 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10619 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10620 } |
| 10621 #endif | |
| 10622 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
|
10623 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10624 |
| 10625 if (VIsual_active) | |
| 10626 { | |
| 10627 char *p; | |
| 10628 | |
| 10629 /* Don't concatenate separate words to avoid translation | |
| 10630 * problems. */ | |
| 10631 switch ((VIsual_select ? 4 : 0) | |
| 10632 + (VIsual_mode == Ctrl_V) * 2 | |
| 10633 + (VIsual_mode == 'V')) | |
| 10634 { | |
| 10635 case 0: p = N_(" VISUAL"); break; | |
| 10636 case 1: p = N_(" VISUAL LINE"); break; | |
| 10637 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10638 case 4: p = N_(" SELECT"); break; | |
| 10639 case 5: p = N_(" SELECT LINE"); break; | |
| 10640 default: p = N_(" SELECT BLOCK"); break; | |
| 10641 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10642 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
|
10643 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10644 msg_puts_attr(" --", attr); |
| 7 | 10645 } |
| 644 | 10646 |
| 7 | 10647 need_clear = TRUE; |
| 10648 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10649 if (reg_recording != 0 |
| 7 | 10650 #ifdef FEAT_INS_EXPAND |
| 10651 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10652 #endif | |
| 10653 ) | |
| 10654 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10655 recording_mode(attr); |
| 7 | 10656 need_clear = TRUE; |
| 10657 } | |
| 644 | 10658 |
| 10659 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
|
10660 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10661 msg_clr_eos(); |
| 10662 msg_didout = FALSE; /* overwrite this message */ | |
| 10663 length = msg_col; | |
| 10664 msg_col = 0; | |
| 10665 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10666 } | |
| 10667 else if (clear_cmdline && msg_silent == 0) | |
| 10668 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10669 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
|
10670 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
|
10671 { |
|
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
|
10672 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
|
10673 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
|
10674 } |
| 7 | 10675 |
| 10676 #ifdef FEAT_CMDL_INFO | |
| 10677 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10678 if (VIsual_active) | |
| 10679 clear_showcmd(); | |
| 10680 | |
| 10681 /* If the last window has no status line, the ruler is after the mode | |
| 10682 * 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
|
10683 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
|
10684 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10685 #endif |
| 10686 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
|
10687 redraw_mode = FALSE; |
| 7 | 10688 clear_cmdline = FALSE; |
| 10689 | |
| 10690 return length; | |
| 10691 } | |
| 10692 | |
| 10693 /* | |
| 10694 * Position for a mode message. | |
| 10695 */ | |
| 10696 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10697 msg_pos_mode(void) |
| 7 | 10698 { |
| 10699 msg_col = 0; | |
| 10700 msg_row = Rows - 1; | |
| 10701 } | |
| 10702 | |
| 10703 /* | |
| 10704 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10705 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10706 * Caller should check "mode_displayed". |
| 7 | 10707 */ |
| 10708 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10709 unshowmode(int force) |
| 7 | 10710 { |
| 10711 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10712 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10713 */ |
| 10714 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10715 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10716 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10717 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10718 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10719 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10720 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10721 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10722 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10723 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10724 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10725 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10726 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
|
10727 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
|
10728 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10729 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
|
10730 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
|
10731 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
|
10732 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10733 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10734 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10735 msg_row = save_msg_row; |
| 7 | 10736 } |
| 10737 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10738 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10739 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10740 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10741 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10742 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10743 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10744 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10745 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10746 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
|
10747 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10748 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10749 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10750 |
| 667 | 10751 /* |
| 10752 * Draw the tab pages line at the top of the Vim window. | |
| 10753 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10754 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10755 draw_tabline(void) |
| 667 | 10756 { |
| 10757 int tabcount = 0; | |
| 10758 tabpage_T *tp; | |
| 10759 int tabwidth; | |
| 10760 int col = 0; | |
| 673 | 10761 int scol = 0; |
| 667 | 10762 int attr; |
| 10763 win_T *wp; | |
| 671 | 10764 win_T *cwp; |
| 10765 int wincount; | |
| 10766 int modified; | |
| 667 | 10767 int c; |
| 10768 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10769 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
|
10770 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
|
10771 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10772 char_u *p; |
| 677 | 10773 int room; |
| 10774 int use_sep_chars = (t_colors < 8 | |
| 10775 #ifdef FEAT_GUI | |
| 10776 && !gui.in_use | |
| 10777 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10778 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10779 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10780 #endif |
| 677 | 10781 ); |
| 673 | 10782 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10783 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10784 return; |
| 673 | 10785 redraw_tabline = FALSE; |
| 667 | 10786 |
| 685 | 10787 #ifdef FEAT_GUI_TABLINE |
| 798 | 10788 /* Take care of a GUI tabline. */ |
| 685 | 10789 if (gui_use_tabline()) |
| 10790 { | |
| 10791 gui_update_tabline(); | |
| 10792 return; | |
| 10793 } | |
| 10794 #endif | |
| 10795 | |
| 10796 if (tabline_height() < 1) | |
| 667 | 10797 return; |
| 10798 | |
| 677 | 10799 #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
|
10800 clear_TabPageIdxs(); |
| 681 | 10801 |
| 677 | 10802 /* Use the 'tabline' option if it's set. */ |
| 10803 if (*p_tal != NUL) | |
| 10804 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10805 int saved_did_emsg = did_emsg; |
| 680 | 10806 |
| 10807 /* Check for an error. If there is one we would loop in redrawing the | |
| 10808 * 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
|
10809 did_emsg = FALSE; |
| 677 | 10810 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10811 if (did_emsg) |
| 680 | 10812 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10813 (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
|
10814 did_emsg |= saved_did_emsg; |
| 680 | 10815 } |
| 10816 else | |
| 10817 #endif | |
| 10818 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10819 FOR_ALL_TABPAGES(tp) |
| 680 | 10820 ++tabcount; |
| 10821 | |
| 10822 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10823 if (tabwidth < 6) | |
| 10824 tabwidth = 6; | |
| 10825 | |
| 10826 attr = attr_nosel; | |
| 10827 tabcount = 0; | |
| 699 | 10828 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10829 tp = tp->tp_next) | |
| 680 | 10830 { |
| 10831 scol = col; | |
| 10832 | |
| 10833 if (tp->tp_topframe == topframe) | |
| 10834 attr = attr_sel; | |
| 10835 if (use_sep_chars && col > 0) | |
| 10836 screen_putchar('|', 0, col++, attr); | |
| 10837 | |
| 10838 if (tp->tp_topframe != topframe) | |
| 10839 attr = attr_nosel; | |
| 10840 | |
| 10841 screen_putchar(' ', 0, col++, attr); | |
| 10842 | |
| 10843 if (tp == curtab) | |
| 10844 { | |
| 10845 cwp = curwin; | |
| 10846 wp = firstwin; | |
| 10847 } | |
| 10848 else | |
| 10849 { | |
| 10850 cwp = tp->tp_curwin; | |
| 10851 wp = tp->tp_firstwin; | |
| 10852 } | |
| 10853 | |
| 10854 modified = FALSE; | |
| 10855 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10856 if (bufIsChanged(wp->w_buffer)) | |
| 10857 modified = TRUE; | |
| 10858 if (modified || wincount > 1) | |
| 10859 { | |
| 10860 if (wincount > 1) | |
| 10861 { | |
| 10862 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10863 len = (int)STRLEN(NameBuff); |
| 699 | 10864 if (col + len >= Columns - 3) |
| 10865 break; | |
| 680 | 10866 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10867 #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
|
10868 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10869 #else |
| 6106 | 10870 attr |
| 680 | 10871 #endif |
| 10872 ); | |
| 10873 col += len; | |
| 10874 } | |
| 10875 if (modified) | |
| 10876 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10877 screen_putchar(' ', 0, col++, attr); | |
| 10878 } | |
| 10879 | |
| 10880 room = scol - col + tabwidth - 1; | |
| 10881 if (room > 0) | |
| 10882 { | |
| 685 | 10883 /* Get buffer name in NameBuff[] */ |
| 10884 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10885 shorten_dir(NameBuff); |
| 680 | 10886 len = vim_strsize(NameBuff); |
| 10887 p = NameBuff; | |
| 10888 if (has_mbyte) | |
| 10889 while (len > room) | |
| 10890 { | |
| 10891 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10892 MB_PTR_ADV(p); |
| 680 | 10893 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10894 else if (len > room) |
| 677 | 10895 { |
| 680 | 10896 p += len - room; |
| 10897 len = room; | |
| 677 | 10898 } |
| 699 | 10899 if (len > Columns - col - 1) |
| 10900 len = Columns - col - 1; | |
| 680 | 10901 |
| 835 | 10902 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10903 col += len; |
| 10904 } | |
| 10905 screen_putchar(' ', 0, col++, attr); | |
| 10906 | |
| 10907 /* Store the tab page number in TabPageIdxs[], so that | |
| 10908 * jump_to_mouse() knows where each one is. */ | |
| 10909 ++tabcount; | |
| 10910 while (scol < col) | |
| 10911 TabPageIdxs[scol++] = tabcount; | |
| 10912 } | |
| 10913 | |
| 10914 if (use_sep_chars) | |
| 10915 c = '_'; | |
| 10916 else | |
| 10917 c = ' '; | |
| 10918 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10919 |
| 10920 /* Put an "X" for closing the current tab if there are several. */ | |
| 10921 if (first_tabpage->tp_next != NULL) | |
| 10922 { | |
| 10923 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10924 TabPageIdxs[Columns - 1] = -999; | |
| 10925 } | |
| 10926 } | |
| 834 | 10927 |
| 10928 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10929 * set. */ | |
| 10930 redraw_tabline = FALSE; | |
| 667 | 10931 } |
| 685 | 10932 |
| 10933 /* | |
| 10934 * Get buffer name for "buf" into NameBuff[]. | |
| 10935 * Takes care of special buffer names and translates special characters. | |
| 10936 */ | |
| 10937 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10938 get_trans_bufname(buf_T *buf) |
| 685 | 10939 { |
| 10940 if (buf_spname(buf) != NULL) | |
| 3839 | 10941 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10942 else |
| 10943 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10944 trans_characters(NameBuff, MAXPATHL); | |
| 10945 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10946 |
| 7 | 10947 /* |
| 10948 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10949 */ | |
| 10950 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
|
10951 fillchar_status(int *attr, win_T *wp) |
| 7 | 10952 { |
| 10953 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
|
10954 |
|
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
|
10955 #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
|
10956 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
|
10957 { |
|
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
|
10958 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
|
10959 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10960 *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
|
10961 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
|
10962 } |
|
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 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10964 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10965 *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
|
10966 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
|
10967 } |
|
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
|
10968 } |
|
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
|
10969 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
|
10970 #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
|
10971 if (wp == curwin) |
| 7 | 10972 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10973 *attr = HL_ATTR(HLF_S); |
| 7 | 10974 fill = fill_stl; |
| 10975 } | |
| 10976 else | |
| 10977 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10978 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10979 fill = fill_stlnc; |
| 10980 } | |
| 10981 /* Use fill when there is highlighting, and highlighting of current | |
| 10982 * window differs, or the fillchars differ, or this is not the | |
| 10983 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10984 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
|
10985 || wp != curwin || ONE_WINDOW) |
| 7 | 10986 || (fill_stl != fill_stlnc))) |
| 10987 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
|
10988 if (wp == curwin) |
| 7 | 10989 return '^'; |
| 10990 return '='; | |
| 10991 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10992 |
| 7 | 10993 /* |
| 10994 * Get the character to use in a separator between vertically split windows. | |
| 10995 * Get its attributes in "*attr". | |
| 10996 */ | |
| 10997 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10998 fillchar_vsep(int *attr) |
| 7 | 10999 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
11000 *attr = HL_ATTR(HLF_C); |
| 7 | 11001 if (*attr == 0 && fill_vert == ' ') |
| 11002 return '|'; | |
| 11003 else | |
| 11004 return fill_vert; | |
| 11005 } | |
| 11006 | |
| 11007 /* | |
| 11008 * Return TRUE if redrawing should currently be done. | |
| 11009 */ | |
| 11010 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11011 redrawing(void) |
| 7 | 11012 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11013 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11014 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
|
11015 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11016 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11017 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11018 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11019 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11020 || 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
|
11021 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11022 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 11023 } |
| 11024 | |
| 11025 /* | |
| 11026 * Return TRUE if printing messages should currently be done. | |
| 11027 */ | |
| 11028 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11029 messaging(void) |
| 7 | 11030 { |
| 11031 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 11032 } | |
| 11033 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11034 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11035 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11036 * 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
|
11037 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11038 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11039 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
|
11040 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11041 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11042 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
|
11043 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
|
11044 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11045 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11046 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
|
11047 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
|
11048 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
|
11049 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11050 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
|
11051 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
|
11052 ++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
|
11053 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
|
11054 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11055 /* 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
|
11056 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
|
11057 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
|
11058 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11059 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
|
11060 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
|
11061 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11062 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11063 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11064 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
|
11065 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
|
11066 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11067 } |
|
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_startcol = col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11070 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
|
11071 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
|
11072 break; |
|
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 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
|
11075 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
|
11076 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11077 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
|
11078 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11079 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11080 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
|
11081 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
|
11082 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11083 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11084 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
|
11085 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11086 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
|
11087 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11088 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11089 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
|
11090 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11091 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
|
11092 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11093 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11094 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
|
11095 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11096 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
|
11097 (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
|
11098 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11099 #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
|
11100 |
| 7 | 11101 /* |
| 11102 * Show current status info in ruler and various other places | |
| 11103 * If always is FALSE, only show ruler if position has changed. | |
| 11104 */ | |
| 11105 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11106 showruler(int always) |
| 7 | 11107 { |
| 11108 if (!always && !redrawing()) | |
| 11109 return; | |
| 574 | 11110 #ifdef FEAT_INS_EXPAND |
| 11111 if (pum_visible()) | |
| 11112 { | |
| 11113 /* Don't redraw right now, do it later. */ | |
| 11114 curwin->w_redr_status = TRUE; | |
| 11115 return; | |
| 11116 } | |
| 11117 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11118 #if defined(FEAT_STL_OPT) |
| 40 | 11119 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 11120 redraw_custom_statusline(curwin); |
| 7 | 11121 else |
| 11122 #endif | |
| 11123 #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
|
11124 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11125 #endif |
| 11126 | |
| 11127 #ifdef FEAT_TITLE | |
| 11128 if (need_maketitle | |
| 11129 # ifdef FEAT_STL_OPT | |
| 11130 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11131 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11132 # endif | |
| 11133 ) | |
| 11134 maketitle(); | |
| 11135 #endif | |
| 1588 | 11136 /* Redraw the tab pages line if needed. */ |
| 11137 if (redraw_tabline) | |
| 11138 draw_tabline(); | |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11139 |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11140 #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
|
11141 // Display popup windows on top of everything. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11142 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11143 #endif |
| 7 | 11144 } |
| 11145 | |
| 11146 #ifdef FEAT_CMDL_INFO | |
| 11147 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
|
11148 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11149 { |
| 1869 | 11150 #define RULER_BUF_LEN 70 |
| 11151 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11152 int row; |
| 11153 int fillchar; | |
| 11154 int attr; | |
| 11155 int empty_line = FALSE; | |
| 11156 colnr_T virtcol; | |
| 11157 int i; | |
| 1869 | 11158 size_t len; |
| 7 | 11159 int o; |
| 11160 int this_ru_col; | |
| 11161 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
11162 int width; |
| 7 | 11163 |
| 11164 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11165 if (!p_ru) | |
| 11166 return; | |
| 11167 | |
| 11168 /* | |
| 11169 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11170 * after deleting lines, before cursor.lnum is corrected. | |
| 11171 */ | |
| 11172 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11173 return; | |
| 11174 | |
| 11175 #ifdef FEAT_INS_EXPAND | |
| 11176 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11177 * the (long) mode message. */ | |
| 11178 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11179 if (edit_submode != NULL) | |
| 11180 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
|
11181 // 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
|
11182 // 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
|
11183 if (!ignore_pum && pum_visible()) |
| 540 | 11184 return; |
| 7 | 11185 #endif |
| 11186 | |
| 11187 #ifdef FEAT_STL_OPT | |
| 11188 if (*p_ruf) | |
| 11189 { | |
| 680 | 11190 int save_called_emsg = called_emsg; |
| 11191 | |
| 11192 called_emsg = FALSE; | |
| 7 | 11193 win_redr_custom(wp, TRUE); |
| 680 | 11194 if (called_emsg) |
| 11195 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11196 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11197 called_emsg |= save_called_emsg; |
| 7 | 11198 return; |
| 11199 } | |
| 11200 #endif | |
| 11201 | |
| 11202 /* | |
| 11203 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11204 */ | |
| 11205 if (!(State & INSERT) | |
| 11206 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11207 empty_line = TRUE; | |
| 11208 | |
| 11209 /* | |
| 11210 * Only draw the ruler when something changed. | |
| 11211 */ | |
| 11212 validate_virtcol_win(wp); | |
| 11213 if ( redraw_cmdline | |
| 11214 || always | |
| 11215 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11216 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11217 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11218 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11219 || wp->w_topline != wp->w_ru_topline | |
| 11220 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11221 #ifdef FEAT_DIFF | |
| 11222 || wp->w_topfill != wp->w_ru_topfill | |
| 11223 #endif | |
| 11224 || empty_line != wp->w_ru_empty) | |
| 11225 { | |
| 11226 cursor_off(); | |
| 11227 if (wp->w_status_height) | |
| 11228 { | |
| 11229 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
|
11230 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
|
11231 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
|
11232 width = wp->w_width; |
| 7 | 11233 } |
| 11234 else | |
| 11235 { | |
| 11236 row = Rows - 1; | |
| 11237 fillchar = ' '; | |
| 11238 attr = 0; | |
| 11239 width = Columns; | |
| 11240 off = 0; | |
| 11241 } | |
| 11242 | |
| 11243 /* In list mode virtcol needs to be recomputed */ | |
| 11244 virtcol = wp->w_virtcol; | |
| 11245 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11246 { | |
| 11247 wp->w_p_list = FALSE; | |
| 11248 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11249 wp->w_p_list = TRUE; | |
| 11250 } | |
| 11251 | |
| 11252 /* | |
| 11253 * Some sprintfs return the length, some return a pointer. | |
| 11254 * To avoid portability problems we use strlen() here. | |
| 11255 */ | |
| 1869 | 11256 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11257 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11258 ? 0L | |
| 11259 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11260 len = STRLEN(buffer); |
| 11261 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11262 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11263 (int)virtcol + 1); | |
| 11264 | |
| 11265 /* | |
| 11266 * Add a "50%" if there is room for it. | |
| 11267 * On the last line, don't print in the last column (scrolls the | |
| 11268 * screen up on some terminals). | |
| 11269 */ | |
| 11270 i = (int)STRLEN(buffer); | |
| 1869 | 11271 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11272 o = i + vim_strsize(buffer + i + 1); |
| 11273 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11274 ++o; | |
| 11275 this_ru_col = ru_col - (Columns - width); | |
| 11276 if (this_ru_col < 0) | |
| 11277 this_ru_col = 0; | |
| 11278 /* Never use more than half the window/screen width, leave the other | |
| 11279 * 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
|
11280 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
|
11281 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
|
11282 if (this_ru_col + o < width) |
| 7 | 11283 { |
| 6466 | 11284 /* 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
|
11285 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11286 { |
| 11287 if (has_mbyte) | |
| 11288 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11289 else | |
| 11290 buffer[i++] = fillchar; | |
| 11291 ++o; | |
| 11292 } | |
| 1869 | 11293 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11294 } |
| 11295 /* Truncate at window boundary. */ | |
| 11296 if (has_mbyte) | |
| 11297 { | |
| 11298 o = 0; | |
| 474 | 11299 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11300 { |
| 11301 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
|
11302 if (this_ru_col + o > width) |
| 7 | 11303 { |
| 11304 buffer[i] = NUL; | |
| 11305 break; | |
| 11306 } | |
| 11307 } | |
| 11308 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11309 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
|
11310 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
|
11311 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11312 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11313 i = redraw_cmdline; |
| 11314 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
|
11315 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
|
11316 (int)(off + width), |
| 7 | 11317 fillchar, fillchar, attr); |
| 11318 /* don't redraw the cmdline because of showing the ruler */ | |
| 11319 redraw_cmdline = i; | |
| 11320 wp->w_ru_cursor = wp->w_cursor; | |
| 11321 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11322 wp->w_ru_empty = empty_line; | |
| 11323 wp->w_ru_topline = wp->w_topline; | |
| 11324 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11325 #ifdef FEAT_DIFF | |
| 11326 wp->w_ru_topfill = wp->w_topfill; | |
| 11327 #endif | |
| 11328 } | |
| 11329 } | |
| 11330 #endif | |
| 13 | 11331 |
| 11332 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11333 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11334 * 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
|
11335 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11336 * Otherwise it depends on 'numberwidth' and the line count. |
| 11337 */ | |
| 11338 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11339 number_width(win_T *wp) |
| 13 | 11340 { |
| 11341 int n; | |
| 11342 linenr_T lnum; | |
| 11343 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11344 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
|
11345 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11346 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11347 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11348 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11349 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
|
11350 |
| 6679 | 11351 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11352 return wp->w_nrwidth_width; |
| 11353 wp->w_nrwidth_line_count = lnum; | |
| 11354 | |
| 11355 n = 0; | |
| 11356 do | |
| 11357 { | |
| 856 | 11358 lnum /= 10; |
| 11359 ++n; | |
| 13 | 11360 } while (lnum > 0); |
| 11361 | |
| 11362 /* 'numberwidth' gives the minimal width plus one */ | |
| 11363 if (n < wp->w_p_nuw - 1) | |
| 11364 n = wp->w_p_nuw - 1; | |
| 11365 | |
| 11366 wp->w_nrwidth_width = n; | |
| 6679 | 11367 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11368 return n; |
| 11369 } | |
| 11370 #endif | |
| 3986 | 11371 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11372 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11373 /* |
| 11374 * Return the current cursor column. This is the actual position on the | |
| 11375 * screen. First column is 0. | |
| 11376 */ | |
| 11377 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11378 screen_screencol(void) |
| 3986 | 11379 { |
| 11380 return screen_cur_col; | |
| 11381 } | |
| 11382 | |
| 11383 /* | |
| 11384 * Return the current cursor row. This is the actual position on the screen. | |
| 11385 * First row is 0. | |
| 11386 */ | |
| 11387 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11388 screen_screenrow(void) |
| 3986 | 11389 { |
| 11390 return screen_cur_row; | |
| 11391 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11392 #endif |