Mercurial > vim
annotate src/screen.c @ 16882:473e76401434 v8.1.1442
patch 8.1.1442: popup windows not considered when the Vim window is resized
commit https://github.com/vim/vim/commit/8caaf82569a6bfec2b575997b3a84e5623eff12d
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Jun 1 18:11:22 2019 +0200
patch 8.1.1442: popup windows not considered when the Vim window is resized
Problem: Popup windows not considered when the Vim window is resized.
(Ben Jackson)
Solution: Reallocate the w_lines structure. (closes #4467)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Sat, 01 Jun 2019 18:15:04 +0200 |
| parents | 998603a243d7 |
| children | 59e4148c0c73 |
| 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()) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
616 type = NOT_VALID; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
617 #endif |
| 7 | 618 |
| 619 updating_screen = TRUE; | |
| 620 #ifdef FEAT_SYN_HL | |
| 621 ++display_tick; /* let syntax code know we're in a next round of | |
| 622 * display updating */ | |
| 623 #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
|
624 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
|
625 ++no_win_do_lines_ins; |
| 7 | 626 |
| 627 /* | |
| 628 * if the screen was scrolled up when displaying a message, scroll it down | |
| 629 */ | |
| 630 if (msg_scrolled) | |
| 631 { | |
| 632 clear_cmdline = TRUE; | |
| 633 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 634 type = CLEAR; | |
| 635 else if (type != CLEAR) | |
| 636 { | |
| 637 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
|
638 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
|
639 == FAIL) |
| 7 | 640 type = CLEAR; |
| 641 FOR_ALL_WINDOWS(wp) | |
| 642 { | |
| 643 if (W_WINROW(wp) < msg_scrolled) | |
| 644 { | |
| 645 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 646 && wp->w_redr_type < REDRAW_TOP | |
| 647 && wp->w_lines_valid > 0 | |
| 648 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 649 { | |
| 650 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 651 wp->w_redr_type = REDRAW_TOP; | |
| 652 } | |
| 653 else | |
| 654 { | |
| 655 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
|
656 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
|
657 <= msg_scrolled) |
| 7 | 658 wp->w_redr_status = TRUE; |
| 659 } | |
| 660 } | |
| 661 } | |
|
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
|
662 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
|
663 redraw_cmdline = TRUE; |
| 673 | 664 redraw_tabline = TRUE; |
| 7 | 665 } |
| 666 msg_scrolled = 0; | |
| 667 need_wait_return = FALSE; | |
| 668 } | |
| 669 | |
| 670 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 671 compute_cmdrow(); | |
| 672 | |
| 673 /* Check for changed highlighting */ | |
| 674 if (need_highlight_changed) | |
| 675 highlight_changed(); | |
| 676 | |
| 677 if (type == CLEAR) /* first clear screen */ | |
| 678 { | |
| 679 screenclear(); /* will reset clear_cmdline */ | |
| 680 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
|
681 /* 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
|
682 must_redraw = 0; |
| 7 | 683 } |
| 684 | |
| 685 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 686 check_for_delay(FALSE); | |
| 687 | |
| 13 | 688 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
689 /* 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
|
690 * changes. */ |
| 13 | 691 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
692 && 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
|
693 ? number_width(curwin) : 0)) |
| 13 | 694 curwin->w_redr_type = NOT_VALID; |
| 695 #endif | |
| 696 | |
| 7 | 697 /* |
| 698 * Only start redrawing if there is really something to do. | |
| 699 */ | |
| 700 if (type == INVERTED) | |
| 701 update_curswant(); | |
| 702 if (curwin->w_redr_type < type | |
| 703 && !((type == VALID | |
| 704 && curwin->w_lines[0].wl_valid | |
| 705 #ifdef FEAT_DIFF | |
| 706 && curwin->w_topfill == curwin->w_old_topfill | |
| 707 && curwin->w_botfill == curwin->w_old_botfill | |
| 708 #endif | |
| 709 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 710 || (type == INVERTED | |
| 1043 | 711 && VIsual_active |
| 7 | 712 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 713 && curwin->w_old_visual_mode == VIsual_mode | |
| 714 && (curwin->w_valid & VALID_VIRTCOL) | |
| 715 && curwin->w_old_curswant == curwin->w_curswant) | |
| 716 )) | |
| 717 curwin->w_redr_type = type; | |
| 718 | |
| 849 | 719 /* Redraw the tab pages line if needed. */ |
| 720 if (redraw_tabline || type >= NOT_VALID) | |
| 721 draw_tabline(); | |
| 722 | |
| 7 | 723 #ifdef FEAT_SYN_HL |
| 724 /* | |
| 725 * Correct stored syntax highlighting info for changes in each displayed | |
| 726 * buffer. Each buffer must only be done once. | |
| 727 */ | |
| 728 FOR_ALL_WINDOWS(wp) | |
| 729 { | |
| 730 if (wp->w_buffer->b_mod_set) | |
| 731 { | |
| 732 win_T *wwp; | |
| 733 | |
| 734 /* Check if we already did this buffer. */ | |
| 735 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 736 if (wwp->w_buffer == wp->w_buffer) | |
| 737 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
738 if (wwp == wp && syntax_present(wp)) |
| 7 | 739 syn_stack_apply_changes(wp->w_buffer); |
| 740 } | |
| 741 } | |
| 742 #endif | |
| 743 | |
| 744 /* | |
| 745 * Go from top to bottom through the windows, redrawing the ones that need | |
| 746 * it. | |
| 747 */ | |
| 748 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 749 did_one = FALSE; | |
| 750 #endif | |
| 751 #ifdef FEAT_SEARCH_EXTRA | |
| 752 search_hl.rm.regprog = NULL; | |
| 753 #endif | |
| 754 FOR_ALL_WINDOWS(wp) | |
| 755 { | |
| 756 if (wp->w_redr_type != 0) | |
| 757 { | |
| 758 cursor_off(); | |
| 759 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 760 if (!did_one) | |
| 761 { | |
| 762 did_one = TRUE; | |
| 763 # ifdef FEAT_SEARCH_EXTRA | |
| 764 start_search_hl(); | |
| 765 # endif | |
| 766 # ifdef FEAT_CLIPBOARD | |
| 767 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 768 if (clip_star.available && clip_isautosel_star()) |
| 769 clip_update_selection(&clip_star); | |
| 770 if (clip_plus.available && clip_isautosel_plus()) | |
| 771 clip_update_selection(&clip_plus); | |
| 7 | 772 # endif |
| 773 #ifdef FEAT_GUI | |
| 774 /* Remove the cursor before starting to do anything, because | |
| 775 * scrolling may make it difficult to redraw the text under | |
| 776 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
777 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
|
778 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
779 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
780 gui_cursor_row = gui.cursor_row; |
| 7 | 781 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
782 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
783 } |
| 7 | 784 #endif |
| 785 } | |
| 786 #endif | |
| 787 win_update(wp); | |
| 788 } | |
| 789 | |
| 790 /* redraw status line after the window to minimize cursor movement */ | |
| 791 if (wp->w_redr_status) | |
| 792 { | |
| 793 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
794 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 795 } |
| 796 } | |
| 797 #if defined(FEAT_SEARCH_EXTRA) | |
| 798 end_search_hl(); | |
| 799 #endif | |
| 4107 | 800 #ifdef FEAT_INS_EXPAND |
| 801 /* 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
|
802 pum_may_redraw(); |
| 4107 | 803 #endif |
| 7 | 804 |
| 805 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 806 * 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
|
807 FOR_ALL_WINDOWS(wp) |
| 7 | 808 wp->w_buffer->b_mod_set = FALSE; |
| 809 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
810 after_updating_screen(TRUE); |
| 7 | 811 |
| 812 /* Clear or redraw the command line. Done last, because scrolling may | |
| 813 * 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
|
814 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 815 showmode(); |
| 816 | |
|
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
|
817 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
|
818 --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
|
819 |
| 7 | 820 /* 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
|
821 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
822 maybe_intro_message(); |
| 7 | 823 did_intro = TRUE; |
| 824 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
825 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
826 // Display popup windows on top of the others. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
827 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
828 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
829 |
| 7 | 830 #ifdef FEAT_GUI |
| 831 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 832 * done. */ | |
| 833 if (gui.in_use) | |
| 834 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
835 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
|
836 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
837 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
838 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
|
839 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
840 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 /* 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
|
842 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
843 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
844 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
845 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 846 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
847 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
848 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
849 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
850 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
851 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
852 out_flush(); |
| 7 | 853 gui_update_scrollbars(FALSE); |
| 854 } | |
| 855 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
856 return OK; |
| 7 | 857 } |
| 858 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
859 #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
|
860 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
861 * 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
|
862 * 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
|
863 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
864 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 /* 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
|
871 * 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
|
872 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 * 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
|
882 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 { |
|
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
|
886 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
|
887 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
891 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
893 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
|
894 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 /* 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
|
897 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
898 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
900 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
|
901 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
905 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
907 #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
|
908 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
909 * 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
|
910 * 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
|
911 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
912 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
913 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
|
914 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 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
|
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 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
|
918 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
|
919 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
|
920 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
|
921 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
|
922 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
|
923 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
|
924 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
925 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
926 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
|
927 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 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
|
929 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
|
930 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
931 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 * 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
|
934 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
936 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
|
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 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
|
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 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
|
941 /* 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
|
942 * 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
|
943 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
|
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 } |
| 7 | 946 #endif |
| 947 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
948 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 949 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
950 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 951 { |
| 952 win_T *wp; | |
| 953 int doit = FALSE; | |
| 954 | |
| 955 # ifdef FEAT_FOLDING | |
| 956 win_foldinfo.fi_level = 0; | |
| 957 # endif | |
| 958 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
959 // 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
|
960 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
|
961 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
962 // check if it resulted in the need to redraw a window |
| 7 | 963 FOR_ALL_WINDOWS(wp) |
| 964 if (wp->w_redr_type != 0) | |
| 965 doit = TRUE; | |
| 966 | |
| 3250 | 967 /* 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
|
968 * 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
|
969 */ |
| 3250 | 970 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
|
971 || 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
|
972 || msg_scrolled |
| 3250 | 973 #ifdef FEAT_GUI |
| 974 || gui.starting | |
| 975 #endif | |
| 976 || starting) | |
| 7 | 977 return; |
| 978 | |
| 979 /* update all windows that need updating */ | |
| 980 update_prepare(); | |
| 981 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
982 FOR_ALL_WINDOWS(wp) |
| 7 | 983 { |
| 984 if (wp->w_redr_type != 0) | |
| 985 win_update(wp); | |
| 986 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
|
987 win_redr_status(wp, FALSE); |
| 7 | 988 } |
| 989 | |
| 990 update_finish(); | |
| 991 } | |
| 992 #endif | |
| 993 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
994 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
995 static void |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
996 update_popups(void) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
997 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
998 win_T *wp; |
|
16880
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
999 |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1000 // Find the window with the lowest zindex that hasn't been updated yet, |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1001 // so that the window with a higher zindex is drawn later, thus goes on |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1002 // top. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1003 // TODO: don't redraw every popup every time. |
|
16880
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1004 popup_reset_handled(); |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1005 while ((wp = find_next_popup(TRUE)) != NULL) |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1006 { |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
1007 // Recompute the position if the text changed. |
|
16880
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1008 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1009 popup_adjust_position(wp); |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1010 |
|
998603a243d7
patch 8.1.1441: popup window filter not yet implemented
Bram Moolenaar <Bram@vim.org>
parents:
16839
diff
changeset
|
1011 win_update(wp); |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1012 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1013 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
1014 #endif |
| 7 | 1015 |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1016 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1017 * 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
|
1018 * 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
|
1019 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1020 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1021 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
|
1022 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1023 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1024 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1025 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
|
1026 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
|
1027 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1028 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
|
1029 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
|
1030 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1031 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1032 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1033 |
| 7 | 1034 #if defined(FEAT_GUI) || defined(PROTO) |
| 1035 /* | |
| 1036 * Update a single window, its status line and maybe the command line msg. | |
| 1037 * Used for the GUI scrollbar. | |
| 1038 */ | |
| 1039 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1040 updateWindow(win_T *wp) |
| 7 | 1041 { |
| 2008 | 1042 /* return if already busy updating */ |
| 1043 if (updating_screen) | |
| 1044 return; | |
| 1045 | |
| 7 | 1046 update_prepare(); |
| 1047 | |
| 1048 #ifdef FEAT_CLIPBOARD | |
| 1049 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1050 if (clip_star.available && clip_isautosel_star()) |
| 1051 clip_update_selection(&clip_star); | |
| 1052 if (clip_plus.available && clip_isautosel_plus()) | |
| 1053 clip_update_selection(&clip_plus); | |
| 7 | 1054 #endif |
| 670 | 1055 |
| 7 | 1056 win_update(wp); |
| 670 | 1057 |
| 1058 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1059 if (redraw_tabline) |
| 677 | 1060 draw_tabline(); |
| 670 | 1061 |
| 7 | 1062 if (wp->w_redr_status |
| 1063 # ifdef FEAT_CMDL_INFO | |
| 1064 || p_ru | |
| 1065 # endif | |
| 1066 # ifdef FEAT_STL_OPT | |
| 40 | 1067 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1068 # endif |
| 1069 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1070 win_redr_status(wp, FALSE); |
| 7 | 1071 |
| 1072 update_finish(); | |
| 1073 } | |
| 1074 #endif | |
| 1075 | |
| 1076 /* | |
| 1077 * Update a single window. | |
| 1078 * | |
| 1079 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1080 * screen or scrolling lines). | |
| 1081 * | |
| 1082 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1083 * implies the one below it. | |
| 1084 * NOT_VALID redraw the whole window | |
| 743 | 1085 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1086 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1087 * INVERTED redraw the changed part of the Visual area | |
| 1088 * INVERTED_ALL redraw the whole Visual area | |
| 1089 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1090 * 2. update lines at the top when scrolled down | |
| 1091 * 3. redraw changed text: | |
| 301 | 1092 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1093 * b_mod_top and b_mod_bot. |
| 1094 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1095 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1096 * - continue redrawing when syntax status is invalid. | |
| 1097 * 4. if scrolled up, update lines at the bottom. | |
| 1098 * This results in three areas that may need updating: | |
| 1099 * top: from first row to top_end (when scrolled down) | |
| 1100 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1101 * bot: from bot_start to last row (when scrolled up) | |
| 1102 */ | |
| 1103 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1104 win_update(win_T *wp) |
| 7 | 1105 { |
| 1106 buf_T *buf = wp->w_buffer; | |
| 1107 int type; | |
| 1108 int top_end = 0; /* Below last row of the top area that needs | |
| 1109 updating. 0 when no top area updating. */ | |
| 1110 int mid_start = 999;/* first row of the mid area that needs | |
| 1111 updating. 999 when no mid area updating. */ | |
| 1112 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1113 updating. 0 when no mid area updating. */ | |
| 1114 int bot_start = 999;/* first row of the bot area that needs | |
| 1115 updating. 999 when no bot area updating */ | |
| 1116 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1117 w_topline got smaller a bit */ | |
| 1118 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1119 matchitem_T *cur; /* points to the match list */ |
| 7 | 1120 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1121 #endif | |
| 1122 | |
| 1123 int row; /* current window row to display */ | |
| 1124 linenr_T lnum; /* current buffer lnum to display */ | |
| 1125 int idx; /* current index in w_lines[] */ | |
| 1126 int srow; /* starting row of the current line */ | |
| 1127 | |
| 1128 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1129 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1130 int i; | |
| 1131 long j; | |
| 1132 static int recursive = FALSE; /* being called recursively */ | |
| 1133 int old_botline = wp->w_botline; | |
| 1134 #ifdef FEAT_FOLDING | |
| 1135 long fold_count; | |
| 1136 #endif | |
| 1137 #ifdef FEAT_SYN_HL | |
| 1138 /* remember what happened to the previous line, to know if | |
| 1139 * check_visual_highlight() can be used */ | |
| 1140 #define DID_NONE 1 /* didn't update a line */ | |
| 1141 #define DID_LINE 2 /* updated a normal line */ | |
| 1142 #define DID_FOLD 3 /* updated a folded line */ | |
| 1143 int did_update = DID_NONE; | |
| 1144 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1145 #endif | |
| 1146 linenr_T mod_top = 0; | |
| 1147 linenr_T mod_bot = 0; | |
| 1148 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1149 int save_got_int; | |
| 1150 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1151 #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
|
1152 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
|
1153 #endif |
| 7 | 1154 |
| 1155 type = wp->w_redr_type; | |
| 1156 | |
| 1157 if (type == NOT_VALID) | |
| 1158 { | |
| 1159 wp->w_redr_status = TRUE; | |
| 1160 wp->w_lines_valid = 0; | |
| 1161 } | |
| 1162 | |
| 1163 /* 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
|
1164 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1165 { |
| 1166 wp->w_redr_type = 0; | |
| 1167 return; | |
| 1168 } | |
| 1169 | |
| 1170 /* Window is zero-width: Only need to draw the separator. */ | |
| 1171 if (wp->w_width == 0) | |
| 1172 { | |
| 1173 /* draw the vertical separator right of this window */ | |
| 1174 draw_vsep_win(wp, 0); | |
| 1175 wp->w_redr_type = 0; | |
| 1176 return; | |
| 1177 } | |
| 1178 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1179 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1180 // 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
|
1181 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
|
1182 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1183 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
|
1184 # 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
|
1185 /* 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
|
1186 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
|
1187 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
|
1188 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1189 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
|
1190 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1191 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1192 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1193 |
| 7 | 1194 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1195 init_search_hl(wp); |
| 7 | 1196 #endif |
| 1197 | |
| 13 | 1198 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1199 /* 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
|
1200 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1201 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1202 if (wp->w_nrwidth != i) |
| 13 | 1203 { |
| 1204 type = NOT_VALID; | |
| 677 | 1205 wp->w_nrwidth = i; |
| 13 | 1206 } |
| 1207 else | |
| 1208 #endif | |
| 1209 | |
| 7 | 1210 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1211 { | |
| 1212 /* | |
| 1213 * When there are both inserted/deleted lines and specific lines to be | |
| 1214 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1215 * everything (only happens when redrawing is off for while). | |
| 1216 */ | |
| 1217 type = NOT_VALID; | |
| 1218 } | |
| 1219 else | |
| 1220 { | |
| 1221 /* | |
| 1222 * Set mod_top to the first line that needs displaying because of | |
| 1223 * changes. Set mod_bot to the first line after the changes. | |
| 1224 */ | |
| 1225 mod_top = wp->w_redraw_top; | |
| 1226 if (wp->w_redraw_bot != 0) | |
| 1227 mod_bot = wp->w_redraw_bot + 1; | |
| 1228 else | |
| 1229 mod_bot = 0; | |
| 1230 if (buf->b_mod_set) | |
| 1231 { | |
| 1232 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1233 { | |
| 1234 mod_top = buf->b_mod_top; | |
| 1235 #ifdef FEAT_SYN_HL | |
| 1236 /* Need to redraw lines above the change that may be included | |
| 1237 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1238 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1239 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1240 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1241 if (mod_top < 1) |
| 1242 mod_top = 1; | |
| 1243 } | |
| 1244 #endif | |
| 1245 } | |
| 1246 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1247 mod_bot = buf->b_mod_bot; | |
| 1248 | |
| 1249 #ifdef FEAT_SEARCH_EXTRA | |
| 1250 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1251 * change in one line may make the Search highlighting in a | |
| 1252 * previous line invalid. Simple solution: redraw all visible | |
| 1253 * lines above the change. | |
| 1326 | 1254 * Same for a match pattern. |
| 7 | 1255 */ |
| 699 | 1256 if (search_hl.rm.regprog != NULL |
| 1257 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1258 top_to_mod = TRUE; |
| 699 | 1259 else |
| 1326 | 1260 { |
| 1261 cur = wp->w_match_head; | |
| 1262 while (cur != NULL) | |
| 1263 { | |
| 1264 if (cur->match.regprog != NULL | |
| 1265 && re_multiline(cur->match.regprog)) | |
| 699 | 1266 { |
| 1267 top_to_mod = TRUE; | |
| 1268 break; | |
| 1269 } | |
| 1326 | 1270 cur = cur->next; |
| 1271 } | |
| 1272 } | |
| 7 | 1273 #endif |
| 1274 } | |
| 1275 #ifdef FEAT_FOLDING | |
| 1276 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1277 { | |
| 1278 linenr_T lnumt, lnumb; | |
| 1279 | |
| 1280 /* | |
| 1281 * A change in a line can cause lines above it to become folded or | |
| 1282 * unfolded. Find the top most buffer line that may be affected. | |
| 1283 * If the line was previously folded and displayed, get the first | |
| 1284 * line of that fold. If the line is folded now, get the first | |
| 1285 * folded line. Use the minimum of these two. | |
| 1286 */ | |
| 1287 | |
| 1288 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1289 * the line below it. If there is no valid entry, use w_topline. | |
| 1290 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1291 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1292 lnumt = wp->w_topline; | |
| 1293 lnumb = MAXLNUM; | |
| 1294 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1295 if (wp->w_lines[i].wl_valid) | |
| 1296 { | |
| 1297 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1298 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1299 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1300 { | |
| 1301 lnumb = wp->w_lines[i].wl_lnum; | |
| 1302 /* When there is a fold column it might need updating | |
| 1303 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1304 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1305 ++lnumb; |
| 1306 } | |
| 1307 } | |
| 1308 | |
| 1309 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1310 if (mod_top > lnumt) | |
| 1311 mod_top = lnumt; | |
| 1312 | |
| 1313 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1314 --mod_bot; | |
| 1315 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1316 ++mod_bot; | |
| 1317 if (mod_bot < lnumb) | |
| 1318 mod_bot = lnumb; | |
| 1319 } | |
| 1320 #endif | |
| 1321 | |
| 1322 /* When a change starts above w_topline and the end is below | |
| 1323 * w_topline, start redrawing at w_topline. | |
| 36 | 1324 * If the end of the change is above w_topline: do like no change was |
| 1325 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1326 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1327 { | |
| 1328 if (mod_bot > wp->w_topline) | |
| 1329 mod_top = wp->w_topline; | |
| 1330 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1331 else if (syntax_present(wp)) |
| 7 | 1332 top_end = 1; |
| 1333 #endif | |
| 1334 } | |
| 36 | 1335 |
| 1336 /* When line numbers are displayed need to redraw all lines below | |
| 1337 * inserted/deleted lines. */ | |
| 1338 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1339 mod_bot = MAXLNUM; | |
| 7 | 1340 } |
|
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
|
1341 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
|
1342 wp->w_redraw_bot = 0; |
| 7 | 1343 |
| 1344 /* | |
| 1345 * When only displaying the lines at the top, set top_end. Used when | |
| 1346 * window has scrolled down for msg_scrolled. | |
| 1347 */ | |
| 1348 if (type == REDRAW_TOP) | |
| 1349 { | |
| 1350 j = 0; | |
| 1351 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1352 { | |
| 1353 j += wp->w_lines[i].wl_size; | |
| 1354 if (j >= wp->w_upd_rows) | |
| 1355 { | |
| 1356 top_end = j; | |
| 1357 break; | |
| 1358 } | |
| 1359 } | |
| 1360 if (top_end == 0) | |
| 1361 /* not found (cannot happen?): redraw everything */ | |
| 1362 type = NOT_VALID; | |
| 1363 else | |
| 1364 /* top area defined, the rest is VALID */ | |
| 1365 type = VALID; | |
| 1366 } | |
| 1367 | |
| 1378 | 1368 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1369 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1370 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1371 * called. */ | |
| 1372 if (screen_cleared) | |
| 1373 screen_cleared = MAYBE; | |
| 1374 | |
| 7 | 1375 /* |
| 1376 * If there are no changes on the screen that require a complete redraw, | |
| 1377 * handle three cases: | |
| 1378 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1379 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1380 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1381 * w_lines[] that needs updating. | |
| 1382 */ | |
| 743 | 1383 if ((type == VALID || type == SOME_VALID |
| 1384 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1385 #ifdef FEAT_DIFF |
| 1386 && !wp->w_botfill && !wp->w_old_botfill | |
| 1387 #endif | |
| 1388 ) | |
| 1389 { | |
| 1390 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1391 { | |
| 1392 /* | |
| 1393 * w_topline is the first changed line, the scrolling will be done | |
| 1394 * further down. | |
| 1395 */ | |
| 1396 } | |
| 1397 else if (wp->w_lines[0].wl_valid | |
| 1398 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1399 #ifdef FEAT_DIFF | |
| 1400 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1401 && wp->w_topfill > wp->w_old_topfill) | |
| 1402 #endif | |
| 1403 )) | |
| 1404 { | |
| 1405 /* | |
| 1406 * New topline is above old topline: May scroll down. | |
| 1407 */ | |
| 1408 #ifdef FEAT_FOLDING | |
| 1409 if (hasAnyFolding(wp)) | |
| 1410 { | |
| 1411 linenr_T ln; | |
| 1412 | |
| 1413 /* count the number of lines we are off, counting a sequence | |
| 1414 * of folded lines as one */ | |
| 1415 j = 0; | |
| 1416 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1417 { | |
| 1418 ++j; | |
| 1419 if (j >= wp->w_height - 2) | |
| 1420 break; | |
| 1421 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1422 } | |
| 1423 } | |
| 1424 else | |
| 1425 #endif | |
| 1426 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1427 if (j < wp->w_height - 2) /* not too far off */ | |
| 1428 { | |
| 1429 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1430 #ifdef FEAT_DIFF | |
| 1431 /* insert extra lines for previously invisible filler lines */ | |
| 1432 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1433 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1434 - wp->w_old_topfill; | |
| 1435 #endif | |
| 1436 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1437 { | |
| 1438 /* | |
| 1439 * Try to insert the correct number of lines. | |
| 1440 * If not the last window, delete the lines at the bottom. | |
| 1441 * win_ins_lines may fail when the terminal can't do it. | |
| 1442 */ | |
| 1443 if (i > 0) | |
| 1444 check_for_delay(FALSE); | |
| 1445 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1446 { | |
| 1447 if (wp->w_lines_valid != 0) | |
| 1448 { | |
| 1449 /* Need to update rows that are new, stop at the | |
| 1450 * first one that scrolled down. */ | |
| 1451 top_end = i; | |
| 1452 scrolled_down = TRUE; | |
| 1453 | |
| 1454 /* Move the entries that were scrolled, disable | |
| 1455 * the entries for the lines to be redrawn. */ | |
| 1456 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1457 wp->w_lines_valid = wp->w_height; | |
| 1458 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1459 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1460 while (idx >= 0) | |
| 1461 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1462 } | |
| 1463 } | |
| 1464 else | |
| 1465 mid_start = 0; /* redraw all lines */ | |
| 1466 } | |
| 1467 else | |
| 1468 mid_start = 0; /* redraw all lines */ | |
| 1469 } | |
| 1470 else | |
| 1471 mid_start = 0; /* redraw all lines */ | |
| 1472 } | |
| 1473 else | |
| 1474 { | |
| 1475 /* | |
| 1476 * New topline is at or below old topline: May scroll up. | |
| 1477 * When topline didn't change, find first entry in w_lines[] that | |
| 1478 * needs updating. | |
| 1479 */ | |
| 1480 | |
| 1481 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1482 j = -1; | |
| 1483 row = 0; | |
| 1484 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1485 { | |
| 1486 if (wp->w_lines[i].wl_valid | |
| 1487 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1488 { | |
| 1489 j = i; | |
| 1490 break; | |
| 1491 } | |
| 1492 row += wp->w_lines[i].wl_size; | |
| 1493 } | |
| 1494 if (j == -1) | |
| 1495 { | |
| 1496 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1497 * lines */ | |
| 1498 mid_start = 0; | |
| 1499 } | |
| 1500 else | |
| 1501 { | |
| 1502 /* | |
| 1503 * Try to delete the correct number of lines. | |
| 1504 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1505 */ | |
| 1506 #ifdef FEAT_DIFF | |
| 1507 /* If the topline didn't change, delete old filler lines, | |
| 1508 * otherwise delete filler lines of the new topline... */ | |
| 1509 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1510 row += wp->w_old_topfill; | |
| 1511 else | |
| 1512 row += diff_check_fill(wp, wp->w_topline); | |
| 1513 /* ... but don't delete new filler lines. */ | |
| 1514 row -= wp->w_topfill; | |
| 1515 #endif | |
| 1516 if (row > 0) | |
| 1517 { | |
| 1518 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
|
1519 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
|
1520 == OK) |
| 7 | 1521 bot_start = wp->w_height - row; |
| 1522 else | |
| 1523 mid_start = 0; /* redraw all lines */ | |
| 1524 } | |
| 1525 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1526 { | |
| 1527 /* | |
| 1528 * Skip the lines (below the deleted lines) that are still | |
| 1529 * valid and don't need redrawing. Copy their info | |
| 1530 * upwards, to compensate for the deleted lines. Set | |
| 1531 * bot_start to the first row that needs redrawing. | |
| 1532 */ | |
| 1533 bot_start = 0; | |
| 1534 idx = 0; | |
| 1535 for (;;) | |
| 1536 { | |
| 1537 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1538 /* stop at line that didn't fit, unless it is still | |
| 1539 * valid (no lines deleted) */ | |
| 1540 if (row > 0 && bot_start + row | |
| 1541 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1542 { | |
| 1543 wp->w_lines_valid = idx + 1; | |
| 1544 break; | |
| 1545 } | |
| 1546 bot_start += wp->w_lines[idx++].wl_size; | |
| 1547 | |
| 1548 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1549 if (++j >= wp->w_lines_valid) | |
| 1550 { | |
| 1551 wp->w_lines_valid = idx; | |
| 1552 break; | |
| 1553 } | |
| 1554 } | |
| 1555 #ifdef FEAT_DIFF | |
| 1556 /* Correct the first entry for filler lines at the top | |
| 1557 * when it won't get updated below. */ | |
| 1558 if (wp->w_p_diff && bot_start > 0) | |
| 1559 wp->w_lines[0].wl_size = | |
| 1560 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1561 + wp->w_topfill; | |
| 1562 #endif | |
| 1563 } | |
| 1564 } | |
| 1565 } | |
| 1566 | |
| 1567 /* When starting redraw in the first line, redraw all lines. When | |
| 1568 * there is only one window it's probably faster to clear the screen | |
| 1569 * first. */ | |
| 1570 if (mid_start == 0) | |
| 1571 { | |
| 1572 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1573 if (ONE_WINDOW) |
| 981 | 1574 { |
| 1331 | 1575 /* Clear the screen when it was not done by win_del_lines() or |
| 1576 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1577 * then. */ | |
| 1578 if (screen_cleared != TRUE) | |
| 1579 screenclear(); | |
| 981 | 1580 /* The screen was cleared, redraw the tab pages line. */ |
| 1581 if (redraw_tabline) | |
| 1582 draw_tabline(); | |
| 1583 } | |
| 7 | 1584 } |
| 1331 | 1585 |
| 1586 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1587 * cleared (only happens for the first window) or when screenclear() | |
| 1588 * was called directly above, "must_redraw" will have been set to | |
| 1589 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1590 if (screen_cleared == TRUE) | |
| 1591 must_redraw = 0; | |
| 7 | 1592 } |
| 1593 else | |
| 1594 { | |
| 1595 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1596 mid_start = 0; | |
| 1597 mid_end = wp->w_height; | |
| 1598 } | |
| 1599 | |
| 743 | 1600 if (type == SOME_VALID) |
| 1601 { | |
| 1602 /* SOME_VALID: redraw all lines. */ | |
| 1603 mid_start = 0; | |
| 1604 mid_end = wp->w_height; | |
| 1605 type = NOT_VALID; | |
| 1606 } | |
| 1607 | |
| 7 | 1608 /* check if we are updating or removing the inverted part */ |
| 1609 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1610 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1611 { | |
| 1612 linenr_T from, to; | |
| 1613 | |
| 1614 if (VIsual_active) | |
| 1615 { | |
| 1616 if (VIsual_active | |
| 1617 && (VIsual_mode != wp->w_old_visual_mode | |
| 1618 || type == INVERTED_ALL)) | |
| 1619 { | |
| 1620 /* | |
| 1621 * If the type of Visual selection changed, redraw the whole | |
| 1622 * selection. Also when the ownership of the X selection is | |
| 1623 * gained or lost. | |
| 1624 */ | |
| 1625 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1626 { | |
| 1627 from = curwin->w_cursor.lnum; | |
| 1628 to = VIsual.lnum; | |
| 1629 } | |
| 1630 else | |
| 1631 { | |
| 1632 from = VIsual.lnum; | |
| 1633 to = curwin->w_cursor.lnum; | |
| 1634 } | |
| 1635 /* redraw more when the cursor moved as well */ | |
| 1636 if (wp->w_old_cursor_lnum < from) | |
| 1637 from = wp->w_old_cursor_lnum; | |
| 1638 if (wp->w_old_cursor_lnum > to) | |
| 1639 to = wp->w_old_cursor_lnum; | |
| 1640 if (wp->w_old_visual_lnum < from) | |
| 1641 from = wp->w_old_visual_lnum; | |
| 1642 if (wp->w_old_visual_lnum > to) | |
| 1643 to = wp->w_old_visual_lnum; | |
| 1644 } | |
| 1645 else | |
| 1646 { | |
| 1647 /* | |
| 1648 * Find the line numbers that need to be updated: The lines | |
| 1649 * between the old cursor position and the current cursor | |
| 1650 * position. Also check if the Visual position changed. | |
| 1651 */ | |
| 1652 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1653 { | |
| 1654 from = curwin->w_cursor.lnum; | |
| 1655 to = wp->w_old_cursor_lnum; | |
| 1656 } | |
| 1657 else | |
| 1658 { | |
| 1659 from = wp->w_old_cursor_lnum; | |
| 1660 to = curwin->w_cursor.lnum; | |
| 1661 if (from == 0) /* Visual mode just started */ | |
| 1662 from = to; | |
| 1663 } | |
| 1664 | |
| 422 | 1665 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1666 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1667 { |
| 1668 if (wp->w_old_visual_lnum < from | |
| 1669 && wp->w_old_visual_lnum != 0) | |
| 1670 from = wp->w_old_visual_lnum; | |
| 1671 if (wp->w_old_visual_lnum > to) | |
| 1672 to = wp->w_old_visual_lnum; | |
| 1673 if (VIsual.lnum < from) | |
| 1674 from = VIsual.lnum; | |
| 1675 if (VIsual.lnum > to) | |
| 1676 to = VIsual.lnum; | |
| 1677 } | |
| 1678 } | |
| 1679 | |
| 1680 /* | |
| 1681 * If in block mode and changed column or curwin->w_curswant: | |
| 1682 * update all lines. | |
| 1683 * First compute the actual start and end column. | |
| 1684 */ | |
| 1685 if (VIsual_mode == Ctrl_V) | |
| 1686 { | |
| 6266 | 1687 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1688 #if defined(FEAT_LINEBREAK) |
| 6266 | 1689 int save_ve_flags = ve_flags; |
| 1690 | |
| 1691 if (curwin->w_p_lbr) | |
| 1692 ve_flags = VE_ALL; | |
| 1693 #endif | |
| 7 | 1694 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
|
1695 #if defined(FEAT_LINEBREAK) |
| 6266 | 1696 ve_flags = save_ve_flags; |
| 1697 #endif | |
| 7 | 1698 ++toc; |
| 1699 if (curwin->w_curswant == MAXCOL) | |
| 1700 toc = MAXCOL; | |
| 1701 | |
| 1702 if (fromc != wp->w_old_cursor_fcol | |
| 1703 || toc != wp->w_old_cursor_lcol) | |
| 1704 { | |
| 1705 if (from > VIsual.lnum) | |
| 1706 from = VIsual.lnum; | |
| 1707 if (to < VIsual.lnum) | |
| 1708 to = VIsual.lnum; | |
| 1709 } | |
| 1710 wp->w_old_cursor_fcol = fromc; | |
| 1711 wp->w_old_cursor_lcol = toc; | |
| 1712 } | |
| 1713 } | |
| 1714 else | |
| 1715 { | |
| 1716 /* Use the line numbers of the old Visual area. */ | |
| 1717 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1718 { | |
| 1719 from = wp->w_old_cursor_lnum; | |
| 1720 to = wp->w_old_visual_lnum; | |
| 1721 } | |
| 1722 else | |
| 1723 { | |
| 1724 from = wp->w_old_visual_lnum; | |
| 1725 to = wp->w_old_cursor_lnum; | |
| 1726 } | |
| 1727 } | |
| 1728 | |
| 1729 /* | |
| 1730 * There is no need to update lines above the top of the window. | |
| 1731 */ | |
| 1732 if (from < wp->w_topline) | |
| 1733 from = wp->w_topline; | |
| 1734 | |
| 1735 /* | |
| 1736 * If we know the value of w_botline, use it to restrict the update to | |
| 1737 * the lines that are visible in the window. | |
| 1738 */ | |
| 1739 if (wp->w_valid & VALID_BOTLINE) | |
| 1740 { | |
| 1741 if (from >= wp->w_botline) | |
| 1742 from = wp->w_botline - 1; | |
| 1743 if (to >= wp->w_botline) | |
| 1744 to = wp->w_botline - 1; | |
| 1745 } | |
| 1746 | |
| 1747 /* | |
| 1748 * Find the minimal part to be updated. | |
| 1749 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1750 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1751 * top_end; need to redraw from top_end to the "to" line. | |
| 1752 * A middle mouse click with a Visual selection may change the text | |
| 1753 * above the Visual area and reset wl_valid, do count these for | |
| 1754 * mid_end (in srow). | |
| 1755 */ | |
| 1756 if (mid_start > 0) | |
| 1757 { | |
| 1758 lnum = wp->w_topline; | |
| 1759 idx = 0; | |
| 1760 srow = 0; | |
| 1761 if (scrolled_down) | |
| 1762 mid_start = top_end; | |
| 1763 else | |
| 1764 mid_start = 0; | |
| 1765 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1766 { | |
| 1767 if (wp->w_lines[idx].wl_valid) | |
| 1768 mid_start += wp->w_lines[idx].wl_size; | |
| 1769 else if (!scrolled_down) | |
| 1770 srow += wp->w_lines[idx].wl_size; | |
| 1771 ++idx; | |
| 1772 # ifdef FEAT_FOLDING | |
| 1773 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1774 lnum = wp->w_lines[idx].wl_lnum; | |
| 1775 else | |
| 1776 # endif | |
| 1777 ++lnum; | |
| 1778 } | |
| 1779 srow += mid_start; | |
| 1780 mid_end = wp->w_height; | |
| 1781 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1782 { | |
| 1783 if (wp->w_lines[idx].wl_valid | |
| 1784 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1785 { | |
| 1786 /* Only update until first row of this line */ | |
| 1787 mid_end = srow; | |
| 1788 break; | |
| 1789 } | |
| 1790 srow += wp->w_lines[idx].wl_size; | |
| 1791 } | |
| 1792 } | |
| 1793 } | |
| 1794 | |
| 1795 if (VIsual_active && buf == curwin->w_buffer) | |
| 1796 { | |
| 1797 wp->w_old_visual_mode = VIsual_mode; | |
| 1798 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1799 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1800 wp->w_old_visual_col = VIsual.col; |
| 7 | 1801 wp->w_old_curswant = curwin->w_curswant; |
| 1802 } | |
| 1803 else | |
| 1804 { | |
| 1805 wp->w_old_visual_mode = 0; | |
| 1806 wp->w_old_cursor_lnum = 0; | |
| 1807 wp->w_old_visual_lnum = 0; | |
| 422 | 1808 wp->w_old_visual_col = 0; |
| 7 | 1809 } |
| 1810 | |
| 1811 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1812 /* reset got_int, otherwise regexp won't work */ | |
| 1813 save_got_int = got_int; | |
| 1814 got_int = 0; | |
| 1815 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1816 #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
|
1817 /* 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
|
1818 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
|
1819 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
|
1820 #endif |
| 7 | 1821 #ifdef FEAT_FOLDING |
| 1822 win_foldinfo.fi_level = 0; | |
| 1823 #endif | |
| 1824 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1825 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1826 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1827 * 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
|
1828 * 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
|
1829 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1830 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
|
1831 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
|
1832 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1833 |
| 7 | 1834 /* |
| 1835 * Update all the window rows. | |
| 1836 */ | |
| 1837 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1838 row = 0; | |
| 1839 srow = 0; | |
| 1840 lnum = wp->w_topline; /* first line shown in window */ | |
| 1841 for (;;) | |
| 1842 { | |
| 1843 /* stop updating when reached the end of the window (check for _past_ | |
| 1844 * the end of the window is at the end of the loop) */ | |
| 1845 if (row == wp->w_height) | |
| 1846 { | |
| 1847 didline = TRUE; | |
| 1848 break; | |
| 1849 } | |
| 1850 | |
| 1851 /* stop updating when hit the end of the file */ | |
| 1852 if (lnum > buf->b_ml.ml_line_count) | |
| 1853 { | |
| 1854 eof = TRUE; | |
| 1855 break; | |
| 1856 } | |
| 1857 | |
| 1858 /* Remember the starting row of the line that is going to be dealt | |
| 1859 * with. It is used further down when the line doesn't fit. */ | |
| 1860 srow = row; | |
| 1861 | |
| 1862 /* | |
| 1863 * Update a line when it is in an area that needs updating, when it | |
| 1864 * 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
|
1865 * "bot_start" may be halfway a wrapped line after using |
| 7 | 1866 * win_del_lines(), check if the current line includes it. |
| 1867 * When syntax folding is being used, the saved syntax states will | |
| 1868 * already have been updated, we can't see where the syntax state is | |
| 1869 * the same again, just update until the end of the window. | |
| 1870 */ | |
| 1871 if (row < top_end | |
| 1872 || (row >= mid_start && row < mid_end) | |
| 1873 #ifdef FEAT_SEARCH_EXTRA | |
| 1874 || top_to_mod | |
| 1875 #endif | |
| 1876 || idx >= wp->w_lines_valid | |
| 1877 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 1878 || (mod_top != 0 | |
| 1879 && (lnum == mod_top | |
| 1880 || (lnum >= mod_top | |
| 1881 && (lnum < mod_bot | |
| 1882 #ifdef FEAT_SYN_HL | |
| 1883 || did_update == DID_FOLD | |
| 1884 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1885 && syntax_present(wp) |
| 7 | 1886 && ( |
| 1887 # ifdef FEAT_FOLDING | |
| 1888 (foldmethodIsSyntax(wp) | |
| 1889 && hasAnyFolding(wp)) || | |
| 1890 # endif | |
| 1891 syntax_check_changed(lnum))) | |
| 1892 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1893 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 1894 /* match in fixed position might need redraw |
| 1895 * if lines were inserted or deleted */ | |
| 1896 || (wp->w_match_head != NULL | |
| 1897 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
1898 #endif |
| 7 | 1899 ))))) |
| 1900 { | |
| 1901 #ifdef FEAT_SEARCH_EXTRA | |
| 1902 if (lnum == mod_top) | |
| 1903 top_to_mod = FALSE; | |
| 1904 #endif | |
| 1905 | |
| 1906 /* | |
| 1907 * When at start of changed lines: May scroll following lines | |
| 1908 * up or down to minimize redrawing. | |
| 1909 * Don't do this when the change continues until the end. | |
| 3318 | 1910 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 1911 */ |
| 1912 if (lnum == mod_top | |
| 1913 && mod_bot != MAXLNUM | |
| 3318 | 1914 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 1915 { |
| 1916 int old_rows = 0; | |
| 1917 int new_rows = 0; | |
| 1918 int xtra_rows; | |
| 1919 linenr_T l; | |
| 1920 | |
| 1921 /* Count the old number of window rows, using w_lines[], which | |
| 1922 * should still contain the sizes for the lines as they are | |
| 1923 * currently displayed. */ | |
| 1924 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 1925 { | |
| 1926 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 1927 * lines are part of the changed area. */ | |
| 1928 if (wp->w_lines[i].wl_valid | |
| 1929 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 1930 break; | |
| 1931 old_rows += wp->w_lines[i].wl_size; | |
| 1932 #ifdef FEAT_FOLDING | |
| 1933 if (wp->w_lines[i].wl_valid | |
| 1934 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 1935 { | |
| 1936 /* Must have found the last valid entry above mod_bot. | |
| 1937 * Add following invalid entries. */ | |
| 1938 ++i; | |
| 1939 while (i < wp->w_lines_valid | |
| 1940 && !wp->w_lines[i].wl_valid) | |
| 1941 old_rows += wp->w_lines[i++].wl_size; | |
| 1942 break; | |
| 1943 } | |
| 1944 #endif | |
| 1945 } | |
| 1946 | |
| 1947 if (i >= wp->w_lines_valid) | |
| 1948 { | |
| 1949 /* We can't find a valid line below the changed lines, | |
| 1950 * need to redraw until the end of the window. | |
| 1951 * Inserting/deleting lines has no use. */ | |
| 1952 bot_start = 0; | |
| 1953 } | |
| 1954 else | |
| 1955 { | |
| 1956 /* Able to count old number of rows: Count new window | |
| 1957 * rows, and may insert/delete lines */ | |
| 1958 j = idx; | |
| 1959 for (l = lnum; l < mod_bot; ++l) | |
| 1960 { | |
| 1961 #ifdef FEAT_FOLDING | |
| 1962 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 1963 ++new_rows; | |
| 1964 else | |
| 1965 #endif | |
| 1966 #ifdef FEAT_DIFF | |
| 1967 if (l == wp->w_topline) | |
| 1968 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 1969 + wp->w_topfill; | |
| 1970 else | |
| 1971 #endif | |
| 1972 new_rows += plines_win(wp, l, TRUE); | |
| 1973 ++j; | |
| 1974 if (new_rows > wp->w_height - row - 2) | |
| 1975 { | |
| 1976 /* it's getting too much, must redraw the rest */ | |
| 1977 new_rows = 9999; | |
| 1978 break; | |
| 1979 } | |
| 1980 } | |
| 1981 xtra_rows = new_rows - old_rows; | |
| 1982 if (xtra_rows < 0) | |
| 1983 { | |
| 1984 /* May scroll text up. If there is not enough | |
| 1985 * remaining text or scrolling fails, must redraw the | |
| 1986 * rest. If scrolling works, must redraw the text | |
| 1987 * below the scrolled text. */ | |
| 1988 if (row - xtra_rows >= wp->w_height - 2) | |
| 1989 mod_bot = MAXLNUM; | |
| 1990 else | |
| 1991 { | |
| 1992 check_for_delay(FALSE); | |
| 1993 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
|
1994 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 1995 mod_bot = MAXLNUM; |
| 1996 else | |
| 1997 bot_start = wp->w_height + xtra_rows; | |
| 1998 } | |
| 1999 } | |
| 2000 else if (xtra_rows > 0) | |
| 2001 { | |
| 2002 /* May scroll text down. If there is not enough | |
| 2003 * remaining text of scrolling fails, must redraw the | |
| 2004 * rest. */ | |
| 2005 if (row + xtra_rows >= wp->w_height - 2) | |
| 2006 mod_bot = MAXLNUM; | |
| 2007 else | |
| 2008 { | |
| 2009 check_for_delay(FALSE); | |
| 2010 if (win_ins_lines(wp, row + old_rows, | |
| 2011 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2012 mod_bot = MAXLNUM; | |
| 2013 else if (top_end > row + old_rows) | |
| 2014 /* Scrolled the part at the top that requires | |
| 2015 * updating down. */ | |
| 2016 top_end += xtra_rows; | |
| 2017 } | |
| 2018 } | |
| 2019 | |
| 2020 /* When not updating the rest, may need to move w_lines[] | |
| 2021 * entries. */ | |
| 2022 if (mod_bot != MAXLNUM && i != j) | |
| 2023 { | |
| 2024 if (j < i) | |
| 2025 { | |
| 2026 int x = row + new_rows; | |
| 2027 | |
| 2028 /* move entries in w_lines[] upwards */ | |
| 2029 for (;;) | |
| 2030 { | |
| 2031 /* stop at last valid entry in w_lines[] */ | |
| 2032 if (i >= wp->w_lines_valid) | |
| 2033 { | |
| 2034 wp->w_lines_valid = j; | |
| 2035 break; | |
| 2036 } | |
| 2037 wp->w_lines[j] = wp->w_lines[i]; | |
| 2038 /* stop at a line that won't fit */ | |
| 2039 if (x + (int)wp->w_lines[j].wl_size | |
| 2040 > wp->w_height) | |
| 2041 { | |
| 2042 wp->w_lines_valid = j + 1; | |
| 2043 break; | |
| 2044 } | |
| 2045 x += wp->w_lines[j++].wl_size; | |
| 2046 ++i; | |
| 2047 } | |
| 2048 if (bot_start > x) | |
| 2049 bot_start = x; | |
| 2050 } | |
| 2051 else /* j > i */ | |
| 2052 { | |
| 2053 /* move entries in w_lines[] downwards */ | |
| 2054 j -= i; | |
| 2055 wp->w_lines_valid += j; | |
| 2056 if (wp->w_lines_valid > wp->w_height) | |
| 2057 wp->w_lines_valid = wp->w_height; | |
| 2058 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2059 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2060 | |
| 2061 /* The w_lines[] entries for inserted lines are | |
| 2062 * now invalid, but wl_size may be used above. | |
| 2063 * Reset to zero. */ | |
| 2064 while (i >= idx) | |
| 2065 { | |
| 2066 wp->w_lines[i].wl_size = 0; | |
| 2067 wp->w_lines[i--].wl_valid = FALSE; | |
| 2068 } | |
| 2069 } | |
| 2070 } | |
| 2071 } | |
| 2072 } | |
| 2073 | |
| 2074 #ifdef FEAT_FOLDING | |
| 2075 /* | |
| 2076 * When lines are folded, display one line for all of them. | |
| 2077 * Otherwise, display normally (can be several display lines when | |
| 2078 * 'wrap' is on). | |
| 2079 */ | |
| 2080 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2081 if (fold_count != 0) | |
| 2082 { | |
| 2083 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2084 ++row; | |
| 2085 --fold_count; | |
| 2086 wp->w_lines[idx].wl_folded = TRUE; | |
| 2087 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2088 # ifdef FEAT_SYN_HL | |
| 2089 did_update = DID_FOLD; | |
| 2090 # endif | |
| 2091 } | |
| 2092 else | |
| 2093 #endif | |
| 2094 if (idx < wp->w_lines_valid | |
| 2095 && wp->w_lines[idx].wl_valid | |
| 2096 && wp->w_lines[idx].wl_lnum == lnum | |
| 2097 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2098 && !(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
|
2099 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2100 && !bt_popup(wp->w_buffer) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2101 #endif |
| 7 | 2102 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2103 #ifdef FEAT_DIFF | |
| 2104 && diff_check_fill(wp, lnum) == 0 | |
| 2105 #endif | |
| 2106 ) | |
| 2107 { | |
| 2108 /* This line is not going to fit. Don't draw anything here, | |
| 2109 * will draw "@ " lines below. */ | |
| 2110 row = wp->w_height + 1; | |
| 2111 } | |
| 2112 else | |
| 2113 { | |
| 2114 #ifdef FEAT_SEARCH_EXTRA | |
| 2115 prepare_search_hl(wp, lnum); | |
| 2116 #endif | |
| 2117 #ifdef FEAT_SYN_HL | |
| 2118 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2119 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
|
2120 && syntax_present(wp)) |
| 7 | 2121 syntax_end_parsing(syntax_last_parsed + 1); |
| 2122 #endif | |
| 2123 | |
| 2124 /* | |
| 2125 * Display one line. | |
| 2126 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2127 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
|
2128 mod_top == 0, FALSE); |
| 7 | 2129 |
| 2130 #ifdef FEAT_FOLDING | |
| 2131 wp->w_lines[idx].wl_folded = FALSE; | |
| 2132 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2133 #endif | |
| 2134 #ifdef FEAT_SYN_HL | |
| 2135 did_update = DID_LINE; | |
| 2136 syntax_last_parsed = lnum; | |
| 2137 #endif | |
| 2138 } | |
| 2139 | |
| 2140 wp->w_lines[idx].wl_lnum = lnum; | |
| 2141 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
|
2142 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2143 /* 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
|
2144 * 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
|
2145 * 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
|
2146 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2147 { |
| 2148 /* we may need the size of that too long line later on */ | |
| 3318 | 2149 if (dollar_vcol == -1) |
| 7 | 2150 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2151 ++idx; | |
| 2152 break; | |
| 2153 } | |
| 3318 | 2154 if (dollar_vcol == -1) |
| 7 | 2155 wp->w_lines[idx].wl_size = row - srow; |
| 2156 ++idx; | |
| 2157 #ifdef FEAT_FOLDING | |
| 2158 lnum += fold_count + 1; | |
| 2159 #else | |
| 2160 ++lnum; | |
| 2161 #endif | |
| 2162 } | |
| 2163 else | |
| 2164 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2165 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
|
2166 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2167 #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
|
2168 // '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
|
2169 // 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
|
2170 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
|
2171 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
|
2172 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
|
2173 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2174 #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
|
2175 (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
|
2176 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2177 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2178 // This line does not need to be drawn, advance to the next one. |
| 7 | 2179 row += wp->w_lines[idx++].wl_size; |
| 2180 if (row > wp->w_height) /* past end of screen */ | |
| 2181 break; | |
| 2182 #ifdef FEAT_FOLDING | |
| 2183 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2184 #else | |
| 2185 ++lnum; | |
| 2186 #endif | |
| 2187 #ifdef FEAT_SYN_HL | |
| 2188 did_update = DID_NONE; | |
| 2189 #endif | |
| 2190 } | |
| 2191 | |
| 2192 if (lnum > buf->b_ml.ml_line_count) | |
| 2193 { | |
| 2194 eof = TRUE; | |
| 2195 break; | |
| 2196 } | |
| 2197 } | |
| 2198 /* | |
| 2199 * End of loop over all window lines. | |
| 2200 */ | |
| 2201 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2202 #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
|
2203 /* 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
|
2204 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
|
2205 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2206 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
|
2207 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2208 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
|
2209 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
|
2210 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
|
2211 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
|
2212 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
|
2213 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2214 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
|
2215 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2216 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
|
2217 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2218 #endif |
| 7 | 2219 |
| 2220 if (idx > wp->w_lines_valid) | |
| 2221 wp->w_lines_valid = idx; | |
| 2222 | |
| 2223 #ifdef FEAT_SYN_HL | |
| 2224 /* | |
| 2225 * Let the syntax stuff know we stop parsing here. | |
| 2226 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2227 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2228 syntax_end_parsing(syntax_last_parsed + 1); |
| 2229 #endif | |
| 2230 | |
| 2231 /* | |
| 2232 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2233 * line we were working on, then the line didn't fit. | |
| 2234 */ | |
| 2235 wp->w_empty_rows = 0; | |
| 2236 #ifdef FEAT_DIFF | |
| 2237 wp->w_filler_rows = 0; | |
| 2238 #endif | |
| 2239 if (!eof && !didline) | |
| 2240 { | |
| 2241 if (lnum == wp->w_topline) | |
| 2242 { | |
| 2243 /* | |
| 2244 * Single line that does not fit! | |
| 2245 * Don't overwrite it, it can be edited. | |
| 2246 */ | |
| 2247 wp->w_botline = lnum + 1; | |
| 2248 } | |
| 2249 #ifdef FEAT_DIFF | |
| 2250 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2251 { | |
| 2252 /* Window ends in filler lines. */ | |
| 2253 wp->w_botline = lnum; | |
| 2254 wp->w_filler_rows = wp->w_height - srow; | |
| 2255 } | |
| 2256 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2257 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2258 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
|
2259 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2260 // 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
|
2261 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2262 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2263 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2264 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
|
2265 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2266 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
|
2267 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2268 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2269 * 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
|
2270 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2271 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
|
2272 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2273 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
|
2274 (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
|
2275 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2276 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2277 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2278 } |
| 7 | 2279 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2280 { | |
| 2281 /* | |
| 2282 * Last line isn't finished: Display "@@@" at the end. | |
| 2283 */ | |
| 2284 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2285 W_WINROW(wp) + wp->w_height, | |
| 2286 (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
|
2287 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2288 set_empty_rows(wp, srow); |
| 2289 wp->w_botline = lnum; | |
| 2290 } | |
| 2291 else | |
| 2292 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2293 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2294 wp->w_botline = lnum; |
| 2295 } | |
| 2296 } | |
| 2297 else | |
| 2298 { | |
| 2299 draw_vsep_win(wp, row); | |
| 2300 if (eof) /* we hit the end of the file */ | |
| 2301 { | |
| 2302 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2303 #ifdef FEAT_DIFF | |
| 2304 j = diff_check_fill(wp, wp->w_botline); | |
| 2305 if (j > 0 && !wp->w_botfill) | |
| 2306 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2307 // Display filler lines at the end of the file. |
| 7 | 2308 if (char2cells(fill_diff) > 1) |
| 2309 i = '-'; | |
| 2310 else | |
| 2311 i = fill_diff; | |
| 2312 if (row + j > wp->w_height) | |
| 2313 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
|
2314 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2315 row += j; |
| 2316 } | |
| 2317 #endif | |
| 2318 } | |
| 3318 | 2319 else if (dollar_vcol == -1) |
| 7 | 2320 wp->w_botline = lnum; |
| 2321 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2322 // 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
|
2323 // 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
|
2324 win_draw_end(wp, |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2325 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2326 bt_popup(wp->w_buffer) ? ' ' : |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2327 #endif |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2328 '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2329 } |
| 2330 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2331 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2332 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2333 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2334 |
| 7 | 2335 /* Reset the type of redrawing required, the window has been updated. */ |
| 2336 wp->w_redr_type = 0; | |
| 2337 #ifdef FEAT_DIFF | |
| 2338 wp->w_old_topfill = wp->w_topfill; | |
| 2339 wp->w_old_botfill = wp->w_botfill; | |
| 2340 #endif | |
| 2341 | |
| 3318 | 2342 if (dollar_vcol == -1) |
| 7 | 2343 { |
| 2344 /* | |
| 2345 * There is a trick with w_botline. If we invalidate it on each | |
| 2346 * change that might modify it, this will cause a lot of expensive | |
| 2347 * calls to plines() in update_topline() each time. Therefore the | |
| 2348 * value of w_botline is often approximated, and this value is used to | |
| 2349 * compute the value of w_topline. If the value of w_botline was | |
| 2350 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2351 * the visible part of the text). If it's not, we need to redraw | |
| 2352 * again. Mostly this just means scrolling up a few lines, so it | |
| 2353 * doesn't look too bad. Only do this for the current window (where | |
| 2354 * changes are relevant). | |
| 2355 */ | |
| 2356 wp->w_valid |= VALID_BOTLINE; | |
| 2357 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2358 { | |
| 2359 recursive = TRUE; | |
| 2360 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2361 update_topline(); /* may invalidate w_botline again */ | |
| 2362 if (must_redraw != 0) | |
| 2363 { | |
| 2364 /* Don't update for changes in buffer again. */ | |
| 2365 i = curbuf->b_mod_set; | |
| 2366 curbuf->b_mod_set = FALSE; | |
| 2367 win_update(curwin); | |
| 2368 must_redraw = 0; | |
| 2369 curbuf->b_mod_set = i; | |
| 2370 } | |
| 2371 recursive = FALSE; | |
| 2372 } | |
| 2373 } | |
| 2374 | |
| 2375 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2376 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2377 if (!got_int) | |
| 2378 got_int = save_got_int; | |
| 2379 #endif | |
| 2380 } | |
| 2381 | |
| 2382 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2383 * 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
|
2384 * 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
|
2385 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2386 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
|
2387 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
|
2388 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
|
2389 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
|
2390 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
|
2391 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
|
2392 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
|
2393 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
|
2394 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
|
2395 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
|
2396 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2397 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
|
2398 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2399 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
|
2400 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
|
2401 #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
|
2402 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
|
2403 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2404 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
|
2405 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
|
2406 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
|
2407 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2408 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2409 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2410 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
|
2411 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
|
2412 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
|
2413 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
|
2414 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2415 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2416 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2417 * 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
|
2418 * 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
|
2419 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2420 */ |
| 2421 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2422 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2423 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2424 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2425 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
|
2426 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2427 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2428 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2429 hlf_T hl) |
| 7 | 2430 { |
| 2431 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
|
2432 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
|
2433 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
|
2434 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2435 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
|
2436 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2437 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
|
2438 { |
| 6553 | 2439 #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
|
2440 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
|
2441 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2442 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
|
2443 // 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
|
2444 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
|
2445 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
|
2446 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2447 #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
|
2448 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
|
2449 // 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
|
2450 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
|
2451 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
|
2452 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2453 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
|
2454 && 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
|
2455 // 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
|
2456 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
|
2457 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
|
2458 } |
| 7 | 2459 |
| 2460 #ifdef FEAT_RIGHTLEFT | |
| 2461 if (wp->w_p_rl) | |
| 2462 { | |
| 2463 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
|
2464 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
|
2465 c2, c2, attr); |
| 7 | 2466 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
|
2467 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
|
2468 c1, c2, attr); |
| 7 | 2469 } |
| 2470 else | |
| 2471 #endif | |
| 2472 { | |
| 2473 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
|
2474 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
|
2475 c1, c2, attr); |
| 7 | 2476 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2477 |
| 7 | 2478 set_empty_rows(wp, row); |
| 2479 } | |
| 2480 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2481 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2482 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2483 * 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
|
2484 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2485 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2486 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
|
2487 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2488 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2489 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2490 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2491 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2492 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2493 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2494 #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
|
2495 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2496 * 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
|
2497 * 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
|
2498 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2499 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2500 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
|
2501 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2502 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
|
2503 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2504 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2505 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2506 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2507 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
|
2508 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2509 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2510 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2511 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2512 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2513 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
|
2514 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
|
2515 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2516 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2517 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2518 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
|
2519 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2520 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2521 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2522 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2523 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2524 /* 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
|
2525 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
|
2526 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2527 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
|
2528 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
|
2529 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
|
2530 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2531 - (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
|
2532 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2533 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2534 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2535 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2536 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2537 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2538 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
|
2539 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
|
2540 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2541 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2542 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2543 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2544 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2545 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2546 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2547 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2548 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2549 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
|
2550 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2551 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2552 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
|
2553 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
|
2554 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2555 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2556 /* 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
|
2557 * 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
|
2558 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
|
2559 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2560 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2561 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2562 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
|
2563 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
|
2564 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2565 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2566 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2567 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
|
2568 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2569 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2570 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2571 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2572 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2573 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
|
2574 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2575 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2576 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2577 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2578 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2579 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2580 /* 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
|
2581 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
|
2582 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
|
2583 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2584 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
|
2585 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
|
2586 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2587 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2588 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2589 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2590 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
|
2591 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2592 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
|
2593 /* 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
|
2594 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
|
2595 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
|
2596 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2597 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
|
2598 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2599 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2600 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2601 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2602 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2603 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2604 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2605 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
|
2606 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2607 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
|
2608 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
|
2609 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2610 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2611 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2612 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
|
2613 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
|
2614 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2615 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2616 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
|
2617 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2618 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2619 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2620 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2621 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2622 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2623 |
| 7 | 2624 #ifdef FEAT_FOLDING |
| 2625 /* | |
| 6553 | 2626 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2627 * space is available for window "wp", minus "col". | |
| 2628 */ | |
| 2629 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2630 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2631 { |
| 2632 int fdc = wp->w_p_fdc; | |
| 2633 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
|
2634 int wwidth = wp->w_width; |
| 6553 | 2635 |
| 2636 if (fdc > wwidth - (col + wmw)) | |
| 2637 fdc = wwidth - (col + wmw); | |
| 2638 return fdc; | |
| 2639 } | |
| 2640 | |
| 2641 /* | |
| 7 | 2642 * Display one folded line. |
| 2643 */ | |
| 2644 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2645 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2646 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2647 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2648 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2649 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2650 int row) |
| 7 | 2651 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2652 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2653 pos_T *top, *bot; |
| 2654 linenr_T lnume = lnum + fold_count - 1; | |
| 2655 int len; | |
| 29 | 2656 char_u *text; |
| 7 | 2657 int fdc; |
| 2658 int col; | |
| 2659 int txtcol; | |
| 2660 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2661 int ri; |
| 7 | 2662 |
| 2663 /* Build the fold line: | |
| 2664 * 1. Add the cmdwin_type for the command-line window | |
| 2665 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2666 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2667 * 4. Compose the text |
| 2668 * 5. Add the text | |
| 2669 * 6. set highlighting for the Visual area an other text | |
| 2670 */ | |
| 2671 col = 0; | |
| 2672 | |
| 2673 /* | |
| 2674 * 1. Add the cmdwin_type for the command-line window | |
| 2675 * Ignores 'rightleft', this window is never right-left. | |
| 2676 */ | |
| 2677 #ifdef FEAT_CMDWIN | |
| 2678 if (cmdwin_type != 0 && wp == curwin) | |
| 2679 { | |
| 2680 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
|
2681 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2682 if (enc_utf8) |
| 2683 ScreenLinesUC[off] = 0; | |
| 2684 ++col; | |
| 2685 } | |
| 2686 #endif | |
| 2687 | |
| 2688 /* | |
| 2689 * 2. Add the 'foldcolumn' | |
| 6553 | 2690 * Reduce the width when there is not enough space. |
| 7 | 2691 */ |
| 6553 | 2692 fdc = compute_foldcolumn(wp, col); |
| 7 | 2693 if (fdc > 0) |
| 2694 { | |
| 2695 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2696 #ifdef FEAT_RIGHTLEFT | |
| 2697 if (wp->w_p_rl) | |
| 2698 { | |
| 2699 int i; | |
| 2700 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2701 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
|
2702 HL_ATTR(HLF_FC)); |
| 7 | 2703 /* reverse the fold column */ |
| 2704 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
|
2705 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2706 } |
| 2707 else | |
| 2708 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2709 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2710 col += fdc; |
| 2711 } | |
| 2712 | |
| 2713 #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
|
2714 # 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
|
2715 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2716 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
|
2717 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
|
2718 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
|
2719 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2720 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
|
2721 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
|
2722 } while (0) |
| 7 | 2723 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2724 # 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
|
2725 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2726 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
|
2727 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
|
2728 } while (0) |
| 7 | 2729 #endif |
| 2730 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2731 /* 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
|
2732 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2733 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2734 |
| 2735 #ifdef FEAT_SIGNS | |
| 2736 /* 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
|
2737 if (signcolumn_on(wp)) |
| 7 | 2738 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2739 len = wp->w_width - col; |
| 7 | 2740 if (len > 0) |
| 2741 { | |
| 2742 if (len > 2) | |
| 2743 len = 2; | |
| 2744 # ifdef FEAT_RIGHTLEFT | |
| 2745 if (wp->w_p_rl) | |
| 2746 /* 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
|
2747 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
|
2748 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2749 else |
| 2750 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2751 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2752 col += len; |
| 2753 } | |
| 2754 } | |
| 2755 #endif | |
| 2756 | |
| 2757 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2758 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2759 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2760 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2761 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2762 len = wp->w_width - col; |
| 7 | 2763 if (len > 0) |
| 2764 { | |
| 13 | 2765 int w = number_width(wp); |
| 5905 | 2766 long num; |
| 2767 char *fmt = "%*ld "; | |
| 13 | 2768 |
| 2769 if (len > w + 1) | |
| 2770 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2771 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2772 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
|
2773 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2774 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2775 else |
| 4065 | 2776 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2777 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2778 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
|
2779 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
|
2780 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2781 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2782 * line number */ |
| 4065 | 2783 num = lnum; |
| 2784 fmt = "%-*ld "; | |
| 2785 } | |
| 2786 } | |
| 2787 | |
| 2788 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2789 #ifdef FEAT_RIGHTLEFT |
| 2790 if (wp->w_p_rl) | |
| 2791 /* 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
|
2792 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
|
2793 HL_ATTR(HLF_FL)); |
| 7 | 2794 else |
| 2795 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2796 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2797 col += len; |
| 2798 } | |
| 2799 } | |
| 2800 | |
| 2801 /* | |
| 2802 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2803 */ | |
| 29 | 2804 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2805 |
| 2806 txtcol = col; /* remember where text starts */ | |
| 2807 | |
| 2808 /* | |
| 2809 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2810 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2811 * in columns number-col - window-width. | |
| 2812 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2813 col = text_to_screenline(wp, text, col); |
| 7 | 2814 |
| 2815 /* Fill the rest of the line with the fold filler */ | |
| 2816 #ifdef FEAT_RIGHTLEFT | |
| 2817 if (wp->w_p_rl) | |
| 2818 col -= txtcol; | |
| 2819 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2820 while (col < wp->w_width |
| 7 | 2821 #ifdef FEAT_RIGHTLEFT |
| 2822 - (wp->w_p_rl ? txtcol : 0) | |
| 2823 #endif | |
| 2824 ) | |
| 2825 { | |
| 2826 if (enc_utf8) | |
| 2827 { | |
| 2828 if (fill_fold >= 0x80) | |
| 2829 { | |
| 2830 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2831 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
|
2832 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2833 } |
| 2834 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2835 { |
| 7 | 2836 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2837 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2838 } |
|
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
|
2839 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
|
2840 } |
|
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
|
2841 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
|
2842 ScreenLines[off + col++] = fill_fold; |
| 7 | 2843 } |
| 2844 | |
| 2845 if (text != buf) | |
| 2846 vim_free(text); | |
| 2847 | |
| 2848 /* | |
| 2849 * 6. set highlighting for the Visual area an other text. | |
| 2850 * If all folded lines are in the Visual area, highlight the line. | |
| 2851 */ | |
| 2852 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 2853 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
2854 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 2855 { |
| 2856 /* Visual is after curwin->w_cursor */ | |
| 2857 top = &curwin->w_cursor; | |
| 2858 bot = &VIsual; | |
| 2859 } | |
| 2860 else | |
| 2861 { | |
| 2862 /* Visual is before curwin->w_cursor */ | |
| 2863 top = &VIsual; | |
| 2864 bot = &curwin->w_cursor; | |
| 2865 } | |
| 2866 if (lnum >= top->lnum | |
| 2867 && lnume <= bot->lnum | |
| 2868 && (VIsual_mode != 'v' | |
| 2869 || ((lnum > top->lnum | |
| 2870 || (lnum == top->lnum | |
| 2871 && top->col == 0)) | |
| 2872 && (lnume < bot->lnum | |
| 2873 || (lnume == bot->lnum | |
| 2874 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 2875 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 2876 { |
| 2877 if (VIsual_mode == Ctrl_V) | |
| 2878 { | |
| 2879 /* 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
|
2880 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 2881 { |
| 3040 | 2882 if (wp->w_old_cursor_lcol != MAXCOL |
| 2883 && 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
|
2884 < (colnr_T)wp->w_width) |
| 7 | 2885 len = wp->w_old_cursor_lcol; |
| 2886 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2887 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
|
2888 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 2889 len - (int)wp->w_old_cursor_fcol); |
| 7 | 2890 } |
| 2891 } | |
| 2892 else | |
| 216 | 2893 { |
| 7 | 2894 /* 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
|
2895 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 2896 } |
| 7 | 2897 } |
| 2898 } | |
| 2899 | |
| 743 | 2900 #ifdef FEAT_SYN_HL |
| 6685 | 2901 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 2902 if (wp->w_p_cc_cols) | |
| 2903 { | |
| 2904 int i = 0; | |
| 2905 int j = wp->w_p_cc_cols[i]; | |
| 2906 int old_txtcol = txtcol; | |
| 2907 | |
| 2908 while (j > -1) | |
| 2909 { | |
| 2910 txtcol += j; | |
| 2911 if (wp->w_p_wrap) | |
| 2912 txtcol -= wp->w_skipcol; | |
| 2913 else | |
| 2914 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
|
2915 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 2916 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
|
2917 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 2918 txtcol = old_txtcol; |
| 2919 j = wp->w_p_cc_cols[++i]; | |
| 2920 } | |
| 2921 } | |
| 2922 | |
| 743 | 2923 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 2924 if (wp->w_p_cuc) |
| 2925 { | |
| 2926 txtcol += wp->w_virtcol; | |
| 2927 if (wp->w_p_wrap) | |
| 2928 txtcol -= wp->w_skipcol; | |
| 2929 else | |
| 2930 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
|
2931 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 2932 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
|
2933 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 2934 } |
| 743 | 2935 #endif |
| 7 | 2936 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2937 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
|
2938 (int)wp->w_width, 0); |
| 7 | 2939 |
| 2940 /* | |
| 2941 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 2942 * updated (saves a call to plines() later). | |
| 2943 */ | |
| 2944 if (wp == curwin | |
| 2945 && lnum <= curwin->w_cursor.lnum | |
| 2946 && lnume >= curwin->w_cursor.lnum) | |
| 2947 { | |
| 2948 curwin->w_cline_row = row; | |
| 2949 curwin->w_cline_height = 1; | |
| 2950 curwin->w_cline_folded = TRUE; | |
| 2951 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 2952 } | |
| 2953 } | |
| 2954 | |
| 2955 /* | |
| 2956 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 2957 */ | |
| 2958 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2959 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2960 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2961 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2962 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2963 int attr) |
| 7 | 2964 { |
| 216 | 2965 int i; |
| 2966 | |
| 7 | 2967 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 2968 if (enc_utf8) | |
| 2969 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 2970 for (i = 0; i < len; ++i) |
| 2971 ScreenAttrs[off + i] = attr; | |
| 7 | 2972 } |
| 2973 | |
| 2974 /* | |
| 2975 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 2976 * Only to be called when 'foldcolumn' > 0. |
| 7 | 2977 */ |
| 2978 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2979 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2980 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2981 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2982 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2983 linenr_T lnum) /* current line number */ |
| 7 | 2984 { |
| 2985 int i = 0; | |
| 2986 int level; | |
| 2987 int first_level; | |
| 519 | 2988 int empty; |
| 6553 | 2989 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 2990 |
| 2991 /* Init to all spaces. */ | |
| 6929 | 2992 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 2993 |
| 2994 level = win_foldinfo.fi_level; | |
| 2995 if (level > 0) | |
| 2996 { | |
| 519 | 2997 /* If there is only one column put more info in it. */ |
| 6553 | 2998 empty = (fdc == 1) ? 0 : 1; |
| 519 | 2999 |
| 7 | 3000 /* If the column is too narrow, we start at the lowest level that |
| 3001 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3002 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3003 if (first_level < 1) |
| 3004 first_level = 1; | |
| 3005 | |
| 6553 | 3006 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3007 { |
| 3008 if (win_foldinfo.fi_lnum == lnum | |
| 3009 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3010 p[i] = '-'; | |
| 3011 else if (first_level == 1) | |
| 3012 p[i] = '|'; | |
| 3013 else if (first_level + i <= 9) | |
| 3014 p[i] = '0' + first_level + i; | |
| 3015 else | |
| 3016 p[i] = '>'; | |
| 3017 if (first_level + i == level) | |
| 3018 break; | |
| 3019 } | |
| 3020 } | |
| 3021 if (closed) | |
| 6553 | 3022 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3023 } |
| 3024 #endif /* FEAT_FOLDING */ | |
| 3025 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3026 #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
|
3027 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
|
3028 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
|
3029 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3030 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3031 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
|
3032 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3033 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
|
3034 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
|
3035 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
|
3036 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3037 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
|
3038 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
|
3039 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
|
3040 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
|
3041 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
|
3042 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3043 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
|
3044 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3045 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
|
3046 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3047 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
|
3048 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
|
3049 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
|
3050 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
|
3051 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
|
3052 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3053 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3054 |
| 7 | 3055 /* |
| 3056 * Display line "lnum" of window 'wp' on the screen. | |
| 3057 * Start at row "startrow", stop when "endrow" is reached. | |
| 3058 * wp->w_virtcol needs to be valid. | |
| 3059 * | |
| 3060 * Return the number of last row the line occupies. | |
| 3061 */ | |
| 3062 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3063 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3064 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3065 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3066 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3067 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
|
3068 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
|
3069 int number_only) // only update the number column |
| 7 | 3070 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3071 int col = 0; /* visual column on screen */ |
| 7 | 3072 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3073 int c = 0; /* init for GCC */ | |
| 3074 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3075 #ifdef FEAT_LINEBREAK |
| 3076 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3077 #endif | |
| 7 | 3078 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3079 char_u *line; /* current line */ | |
| 3080 char_u *ptr; /* current position in "line" */ | |
| 3081 int row; /* row in the window, excl w_winrow */ | |
| 3082 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3083 | |
| 3084 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3085 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3086 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3087 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3088 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
|
3089 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3090 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3091 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3092 displaying lcs_eol at end-of-line */ | |
| 3093 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3094 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3095 | |
| 3096 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3097 int saved_n_extra = 0; | |
| 3098 char_u *saved_p_extra = NULL; | |
| 3099 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
|
3100 int saved_c_final = 0; |
| 7 | 3101 int saved_char_attr = 0; |
| 3102 | |
| 3103 int n_attr = 0; /* chars with special attr */ | |
| 3104 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3105 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3106 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3107 | |
| 3108 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3109 | |
| 3110 int fromcol, tocol; /* start/end of inverting */ | |
| 3111 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3112 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3113 pos_T *top, *bot; | |
| 1813 | 3114 int lnum_in_visual_area = FALSE; |
| 7 | 3115 pos_T pos; |
| 3116 long v; | |
| 3117 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3118 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
|
3119 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
|
3120 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
|
3121 // 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
|
3122 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
|
3123 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3124 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
|
3125 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
|
3126 // 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
|
3127 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
|
3128 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3129 #ifdef FEAT_SYN_HL |
| 743 | 3130 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3131 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3132 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3133 int save_did_emsg; | |
| 1437 | 3134 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
|
3135 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3136 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3137 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3138 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3139 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3140 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
|
3141 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3142 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3143 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3144 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
|
3145 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
|
3146 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
|
3147 #endif |
| 743 | 3148 #ifdef FEAT_SPELL |
| 221 | 3149 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3150 # define SPWORDLEN 150 |
| 3151 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3152 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3153 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3154 starts */ |
| 221 | 3155 int spell_attr = 0; /* attributes desired by spelling */ |
| 3156 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3157 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3158 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3159 * there are no spell errors */ |
| 386 | 3160 static int cap_col = -1; /* column to check for Cap word */ |
| 3161 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3162 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3163 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3164 int extra_check = 0; // has extra highlighting |
| 7 | 3165 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3166 int mb_l = 1; /* multi-byte byte length */ | |
| 3167 int mb_c = 0; /* decoded multi-byte character */ | |
| 3168 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3169 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3170 #ifdef FEAT_DIFF |
| 3171 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3172 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3173 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3174 int change_start = MAXCOL; /* first col of changed area */ |
| 3175 int change_end = -1; /* last col of changed area */ | |
| 3176 #endif | |
| 3177 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3178 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3179 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
|
3180 chars */ |
| 7 | 3181 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3182 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3183 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3184 # define LINE_ATTR |
| 1536 | 3185 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3186 #endif |
| 3187 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3188 matchitem_T *cur; /* points to the match list */ |
| 3189 match_T *shl; /* points to search_hl or a match */ | |
| 3190 int shl_flag; /* flag to indicate whether search_hl | |
| 3191 has been processed or not */ | |
| 5979 | 3192 int pos_inprogress; /* marks that position match search is |
| 3193 in progress */ | |
| 1326 | 3194 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3195 equals startcol of search_hl or one | |
| 3196 of the matches */ | |
| 7 | 3197 #endif |
| 3198 #ifdef FEAT_ARABIC | |
| 3199 int prev_c = 0; /* previous Arabic character */ | |
| 3200 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3201 #endif | |
| 910 | 3202 #if defined(LINE_ATTR) |
| 867 | 3203 int did_line_attr = 0; |
| 3204 #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
|
3205 #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
|
3206 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3207 #endif |
| 7 | 3208 |
| 3209 /* draw_state: items that are drawn in sequence: */ | |
| 3210 #define WL_START 0 /* nothing done yet */ | |
| 3211 #ifdef FEAT_CMDWIN | |
| 3212 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3213 #else | |
| 3214 # define WL_CMDLINE WL_START | |
| 3215 #endif | |
| 3216 #ifdef FEAT_FOLDING | |
| 3217 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3218 #else | |
| 3219 # define WL_FOLD WL_CMDLINE | |
| 3220 #endif | |
| 3221 #ifdef FEAT_SIGNS | |
| 3222 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3223 #else | |
| 3224 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3225 #endif | |
| 3226 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3227 #ifdef FEAT_LINEBREAK |
| 3228 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3229 #else | |
| 3230 # define WL_BRI WL_NR | |
| 3231 #endif | |
| 7 | 3232 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3233 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3234 #else |
| 5995 | 3235 # define WL_SBR WL_BRI |
| 7 | 3236 #endif |
| 3237 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3238 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3239 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3240 int feedback_col = 0; |
| 3241 int feedback_old_attr = -1; | |
| 3242 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3243 int screen_line_flags = 0; |
| 7 | 3244 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3245 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3246 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
|
3247 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
|
3248 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
|
3249 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
|
3250 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3251 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
|
3252 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3253 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
|
3254 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3255 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3256 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3257 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3258 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3259 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3260 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3261 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3262 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3263 col -= boguscols; \ |
| 6520 | 3264 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3265 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3266 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3267 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3268 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3269 #endif |
| 7 | 3270 |
| 3271 if (startrow > endrow) /* past the end already! */ | |
| 3272 return startrow; | |
| 3273 | |
| 3274 row = startrow; | |
| 3275 screen_row = row + W_WINROW(wp); | |
| 3276 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3277 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
|
3278 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3279 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3280 * 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
|
3281 * 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
|
3282 */ |
| 7 | 3283 #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
|
3284 extra_check = wp->w_p_lbr; |
| 7 | 3285 #endif |
| 3286 #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
|
3287 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
|
3288 # 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
|
3289 && !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
|
3290 # endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3291 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3292 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3293 /* 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
|
3294 * 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
|
3295 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
|
3296 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
|
3297 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
|
3298 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
|
3299 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
|
3300 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3301 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3302 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
|
3303 #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
|
3304 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
|
3305 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3306 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3307 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
|
3308 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
|
3309 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3310 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3311 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3312 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3313 /* 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
|
3314 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
|
3315 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
|
3316 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3317 #endif |
| 3318 | |
|
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
|
3319 #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
|
3320 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
|
3321 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3322 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
|
3323 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3324 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
|
3325 } |
|
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
|
3326 #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
|
3327 |
| 743 | 3328 #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
|
3329 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
|
3330 && *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
|
3331 && 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
|
3332 && *(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
|
3333 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3334 /* 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
|
3335 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
|
3336 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
|
3337 |
|
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
|
3338 /* 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
|
3339 * 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
|
3340 * 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
|
3341 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
|
3342 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
|
3343 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3344 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
|
3345 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
|
3346 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3347 |
|
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
|
3348 /* 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
|
3349 * 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
|
3350 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
|
3351 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
|
3352 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
|
3353 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3354 /* 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
|
3355 * 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
|
3356 * 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
|
3357 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
|
3358 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
|
3359 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
|
3360 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
|
3361 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
|
3362 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3363 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3364 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3365 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3366 * 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
|
3367 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3368 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
|
3369 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
|
3370 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
|
3371 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3372 /* 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
|
3373 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
|
3374 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3375 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
|
3376 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
|
3377 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3378 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
|
3379 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3380 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
|
3381 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
|
3382 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3383 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
|
3384 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
|
3385 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3386 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
|
3387 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3388 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
|
3389 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
|
3390 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3391 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3392 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
|
3393 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3394 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3395 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
|
3396 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
|
3397 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3398 if (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
|
3399 fromcol = 0; |
| 7 | 3400 else |
| 3401 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3402 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
|
3403 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
|
3404 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
|
3405 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3406 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3407 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
|
3408 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3409 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
|
3410 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3411 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
|
3412 tocol = MAXCOL; |
| 7 | 3413 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3414 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
|
3415 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
|
3416 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3417 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3418 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
|
3419 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
|
3420 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
|
3421 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3422 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3423 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
|
3424 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3425 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3426 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3427 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3428 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3429 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3430 /* 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
|
3431 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
|
3432 #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
|
3433 && !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
|
3434 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3435 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 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
|
3437 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3438 /* 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
|
3439 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
|
3440 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3441 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3442 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3443 #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
|
3444 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
|
3445 && 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
|
3446 || (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
|
3447 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3448 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
|
3449 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3450 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3451 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3452 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3453 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3454 * 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
|
3455 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3456 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
|
3457 && 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
|
3458 && 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
|
3459 && 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
|
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 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
|
3462 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
|
3463 (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
|
3464 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 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
|
3466 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
|
3467 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3468 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
|
3469 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
|
3470 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
|
3471 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3472 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3473 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
|
3474 /* 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
|
3475 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
|
3476 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
|
3477 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3478 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
|
3479 } |
| 7 | 3480 } |
| 3481 | |
| 3482 #ifdef FEAT_DIFF | |
| 3483 filler_lines = diff_check(wp, lnum); | |
| 3484 if (filler_lines < 0) | |
| 3485 { | |
| 3486 if (filler_lines == -1) | |
| 3487 { | |
| 3488 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3489 diff_hlf = HLF_ADD; /* added line */ | |
| 3490 else if (change_start == 0) | |
| 3491 diff_hlf = HLF_TXD; /* changed text */ | |
| 3492 else | |
| 3493 diff_hlf = HLF_CHD; /* changed line */ | |
| 3494 } | |
| 3495 else | |
| 3496 diff_hlf = HLF_ADD; /* added line */ | |
| 3497 filler_lines = 0; | |
| 3498 area_highlighting = TRUE; | |
| 3499 } | |
| 3500 if (lnum == wp->w_topline) | |
| 3501 filler_lines = wp->w_topfill; | |
| 3502 filler_todo = filler_lines; | |
| 3503 #endif | |
| 3504 | |
| 3505 #ifdef LINE_ATTR | |
| 3506 # ifdef FEAT_SIGNS | |
| 3507 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3508 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3509 if (v != 0) | |
| 3510 line_attr = sign_get_attr((int)v, TRUE); | |
| 3511 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3512 # if defined(FEAT_QUICKFIX) |
| 7 | 3513 /* Highlight the current line in the quickfix window. */ |
| 644 | 3514 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
|
3515 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3516 # endif |
| 3517 if (line_attr != 0) | |
| 3518 area_highlighting = TRUE; | |
| 3519 #endif | |
| 3520 | |
| 3521 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3522 ptr = line; | |
| 3523 | |
| 743 | 3524 #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
|
3525 if (has_spell && !number_only) |
| 348 | 3526 { |
| 386 | 3527 /* For checking first word with a capital skip white space. */ |
| 3528 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
|
3529 cap_col = getwhitecols(line); |
| 386 | 3530 |
| 348 | 3531 /* To be able to spell-check over line boundaries copy the end of the |
| 3532 * current line into nextline[]. Above the start of the next line was | |
| 3533 * copied to nextline[SPWORDLEN]. */ | |
| 3534 if (nextline[SPWORDLEN] == NUL) | |
| 3535 { | |
| 3536 /* No next line or it is empty. */ | |
| 3537 nextlinecol = MAXCOL; | |
| 3538 nextline_idx = 0; | |
| 3539 } | |
| 3540 else | |
| 3541 { | |
| 835 | 3542 v = (long)STRLEN(line); |
| 348 | 3543 if (v < SPWORDLEN) |
| 3544 { | |
| 3545 /* Short line, use it completely and append the start of the | |
| 3546 * next line. */ | |
| 3547 nextlinecol = 0; | |
| 3548 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3549 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3550 nextline_idx = v + 1; |
| 3551 } | |
| 3552 else | |
| 3553 { | |
| 3554 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3555 nextlinecol = v - SPWORDLEN; | |
| 3556 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3557 nextline_idx = SPWORDLEN + 1; | |
| 3558 } | |
| 3559 } | |
| 3560 } | |
| 3561 #endif | |
| 3562 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3563 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3564 { |
|
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
|
3565 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
|
3566 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3567 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3568 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3569 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3570 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
|
3571 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
|
3572 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3573 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3574 } |
| 7 | 3575 } |
| 3576 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3577 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
|
3578 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3579 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3580 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3581 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3582 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3583 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3584 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3585 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3586 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3587 |
| 7 | 3588 /* |
| 3589 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3590 * first character to be displayed. | |
| 3591 */ | |
| 3592 if (wp->w_p_wrap) | |
| 3593 v = wp->w_skipcol; | |
| 3594 else | |
| 3595 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
|
3596 if (v > 0 && !number_only) |
| 7 | 3597 { |
| 3598 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3599 |
| 7 | 3600 while (vcol < v && *ptr != NUL) |
| 3601 { | |
| 5995 | 3602 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3603 vcol += c; |
| 3604 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3605 MB_PTR_ADV(ptr); |
| 7 | 3606 } |
| 3607 | |
| 1984 | 3608 /* When: |
| 3609 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3610 * - 'colorcolumn' is set, or |
| 1984 | 3611 * - 'virtualedit' is set, or |
| 3612 * - the visual mode is active, | |
| 3613 * the end of the line may be before the start of the displayed part. | |
| 3614 */ | |
| 3615 if (vcol < v && ( | |
| 5735 | 3616 #ifdef FEAT_SYN_HL |
| 3617 wp->w_p_cuc || draw_color_col || | |
| 3618 #endif | |
| 3619 virtual_active() || | |
| 3620 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3621 vcol = v; |
| 3622 | |
| 3623 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3624 * that character but skip the first few screen characters. */ | |
| 3625 if (vcol > v) | |
| 3626 { | |
| 3627 vcol -= c; | |
| 3628 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
|
3629 /* 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
|
3630 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3631 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
|
3632 n_skip = v - vcol; |
| 7 | 3633 } |
| 3634 | |
| 3635 /* | |
| 3636 * Adjust for when the inverted text is before the screen, | |
| 3637 * and when the start of the inverted text is before the screen. | |
| 3638 */ | |
| 3639 if (tocol <= vcol) | |
| 3640 fromcol = 0; | |
| 3641 else if (fromcol >= 0 && fromcol < vcol) | |
| 3642 fromcol = vcol; | |
| 3643 | |
| 3644 #ifdef FEAT_LINEBREAK | |
| 3645 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3646 if (wp->w_p_wrap) | |
| 3647 need_showbreak = TRUE; | |
| 3648 #endif | |
| 743 | 3649 #ifdef FEAT_SPELL |
| 499 | 3650 /* When spell checking a word we need to figure out the start of the |
| 3651 * word and if it's badly spelled or not. */ | |
| 3652 if (has_spell) | |
| 3653 { | |
| 3654 int len; | |
| 1536 | 3655 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3656 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3657 |
| 3658 pos = wp->w_cursor; | |
| 3659 wp->w_cursor.lnum = lnum; | |
| 1536 | 3660 wp->w_cursor.col = linecol; |
| 534 | 3661 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3662 |
| 3663 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3664 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3665 ptr = line + linecol; | |
| 3666 | |
| 530 | 3667 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3668 { |
| 3669 /* no bad word found at line start, don't check until end of a | |
| 3670 * word */ | |
| 534 | 3671 spell_hlf = HLF_COUNT; |
| 3572 | 3672 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3673 } |
| 3674 else | |
| 534 | 3675 { |
| 499 | 3676 /* bad word found, use attributes until end of word */ |
| 3677 word_end = wp->w_cursor.col + len + 1; | |
| 3678 | |
| 534 | 3679 /* Turn index into actual attributes. */ |
| 3680 if (spell_hlf != HLF_COUNT) | |
| 3681 spell_attr = highlight_attr[spell_hlf]; | |
| 3682 } | |
| 499 | 3683 wp->w_cursor = pos; |
| 501 | 3684 |
| 743 | 3685 # ifdef FEAT_SYN_HL |
| 501 | 3686 /* Need to restart syntax highlighting for this line. */ |
| 3687 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3688 syntax_start(wp, lnum); |
| 743 | 3689 # endif |
| 499 | 3690 } |
| 3691 #endif | |
| 7 | 3692 } |
| 3693 | |
| 3694 /* | |
| 3695 * Correct highlighting for cursor that can't be disabled. | |
| 3696 * Avoids having to check this for each character. | |
| 3697 */ | |
| 3698 if (fromcol >= 0) | |
| 3699 { | |
| 3700 if (noinvcur) | |
| 3701 { | |
| 3702 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3703 { | |
| 3704 /* highlighting starts at cursor, let it start just after the | |
| 3705 * cursor */ | |
| 3706 fromcol_prev = fromcol; | |
| 3707 fromcol = -1; | |
| 3708 } | |
| 3709 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3710 /* restart highlighting after the cursor */ | |
| 3711 fromcol_prev = wp->w_virtcol; | |
| 3712 } | |
| 3713 if (fromcol >= tocol) | |
| 3714 fromcol = -1; | |
| 3715 } | |
| 3716 | |
| 3717 #ifdef FEAT_SEARCH_EXTRA | |
| 3718 /* | |
| 1326 | 3719 * Handle highlighting the last used search pattern and matches. |
| 3720 * 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
|
3721 * Not in a popup window. |
| 7 | 3722 */ |
| 1326 | 3723 cur = wp->w_match_head; |
| 3724 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3725 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
|
3726 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3727 { |
| 3728 if (shl_flag == FALSE) | |
| 3729 { | |
| 3730 shl = &search_hl; | |
| 3731 shl_flag = TRUE; | |
| 3732 } | |
| 3733 else | |
| 3734 shl = &cur->hl; | |
| 36 | 3735 shl->startcol = MAXCOL; |
| 3736 shl->endcol = MAXCOL; | |
| 7 | 3737 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3738 shl->is_addpos = FALSE; |
| 5979 | 3739 v = (long)(ptr - line); |
| 3740 if (cur != NULL) | |
| 3741 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3742 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
|
3743 shl == &search_hl ? NULL : cur); |
| 5979 | 3744 |
| 3745 /* Need to get the line again, a multi-line regexp may have made it | |
| 3746 * invalid. */ | |
| 3747 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3748 ptr = line + v; | |
| 3749 | |
| 3750 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3751 { | |
| 3752 if (shl->lnum == lnum) | |
| 3753 shl->startcol = shl->rm.startpos[0].col; | |
| 3754 else | |
| 3755 shl->startcol = 0; | |
| 3756 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3757 - shl->rm.startpos[0].lnum) | |
| 3758 shl->endcol = shl->rm.endpos[0].col; | |
| 3759 else | |
| 3760 shl->endcol = MAXCOL; | |
| 3761 /* Highlight one character for an empty match. */ | |
| 3762 if (shl->startcol == shl->endcol) | |
| 3763 { | |
| 3764 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3765 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3766 else |
| 5979 | 3767 ++shl->endcol; |
| 3768 } | |
| 3769 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3770 { | |
| 3771 shl->attr_cur = shl->attr; | |
| 3772 search_attr = shl->attr; | |
| 3773 } | |
| 3774 area_highlighting = TRUE; | |
| 7 | 3775 } |
| 1326 | 3776 if (shl != &search_hl && cur != NULL) |
| 3777 cur = cur->next; | |
| 7 | 3778 } |
| 3779 #endif | |
| 3780 | |
| 743 | 3781 #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
|
3782 // 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
|
3783 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
|
3784 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3785 // 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
|
3786 // 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
|
3787 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
|
3788 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3789 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
|
3790 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3791 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3792 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3793 } |
| 3794 #endif | |
| 3795 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3796 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3797 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3798 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3799 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3800 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
|
3801 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3802 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3803 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3804 // 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
|
3805 // 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
|
3806 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
|
3807 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3808 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
|
3809 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
|
3810 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3811 // 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
|
3812 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
|
3813 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3814 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3815 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3816 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3817 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3818 |
| 504 | 3819 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3820 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3821 |
| 7 | 3822 #ifdef FEAT_RIGHTLEFT |
| 3823 if (wp->w_p_rl) | |
| 3824 { | |
| 3825 /* Rightleft window: process the text in the normal direction, but put | |
| 3826 * it in current_ScreenLine[] from right to left. Start at the | |
| 3827 * 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
|
3828 col = wp->w_width - 1; |
| 7 | 3829 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3830 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3831 } |
| 3832 #endif | |
| 3833 | |
| 3834 /* | |
| 3835 * Repeat for the whole displayed line. | |
| 3836 */ | |
| 3837 for (;;) | |
| 3838 { | |
| 6947 | 3839 #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
|
3840 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
|
3841 int did_decrement_ptr = FALSE; |
| 6947 | 3842 #endif |
| 7 | 3843 /* Skip this quickly when working on the text. */ |
| 3844 if (draw_state != WL_LINE) | |
| 3845 { | |
| 3846 #ifdef FEAT_CMDWIN | |
| 3847 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 3848 { | |
| 3849 draw_state = WL_CMDLINE; | |
| 3850 if (cmdwin_type != 0 && wp == curwin) | |
| 3851 { | |
| 3852 /* Draw the cmdline character. */ | |
| 3853 n_extra = 1; | |
| 1340 | 3854 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
|
3855 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
|
3856 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 3857 } |
| 3858 } | |
| 3859 #endif | |
| 3860 | |
| 3861 #ifdef FEAT_FOLDING | |
| 3862 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 3863 { | |
| 6553 | 3864 int fdc = compute_foldcolumn(wp, 0); |
| 3865 | |
| 7 | 3866 draw_state = WL_FOLD; |
| 6553 | 3867 if (fdc > 0) |
| 7 | 3868 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3869 /* 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
|
3870 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
3871 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3872 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3873 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3874 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3875 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3876 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
|
3877 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3878 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3879 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
3880 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
|
3881 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
|
3882 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
|
3883 } |
| 7 | 3884 } |
| 3885 } | |
| 3886 #endif | |
| 3887 | |
| 3888 #ifdef FEAT_SIGNS | |
| 3889 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 3890 { | |
| 3891 draw_state = WL_SIGN; | |
| 3892 /* Show the sign column when there are any signs in this | |
| 3893 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
3894 if (signcolumn_on(wp)) |
| 7 | 3895 { |
| 2661 | 3896 int text_sign; |
| 7 | 3897 # ifdef FEAT_SIGN_ICONS |
| 2661 | 3898 int icon_sign; |
| 7 | 3899 # endif |
| 3900 | |
| 3901 /* Draw two cells with the sign value or blank. */ | |
| 3902 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3903 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
|
3904 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 3905 n_extra = 2; |
| 3906 | |
| 5921 | 3907 if (row == startrow |
| 3908 #ifdef FEAT_DIFF | |
| 3909 + filler_lines && filler_todo <= 0 | |
| 3910 #endif | |
| 3911 ) | |
| 7 | 3912 { |
| 3913 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3914 SIGN_TEXT); | |
| 3915 # ifdef FEAT_SIGN_ICONS | |
| 3916 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 3917 SIGN_ICON); | |
| 3918 if (gui.in_use && icon_sign != 0) | |
| 3919 { | |
| 3920 /* Use the image in this position. */ | |
| 3921 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
|
3922 c_final = NUL; |
| 7 | 3923 # ifdef FEAT_NETBEANS_INTG |
| 3924 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
|
3925 { |
| 7 | 3926 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
|
3927 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
3928 } |
| 7 | 3929 # endif |
| 3930 char_attr = icon_sign; | |
| 3931 } | |
| 3932 else | |
| 3933 # endif | |
| 3934 if (text_sign != 0) | |
| 3935 { | |
| 3936 p_extra = sign_get_text(text_sign); | |
| 3937 if (p_extra != NULL) | |
| 3938 { | |
| 3939 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
|
3940 c_final = NUL; |
| 835 | 3941 n_extra = (int)STRLEN(p_extra); |
| 7 | 3942 } |
| 3943 char_attr = sign_get_attr(text_sign, FALSE); | |
| 3944 } | |
| 3945 } | |
| 3946 } | |
| 3947 } | |
| 3948 #endif | |
| 3949 | |
| 3950 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 3951 { | |
| 3952 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3953 /* 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
|
3954 * 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
|
3955 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 3956 && (row == startrow |
| 3957 #ifdef FEAT_DIFF | |
| 3958 + filler_lines | |
| 3959 #endif | |
| 3960 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 3961 { | |
| 3962 /* Draw the line number (empty space after wrapping). */ | |
| 3963 if (row == startrow | |
| 3964 #ifdef FEAT_DIFF | |
| 3965 + filler_lines | |
| 3966 #endif | |
| 3967 ) | |
| 3968 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3969 long num; |
| 4065 | 3970 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3971 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3972 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
|
3973 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3974 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3975 else |
| 4065 | 3976 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3977 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 3978 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
|
3979 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 3980 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
3981 /* 'number' + 'relativenumber' */ |
| 4065 | 3982 num = lnum; |
| 3983 fmt = "%-*ld "; | |
| 3984 } | |
| 3985 } | |
| 3986 | |
| 3987 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
3988 number_width(wp), num); |
| 7 | 3989 if (wp->w_skipcol > 0) |
| 3990 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 3991 *p_extra = '-'; | |
| 3992 #ifdef FEAT_RIGHTLEFT | |
| 3993 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
|
3994 { |
|
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
|
3995 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
|
3996 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
|
3997 |
|
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
|
3998 // 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
|
3999 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
|
4000 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
|
4001 { |
|
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
|
4002 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
|
4003 *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
|
4004 *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
|
4005 } |
|
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
|
4006 } |
| 7 | 4007 #endif |
| 4008 p_extra = extra; | |
| 4009 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
|
4010 c_final = NUL; |
| 7 | 4011 } |
| 4012 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4013 { |
| 7 | 4014 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4015 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4016 } |
| 13 | 4017 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
|
4018 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4019 #ifdef FEAT_SYN_HL |
| 4020 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4021 * the current line differently. |
| 4022 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4023 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4024 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4025 && 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
|
4026 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4027 #endif |
| 7 | 4028 } |
| 4029 } | |
| 4030 | |
| 5995 | 4031 #ifdef FEAT_LINEBREAK |
| 4032 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4033 && n_extra == 0 && *p_sbr != NUL) | |
| 4034 /* draw indent after showbreak value */ | |
| 4035 draw_state = WL_BRI; | |
| 4036 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4037 /* After the showbreak, draw the breakindent */ | |
| 4038 draw_state = WL_BRI - 1; | |
| 4039 | |
| 4040 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4041 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4042 { | |
| 4043 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4044 /* 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
|
4045 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
|
4046 && (row != startrow || need_showbreak) |
| 5995 | 4047 # ifdef FEAT_DIFF |
| 4048 && filler_lines == 0 | |
| 6834 | 4049 # endif |
| 5995 | 4050 ) |
| 4051 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4052 char_attr = 0; |
| 6834 | 4053 # ifdef FEAT_DIFF |
| 5995 | 4054 if (diff_hlf != (hlf_T)0) |
| 6106 | 4055 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4056 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4057 # ifdef FEAT_SYN_HL |
| 6106 | 4058 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4059 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
|
4060 HL_ATTR(HLF_CUL)); |
| 6834 | 4061 # endif |
| 6106 | 4062 } |
| 6834 | 4063 # endif |
| 6028 | 4064 p_extra = NULL; |
| 5995 | 4065 c_extra = ' '; |
| 4066 n_extra = get_breakindent_win(wp, | |
| 4067 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4068 /* Correct end of highlighted area for 'breakindent', | |
| 4069 * required when 'linebreak' is also set. */ | |
| 4070 if (tocol == vcol) | |
| 4071 tocol += n_extra; | |
| 4072 } | |
| 4073 } | |
| 4074 #endif | |
| 4075 | |
| 7 | 4076 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4077 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4078 { | |
| 4079 draw_state = WL_SBR; | |
| 4080 # ifdef FEAT_DIFF | |
| 4081 if (filler_todo > 0) | |
| 4082 { | |
| 4083 /* Draw "deleted" diff line(s). */ | |
| 4084 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
|
4085 { |
| 7 | 4086 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4087 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4088 } |
| 7 | 4089 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4090 { |
| 7 | 4091 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
|
4092 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4093 } |
| 7 | 4094 # ifdef FEAT_RIGHTLEFT |
| 4095 if (wp->w_p_rl) | |
| 4096 n_extra = col + 1; | |
| 4097 else | |
| 4098 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4099 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
|
4100 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4101 } |
| 4102 # endif | |
| 4103 # ifdef FEAT_LINEBREAK | |
| 4104 if (*p_sbr != NUL && need_showbreak) | |
| 4105 { | |
| 4106 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4107 p_extra = p_sbr; | |
| 4108 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
|
4109 c_final = NUL; |
| 7 | 4110 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
|
4111 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4112 need_showbreak = FALSE; |
| 6503 | 4113 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4114 /* Correct end of highlighted area for 'showbreak', |
| 4115 * required when 'linebreak' is also set. */ | |
| 4116 if (tocol == vcol) | |
| 4117 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4118 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4119 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4120 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4121 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
|
4122 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4123 #endif |
| 7 | 4124 } |
| 4125 # endif | |
| 4126 } | |
| 4127 #endif | |
| 4128 | |
| 4129 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4130 { | |
| 4131 draw_state = WL_LINE; | |
| 4132 if (saved_n_extra) | |
| 4133 { | |
| 4134 /* Continue item from end of wrapped line. */ | |
| 4135 n_extra = saved_n_extra; | |
| 4136 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
|
4137 c_final = saved_c_final; |
| 7 | 4138 p_extra = saved_p_extra; |
| 4139 char_attr = saved_char_attr; | |
| 4140 } | |
| 4141 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4142 char_attr = win_attr; |
| 7 | 4143 } |
| 4144 } | |
| 4145 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4146 // 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
|
4147 // 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
|
4148 // 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
|
4149 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4150 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4151 #ifdef FEAT_DIFF |
| 4152 && filler_todo <= 0 | |
| 4153 #endif | |
| 4154 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4155 || (number_only && draw_state > WL_NR)) |
| 7 | 4156 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4157 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
|
4158 screen_line_flags); |
| 819 | 4159 /* Pretend we have finished updating the window. Except when |
| 4160 * 'cursorcolumn' is set. */ | |
| 4161 #ifdef FEAT_SYN_HL | |
| 4162 if (wp->w_p_cuc) | |
| 4163 row = wp->w_cline_row + wp->w_cline_height; | |
| 4164 else | |
| 4165 #endif | |
| 4166 row = wp->w_height; | |
| 7 | 4167 break; |
| 4168 } | |
| 4169 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4170 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
|
4171 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4172 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4173 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4174 )) |
| 7 | 4175 { |
| 4176 /* handle Visual or match highlighting in this line */ | |
| 4177 if (vcol == fromcol | |
| 4178 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4179 && (*mb_ptr2cells)(ptr) > 1) | |
| 4180 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4181 && vcol_prev < vcol /* not at margin */ |
| 7 | 4182 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4183 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4184 else if (area_attr != 0 |
| 4185 && (vcol == tocol | |
| 4186 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4187 area_attr = 0; /* stop highlighting */ | |
| 4188 | |
| 4189 #ifdef FEAT_SEARCH_EXTRA | |
| 4190 if (!n_extra) | |
| 4191 { | |
| 4192 /* | |
| 4193 * Check for start/end of search pattern match. | |
| 4194 * After end, check for start/end of next match. | |
| 4195 * When another match, have to check for start again. | |
| 4196 * Watch out for matching an empty string! | |
| 1326 | 4197 * Do this for 'search_hl' and the match list (ordered by |
| 4198 * priority). | |
| 7 | 4199 */ |
| 36 | 4200 v = (long)(ptr - line); |
| 1326 | 4201 cur = wp->w_match_head; |
| 4202 shl_flag = FALSE; | |
| 4203 while (cur != NULL || shl_flag == FALSE) | |
| 4204 { | |
| 4205 if (shl_flag == FALSE | |
| 4206 && ((cur != NULL | |
| 4207 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4208 || cur == NULL)) | |
| 4209 { | |
| 4210 shl = &search_hl; | |
| 4211 shl_flag = TRUE; | |
| 4212 } | |
| 4213 else | |
| 4214 shl = &cur->hl; | |
| 5979 | 4215 if (cur != NULL) |
| 4216 cur->pos.cur = 0; | |
| 4217 pos_inprogress = TRUE; | |
| 4218 while (shl->rm.regprog != NULL | |
| 4219 || (cur != NULL && pos_inprogress)) | |
| 7 | 4220 { |
| 36 | 4221 if (shl->startcol != MAXCOL |
| 4222 && v >= (long)shl->startcol | |
| 4223 && v < (long)shl->endcol) | |
| 7 | 4224 { |
| 6430 | 4225 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4226 | |
| 4227 if (shl->endcol < tmp_col) | |
| 4228 shl->endcol = tmp_col; | |
| 7 | 4229 shl->attr_cur = shl->attr; |
| 6947 | 4230 #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
|
4231 // 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
|
4232 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4233 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
|
4234 && 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
|
4235 && 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
|
4236 == cur->hlg_id) |
| 6947 | 4237 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4238 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4239 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4240 match_conc = cur->conceal_char; |
| 4241 } | |
| 4242 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4243 has_match_conc = match_conc = 0; |
| 6947 | 4244 #endif |
| 7 | 4245 } |
| 6430 | 4246 else if (v == (long)shl->endcol) |
| 7 | 4247 { |
| 4248 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4249 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
|
4250 shl == &search_hl ? NULL : cur); |
| 5979 | 4251 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4252 ? FALSE : TRUE; |
| 7 | 4253 |
| 4254 /* Need to get the line again, a multi-line regexp | |
| 4255 * may have made it invalid. */ | |
| 4256 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4257 ptr = line + v; | |
| 4258 | |
| 4259 if (shl->lnum == lnum) | |
| 4260 { | |
| 36 | 4261 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4262 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4263 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4264 else |
| 36 | 4265 shl->endcol = MAXCOL; |
| 4266 | |
| 4267 if (shl->startcol == shl->endcol) | |
| 7 | 4268 { |
| 4269 /* highlight empty match, try again after | |
| 4270 * it */ | |
| 4271 if (has_mbyte) | |
| 474 | 4272 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4273 + shl->endcol); |
| 7 | 4274 else |
| 36 | 4275 ++shl->endcol; |
| 7 | 4276 } |
| 4277 | |
| 4278 /* Loop to check if the match starts at the | |
| 4279 * current position */ | |
| 4280 continue; | |
| 4281 } | |
| 4282 } | |
| 4283 break; | |
| 4284 } | |
| 1326 | 4285 if (shl != &search_hl && cur != NULL) |
| 4286 cur = cur->next; | |
| 4287 } | |
| 4288 | |
| 4289 /* Use attributes from match with highest priority among | |
| 4290 * 'search_hl' and the match list. */ | |
| 4291 search_attr = search_hl.attr_cur; | |
| 4292 cur = wp->w_match_head; | |
| 4293 shl_flag = FALSE; | |
| 4294 while (cur != NULL || shl_flag == FALSE) | |
| 4295 { | |
| 4296 if (shl_flag == FALSE | |
| 4297 && ((cur != NULL | |
| 4298 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4299 || cur == NULL)) | |
| 699 | 4300 { |
| 1326 | 4301 shl = &search_hl; |
| 4302 shl_flag = TRUE; | |
| 699 | 4303 } |
| 1326 | 4304 else |
| 4305 shl = &cur->hl; | |
| 4306 if (shl->attr_cur != 0) | |
| 4307 search_attr = shl->attr_cur; | |
| 4308 if (shl != &search_hl && cur != NULL) | |
| 4309 cur = cur->next; | |
| 4310 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4311 /* 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
|
4312 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
|
4313 || (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
|
4314 search_attr = 0; |
| 7 | 4315 } |
| 4316 #endif | |
| 4317 | |
| 4318 #ifdef FEAT_DIFF | |
| 674 | 4319 if (diff_hlf != (hlf_T)0) |
| 7 | 4320 { |
| 1295 | 4321 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4322 && n_extra == 0) | |
| 7 | 4323 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4324 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4325 && n_extra == 0) | |
| 7 | 4326 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
|
4327 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4328 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
|
4329 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4330 } |
| 4331 #endif | |
| 4332 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4333 #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
|
4334 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
|
4335 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4336 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4337 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
|
4338 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4339 // 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
|
4340 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
|
4341 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4342 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
|
4343 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4344 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
|
4345 + 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
|
4346 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4347 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
|
4348 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
|
4349 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
|
4350 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4351 * (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
|
4352 --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
|
4353 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4354 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4355 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4356 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4357 // 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
|
4358 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
|
4359 && 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
|
4360 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
|
4361 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4362 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
|
4363 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
|
4364 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
|
4365 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4366 // 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
|
4367 // 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
|
4368 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
|
4369 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
|
4370 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
|
4371 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
|
4372 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4373 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
|
4374 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4375 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
|
4376 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
|
4377 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
|
4378 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4379 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
|
4380 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4381 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
|
4382 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4383 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
|
4384 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4385 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
|
4386 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
|
4387 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4388 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4389 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4390 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4391 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4392 |
| 674 | 4393 /* Decide which of the highlight attributes to use. */ |
| 4394 attr_pri = TRUE; | |
| 6717 | 4395 #ifdef LINE_ATTR |
| 674 | 4396 if (area_attr != 0) |
| 6717 | 4397 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4398 else if (search_attr != 0) |
| 6717 | 4399 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
|
4400 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4401 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
|
4402 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4403 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
|
4404 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
|
4405 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4406 # endif |
| 674 | 4407 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4408 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4409 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4410 // 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
|
4411 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4412 char_attr = line_attr; |
| 6717 | 4413 #else |
| 4414 if (area_attr != 0) | |
| 4415 char_attr = area_attr; | |
| 4416 else if (search_attr != 0) | |
| 4417 char_attr = search_attr; | |
| 674 | 4418 #endif |
| 4419 else | |
| 4420 { | |
| 4421 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4422 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4423 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
|
4424 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4425 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
|
4426 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
|
4427 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
|
4428 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4429 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
|
4430 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
|
4431 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4432 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4433 #endif |
| 674 | 4434 #ifdef FEAT_SYN_HL |
| 4435 if (has_syntax) | |
| 4436 char_attr = syntax_attr; | |
| 4437 else | |
| 4438 #endif | |
| 4439 char_attr = 0; | |
| 4440 } | |
| 7 | 4441 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4442 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4443 char_attr = win_attr; |
| 7 | 4444 |
| 4445 /* | |
| 4446 * Get the next character to put on the screen. | |
| 4447 */ | |
| 4448 /* | |
| 1340 | 4449 * The "p_extra" points to the extra stuff that is inserted to |
| 4450 * represent special characters (non-printable stuff) and other | |
| 4451 * 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
|
4452 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4453 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4454 * "p_extra[n_extra]". | |
| 7 | 4455 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4456 */ | |
| 4457 if (n_extra > 0) | |
| 4458 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4459 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
|
4460 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4461 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4462 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
|
4463 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4464 { |
| 4465 mb_utf8 = TRUE; | |
| 714 | 4466 u8cc[0] = 0; |
| 819 | 4467 c = 0xc0; |
| 7 | 4468 } |
| 4469 else | |
| 4470 mb_utf8 = FALSE; | |
| 4471 } | |
| 4472 else | |
| 4473 { | |
| 4474 c = *p_extra; | |
| 4475 if (has_mbyte) | |
| 4476 { | |
| 4477 mb_c = c; | |
| 4478 if (enc_utf8) | |
| 4479 { | |
| 4480 /* If the UTF-8 character is more than one byte: | |
| 4481 * 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
|
4482 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4483 mb_utf8 = FALSE; |
| 4484 if (mb_l > n_extra) | |
| 4485 mb_l = 1; | |
| 4486 else if (mb_l > 1) | |
| 4487 { | |
| 714 | 4488 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4489 mb_utf8 = TRUE; |
| 819 | 4490 c = 0xc0; |
| 7 | 4491 } |
| 4492 } | |
| 4493 else | |
| 4494 { | |
| 4495 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4496 mb_l = MB_BYTE2LEN(c); | |
| 4497 if (mb_l >= n_extra) | |
| 4498 mb_l = 1; | |
| 4499 else if (mb_l > 1) | |
| 4500 mb_c = (c << 8) + p_extra[1]; | |
| 4501 } | |
| 504 | 4502 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4503 mb_l = 1; | |
| 4504 | |
| 7 | 4505 /* If a double-width char doesn't fit display a '>' in the |
| 4506 * last column. */ | |
| 504 | 4507 if (( |
| 7 | 4508 # ifdef FEAT_RIGHTLEFT |
| 4509 wp->w_p_rl ? (col <= 0) : | |
| 4510 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4511 (col >= wp->w_width - 1)) |
| 7 | 4512 && (*mb_char2cells)(mb_c) == 2) |
| 4513 { | |
| 4514 c = '>'; | |
| 4515 mb_c = c; | |
| 4516 mb_l = 1; | |
| 4517 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
|
4518 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4519 /* put the pointer back to output the double-width |
| 4520 * character at the start of the next line. */ | |
| 4521 ++n_extra; | |
| 4522 --p_extra; | |
| 4523 } | |
| 4524 else | |
| 4525 { | |
| 4526 n_extra -= mb_l - 1; | |
| 4527 p_extra += mb_l - 1; | |
| 4528 } | |
| 4529 } | |
| 4530 ++p_extra; | |
| 4531 } | |
| 4532 --n_extra; | |
| 4533 } | |
| 4534 else | |
| 4535 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4536 #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
|
4537 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4538 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4539 |
| 6026 | 4540 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
|
4541 VIM_CLEAR(p_extra_free); |
| 7 | 4542 /* |
| 4543 * Get a character from the line itself. | |
| 4544 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4545 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4546 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4547 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4548 #endif |
| 7 | 4549 if (has_mbyte) |
| 4550 { | |
| 4551 mb_c = c; | |
| 4552 if (enc_utf8) | |
| 4553 { | |
| 4554 /* If the UTF-8 character is more than one byte: Decode it | |
| 4555 * 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
|
4556 mb_l = utfc_ptr2len(ptr); |
| 7 | 4557 mb_utf8 = FALSE; |
| 4558 if (mb_l > 1) | |
| 4559 { | |
| 714 | 4560 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4561 /* Overlong encoded ASCII or ASCII with composing char |
| 4562 * is displayed normally, except a NUL. */ | |
| 4563 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
|
4564 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4565 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4566 #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
|
4567 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4568 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4569 } |
| 7 | 4570 mb_utf8 = TRUE; |
| 507 | 4571 |
| 4572 /* At start of the line we can have a composing char. | |
| 4573 * Draw it as a space with a composing char. */ | |
| 4574 if (utf_iscomposing(mb_c)) | |
| 4575 { | |
| 1326 | 4576 int i; |
| 4577 | |
| 714 | 4578 for (i = Screen_mco - 1; i > 0; --i) |
| 4579 u8cc[i] = u8cc[i - 1]; | |
| 4580 u8cc[0] = mb_c; | |
| 507 | 4581 mb_c = ' '; |
| 4582 } | |
| 7 | 4583 } |
| 4584 | |
| 4585 if ((mb_l == 1 && c >= 0x80) | |
| 4586 || (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
|
4587 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4588 { |
| 4589 /* | |
| 4590 * Illegal UTF-8 byte: display as <xx>. | |
| 4591 * Non-BMP character : display as ? or fullwidth ?. | |
| 4592 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4593 transchar_hex(extra, mb_c); |
| 714 | 4594 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4595 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
|
4596 rl_mirror(extra); |
| 714 | 4597 # endif |
| 7 | 4598 p_extra = extra; |
| 4599 c = *p_extra; | |
| 4600 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4601 mb_utf8 = (c >= 0x80); | |
| 4602 n_extra = (int)STRLEN(p_extra); | |
| 4603 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
|
4604 c_final = NUL; |
| 7 | 4605 if (area_attr == 0 && search_attr == 0) |
| 4606 { | |
| 4607 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
|
4608 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4609 saved_attr2 = char_attr; /* save current attr */ |
| 4610 } | |
| 4611 } | |
| 4612 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4613 mb_l = 1; | |
| 4614 #ifdef FEAT_ARABIC | |
| 4615 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4616 { | |
| 4617 /* Do Arabic shaping. */ | |
| 714 | 4618 int pc, pc1, nc; |
| 4619 int pcc[MAX_MCO]; | |
| 7 | 4620 |
| 4621 /* The idea of what is the previous and next | |
| 4622 * character depends on 'rightleft'. */ | |
| 4623 if (wp->w_p_rl) | |
| 4624 { | |
| 4625 pc = prev_c; | |
| 4626 pc1 = prev_c1; | |
| 4627 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4628 prev_c1 = u8cc[0]; |
| 7 | 4629 } |
| 4630 else | |
| 4631 { | |
| 714 | 4632 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4633 nc = prev_c; |
| 714 | 4634 pc1 = pcc[0]; |
| 7 | 4635 } |
| 4636 prev_c = mb_c; | |
| 4637 | |
| 714 | 4638 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4639 } |
| 4640 else | |
| 4641 prev_c = mb_c; | |
| 4642 #endif | |
| 4643 } | |
| 4644 else /* enc_dbcs */ | |
| 4645 { | |
| 4646 mb_l = MB_BYTE2LEN(c); | |
| 4647 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4648 mb_l = 1; | |
| 4649 else if (mb_l > 1) | |
| 4650 { | |
| 4651 /* We assume a second byte below 32 is illegal. | |
| 4652 * Hopefully this is OK for all double-byte encodings! | |
| 4653 */ | |
| 4654 if (ptr[1] >= 32) | |
| 4655 mb_c = (c << 8) + ptr[1]; | |
| 4656 else | |
| 4657 { | |
| 4658 if (ptr[1] == NUL) | |
| 4659 { | |
| 4660 /* head byte at end of line */ | |
| 4661 mb_l = 1; | |
| 4662 transchar_nonprint(extra, c); | |
| 4663 } | |
| 4664 else | |
| 4665 { | |
| 4666 /* illegal tail byte */ | |
| 4667 mb_l = 2; | |
| 4668 STRCPY(extra, "XX"); | |
| 4669 } | |
| 4670 p_extra = extra; | |
| 4671 n_extra = (int)STRLEN(extra) - 1; | |
| 4672 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
|
4673 c_final = NUL; |
| 7 | 4674 c = *p_extra++; |
| 4675 if (area_attr == 0 && search_attr == 0) | |
| 4676 { | |
| 4677 n_attr = n_extra + 1; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4678 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4679 saved_attr2 = char_attr; /* save current attr */ |
| 4680 } | |
| 4681 mb_c = c; | |
| 4682 } | |
| 4683 } | |
| 4684 } | |
| 4685 /* If a double-width char doesn't fit display a '>' in the | |
| 4686 * last column; the character is displayed at the start of the | |
| 4687 * next line. */ | |
| 4688 if (( | |
| 4689 # ifdef FEAT_RIGHTLEFT | |
| 4690 wp->w_p_rl ? (col <= 0) : | |
| 4691 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4692 (col >= wp->w_width - 1)) |
| 7 | 4693 && (*mb_char2cells)(mb_c) == 2) |
| 4694 { | |
| 4695 c = '>'; | |
| 4696 mb_c = c; | |
| 4697 mb_utf8 = FALSE; | |
| 4698 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
|
4699 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
|
4700 // 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
|
4701 // displayed at the start of the next line. |
| 7 | 4702 --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
|
4703 #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
|
4704 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
|
4705 #endif |
| 7 | 4706 } |
| 4707 else if (*ptr != NUL) | |
| 4708 ptr += mb_l - 1; | |
| 4709 | |
| 4710 /* 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
|
4711 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4712 * 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
|
4713 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4714 { |
| 4715 n_extra = 1; | |
| 3586 | 4716 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
|
4717 c_final = NUL; |
| 7 | 4718 c = ' '; |
| 4719 if (area_attr == 0 && search_attr == 0) | |
| 4720 { | |
| 4721 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
|
4722 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4723 saved_attr2 = char_attr; /* save current attr */ |
| 4724 } | |
| 4725 mb_c = c; | |
| 4726 mb_utf8 = FALSE; | |
| 4727 mb_l = 1; | |
| 4728 } | |
| 4729 | |
| 4730 } | |
| 4731 ++ptr; | |
| 4732 | |
| 4733 if (extra_check) | |
| 4734 { | |
| 743 | 4735 #ifdef FEAT_SPELL |
| 221 | 4736 int can_spell = TRUE; |
| 743 | 4737 #endif |
| 4738 | |
|
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
|
4739 #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
|
4740 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
|
4741 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4742 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
|
4743 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4744 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
|
4745 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
|
4746 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
|
4747 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
|
4748 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4749 #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
|
4750 |
| 743 | 4751 #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
|
4752 // 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
|
4753 // (double-wide char that doesn't fit). |
| 221 | 4754 v = (long)(ptr - line); |
| 4755 if (has_syntax && v > 0) | |
| 7 | 4756 { |
| 4757 /* Get the syntax attribute for the character. If there | |
| 4758 * is an error, disable syntax highlighting. */ | |
| 4759 save_did_emsg = did_emsg; | |
| 4760 did_emsg = FALSE; | |
| 4761 | |
| 221 | 4762 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4763 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4764 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4765 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4766 NULL, FALSE); |
| 7 | 4767 |
| 4768 if (did_emsg) | |
| 482 | 4769 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4770 wp->w_s->b_syn_error = TRUE; |
| 482 | 4771 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4772 syntax_attr = 0; |
| 482 | 4773 } |
| 7 | 4774 else |
| 4775 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4776 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4777 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4778 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4779 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
|
4780 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4781 #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
|
4782 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
|
4783 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4784 #endif |
| 7 | 4785 |
| 4786 /* Need to get the line again, a multi-line regexp may | |
| 4787 * have made it invalid. */ | |
| 4788 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4789 ptr = line + v; | |
| 4790 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4791 # 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
|
4792 // 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
|
4793 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
|
4794 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4795 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4796 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
|
4797 # 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
|
4798 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
|
4799 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4800 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
|
4801 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
|
4802 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4803 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
|
4804 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4805 # 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
|
4806 /* 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
|
4807 * 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
|
4808 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
|
4809 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
|
4810 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
|
4811 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
|
4812 # endif |
| 7 | 4813 } |
| 743 | 4814 #endif |
| 4815 | |
| 4816 #ifdef FEAT_SPELL | |
| 301 | 4817 /* Check spelling (unless at the end of the line). |
| 319 | 4818 * Only do this when there is no syntax highlighting, the |
| 4819 * @Spell cluster is not used or the current syntax item | |
| 4820 * contains the @Spell cluster. */ | |
| 348 | 4821 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4822 { |
| 230 | 4823 spell_attr = 0; |
| 743 | 4824 if (c != 0 && ( |
| 4825 # ifdef FEAT_SYN_HL | |
| 4826 !has_syntax || | |
| 4827 # endif | |
| 4828 can_spell)) | |
| 221 | 4829 { |
| 348 | 4830 char_u *prev_ptr, *p; |
| 4831 int len; | |
| 534 | 4832 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4833 if (has_mbyte) |
| 4834 { | |
| 4835 prev_ptr = ptr - mb_l; | |
| 4836 v -= mb_l - 1; | |
| 4837 } | |
| 4838 else | |
| 4839 prev_ptr = ptr - 1; | |
| 348 | 4840 |
| 4841 /* Use nextline[] if possible, it has the start of the | |
| 4842 * next line concatenated. */ | |
| 4843 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 4844 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 4845 else | |
| 4846 p = prev_ptr; | |
| 835 | 4847 cap_col -= (int)(prev_ptr - line); |
| 625 | 4848 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 4849 nochange); | |
| 348 | 4850 word_end = v + len; |
| 301 | 4851 |
| 4852 /* In Insert mode only highlight a word that | |
| 4853 * doesn't touch the cursor. */ | |
| 534 | 4854 if (spell_hlf != HLF_COUNT |
| 301 | 4855 && (State & INSERT) != 0 |
| 4856 && wp->w_cursor.lnum == lnum | |
| 4857 && wp->w_cursor.col >= | |
| 4858 (colnr_T)(prev_ptr - line) | |
| 4859 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 4860 { |
| 534 | 4861 spell_hlf = HLF_COUNT; |
| 301 | 4862 spell_redraw_lnum = lnum; |
| 221 | 4863 } |
| 348 | 4864 |
| 534 | 4865 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 4866 && (p - nextline) + len > nextline_idx) |
| 4867 { | |
| 4868 /* Remember that the good word continues at the | |
| 4869 * start of the next line. */ | |
| 4870 checked_lnum = lnum + 1; | |
| 835 | 4871 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 4872 } |
| 386 | 4873 |
| 534 | 4874 /* Turn index into actual attributes. */ |
| 4875 if (spell_hlf != HLF_COUNT) | |
| 4876 spell_attr = highlight_attr[spell_hlf]; | |
| 4877 | |
| 386 | 4878 if (cap_col > 0) |
| 4879 { | |
| 4880 if (p != prev_ptr | |
| 4881 && (p - nextline) + cap_col >= nextline_idx) | |
| 4882 { | |
| 4883 /* Remember that the word in the next line | |
| 4884 * must start with a capital. */ | |
| 4885 capcol_lnum = lnum + 1; | |
| 835 | 4886 cap_col = (int)((p - nextline) + cap_col |
| 4887 - nextline_idx); | |
| 386 | 4888 } |
| 4889 else | |
| 4890 /* Compute the actual column. */ | |
| 835 | 4891 cap_col += (int)(prev_ptr - line); |
| 386 | 4892 } |
| 221 | 4893 } |
| 4894 } | |
| 4895 if (spell_attr != 0) | |
| 348 | 4896 { |
| 674 | 4897 if (!attr_pri) |
| 348 | 4898 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 4899 else | |
| 4900 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 4901 } | |
| 7 | 4902 #endif |
| 4903 #ifdef FEAT_LINEBREAK | |
| 4904 /* | |
| 221 | 4905 * Found last space before word: check for line break. |
| 7 | 4906 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4907 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
|
4908 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 4909 { |
| 6693 | 4910 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
|
4911 char_u *p = ptr - (mb_off + 1); |
| 6681 | 4912 |
| 5995 | 4913 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 4914 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 4915 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4916 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
|
4917 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
4918 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
|
4919 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
|
4920 # else |
| 6371 | 4921 n_extra = (int)wp->w_buffer->b_p_ts |
| 4922 - 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
|
4923 # endif |
| 6371 | 4924 |
| 6693 | 4925 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
|
4926 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
4927 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4928 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4929 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4930 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4931 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4932 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4933 #endif |
| 6026 | 4934 if (!wp->w_p_list) |
| 4935 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
4936 } |
| 7 | 4937 } |
| 4938 #endif | |
| 4939 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4940 // '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
|
4941 // 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
|
4942 // 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
|
4943 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
|
4944 && ((((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
|
4945 || (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
|
4946 && ((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
|
4947 || (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
|
4948 && 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
|
4949 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4950 && 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
|
4951 && 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
|
4952 && 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
|
4953 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4954 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
|
4955 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
|
4956 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4957 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
|
4958 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
|
4959 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
|
4960 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4961 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
|
4962 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
|
4963 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4964 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
|
4965 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
|
4966 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4967 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4968 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
4969 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4970 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
4971 |
| 7 | 4972 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 4973 { | |
| 4974 c = lcs_trail; | |
| 674 | 4975 if (!attr_pri) |
| 7 | 4976 { |
| 4977 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
|
4978 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4979 saved_attr2 = char_attr; /* save current attr */ |
| 4980 } | |
| 4981 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
|
4982 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4983 { |
| 4984 mb_utf8 = TRUE; | |
| 714 | 4985 u8cc[0] = 0; |
| 819 | 4986 c = 0xc0; |
| 7 | 4987 } |
| 4988 else | |
| 4989 mb_utf8 = FALSE; | |
| 4990 } | |
| 4991 } | |
| 4992 | |
| 4993 /* | |
| 4994 * Handling of non-printable characters. | |
| 4995 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
4996 if (!vim_isprintc(c)) |
| 7 | 4997 { |
| 4998 /* | |
| 4999 * when getting a character from the file, we may have to | |
| 5000 * turn it into something else on the way to putting it | |
| 5001 * into "ScreenLines". | |
| 5002 */ | |
| 5003 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5004 { | |
| 6026 | 5005 int tab_len = 0; |
| 6503 | 5006 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5007 #ifdef FEAT_LINEBREAK | |
| 5008 /* only adjust the tab_len, when at the first column | |
| 5009 * after the showbreak value was drawn */ | |
| 5010 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5011 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5012 #endif | |
| 7 | 5013 /* 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
|
5014 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5015 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
|
5016 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
|
5017 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
|
5018 #else |
| 6026 | 5019 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
|
5020 - 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
|
5021 #endif |
| 6503 | 5022 |
| 6026 | 5023 #ifdef FEAT_LINEBREAK |
| 6100 | 5024 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5025 #endif |
| 5026 /* tab amount depends on current column */ | |
| 5027 n_extra = tab_len; | |
| 5028 #ifdef FEAT_LINEBREAK | |
| 5029 else | |
| 5030 { | |
| 5031 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5032 int len; |
| 6026 | 5033 int i; |
| 5034 int saved_nextra = n_extra; | |
| 5035 | |
| 6172 | 5036 #ifdef FEAT_CONCEAL |
| 6627 | 5037 if (vcol_off > 0) |
| 6172 | 5038 /* there are characters to conceal */ |
| 5039 tab_len += vcol_off; | |
| 6520 | 5040 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5041 */ | |
| 5042 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5043 && n_extra > tab_len) | |
| 5044 tab_len += n_extra - tab_len; | |
| 5045 #endif | |
| 5046 | |
| 6026 | 5047 /* if n_extra > 0, it gives the number of chars, to |
| 5048 * use for a tab, else we need to calculate the width | |
| 5049 * for a tab */ | |
| 5050 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5051 if (n_extra > 0) | |
| 5052 len += n_extra - tab_len; | |
| 5053 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
|
5054 p = alloc(len + 1); |
| 6026 | 5055 vim_memset(p, ' ', len); |
| 5056 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5057 vim_free(p_extra_free); |
| 6026 | 5058 p_extra_free = p; |
| 5059 for (i = 0; i < tab_len; i++) | |
| 5060 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5061 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5062 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5063 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5064 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5065 } |
| 6026 | 5066 mb_char2bytes(lcs_tab2, p); |
| 5067 p += mb_char2len(lcs_tab2); | |
| 5068 n_extra += mb_char2len(lcs_tab2) | |
| 5069 - (saved_nextra > 0 ? 1 : 0); | |
| 5070 } | |
| 5071 p_extra = p_extra_free; | |
| 6172 | 5072 #ifdef FEAT_CONCEAL |
| 5073 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5074 * macro below, so need to adjust for that here */ | |
| 6627 | 5075 if (vcol_off > 0) |
| 6172 | 5076 n_extra -= vcol_off; |
| 5077 #endif | |
| 6026 | 5078 } |
| 5079 #endif | |
| 3984 | 5080 #ifdef FEAT_CONCEAL |
| 6627 | 5081 { |
| 5082 int vc_saved = vcol_off; | |
| 5083 | |
| 5084 /* Tab alignment should be identical regardless of | |
| 5085 * 'conceallevel' value. So tab compensates of all | |
| 5086 * previous concealed characters, and thus resets | |
| 5087 * vcol_off and boguscols accumulated so far in the | |
| 5088 * line. Note that the tab can be longer than | |
| 5089 * 'tabstop' when there are concealed characters. */ | |
| 5090 FIX_FOR_BOGUSCOLS; | |
| 5091 | |
| 5092 /* Make sure, the highlighting for the tab char will be | |
| 5093 * correctly set further below (effectively reverts the | |
| 5094 * FIX_FOR_BOGSUCOLS macro */ | |
| 5095 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5096 && lcs_tab1) |
| 6627 | 5097 tab_len += vc_saved; |
| 5098 } | |
| 3984 | 5099 #endif |
| 7 | 5100 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5101 if (wp->w_p_list) | |
| 5102 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5103 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5104 #ifdef FEAT_LINEBREAK |
| 5105 if (wp->w_p_lbr) | |
| 5106 c_extra = NUL; /* using p_extra from above */ | |
| 5107 else | |
| 5108 #endif | |
| 5109 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
|
5110 c_final = lcs_tab3; |
| 6026 | 5111 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
|
5112 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5113 saved_attr2 = char_attr; /* save current attr */ |
| 5114 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
|
5115 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5116 { |
| 5117 mb_utf8 = TRUE; | |
| 714 | 5118 u8cc[0] = 0; |
| 819 | 5119 c = 0xc0; |
| 7 | 5120 } |
| 5121 } | |
| 5122 else | |
| 5123 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5124 c_final = NUL; |
| 7 | 5125 c_extra = ' '; |
| 5126 c = ' '; | |
| 5127 } | |
| 5128 } | |
| 36 | 5129 else if (c == NUL |
| 6799 | 5130 && (wp->w_p_list |
| 36 | 5131 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5132 && tocol > vcol | |
| 5133 && VIsual_mode != Ctrl_V | |
| 5134 && ( | |
| 5135 # ifdef FEAT_RIGHTLEFT | |
| 5136 wp->w_p_rl ? (col >= 0) : | |
| 5137 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5138 (col < wp->w_width)) |
| 36 | 5139 && !(noinvcur |
| 1850 | 5140 && lnum == wp->w_cursor.lnum |
| 36 | 5141 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5142 && lcs_eol_one > 0) |
| 7 | 5143 { |
| 36 | 5144 /* Display a '$' after the line or highlight an extra |
| 5145 * character if the line break is included. */ | |
| 7 | 5146 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5147 /* For a diff line the highlighting continues after the | |
| 5148 * "$". */ | |
| 5149 if ( | |
| 5150 # ifdef FEAT_DIFF | |
| 534 | 5151 diff_hlf == (hlf_T)0 |
| 7 | 5152 # ifdef LINE_ATTR |
| 5153 && | |
| 5154 # endif | |
| 5155 # endif | |
| 5156 # ifdef LINE_ATTR | |
| 5157 line_attr == 0 | |
| 5158 # endif | |
| 5159 ) | |
| 5160 #endif | |
| 5161 { | |
| 5162 /* In virtualedit, visual selections may extend | |
| 5163 * beyond end of line. */ | |
| 5164 if (area_highlighting && virtual_active() | |
| 5165 && tocol != MAXCOL && vcol < tocol) | |
| 5166 n_extra = 0; | |
| 5167 else | |
| 5168 { | |
| 5169 p_extra = at_end_str; | |
| 5170 n_extra = 1; | |
| 5171 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
|
5172 c_final = NUL; |
| 7 | 5173 } |
| 5174 } | |
| 6799 | 5175 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5176 c = lcs_eol; |
| 5177 else | |
| 5178 c = ' '; | |
| 7 | 5179 lcs_eol_one = -1; |
| 5180 --ptr; /* put it back at the NUL */ | |
| 674 | 5181 if (!attr_pri) |
| 7 | 5182 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5183 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5184 n_attr = 1; |
| 5185 } | |
| 5186 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
|
5187 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5188 { |
| 5189 mb_utf8 = TRUE; | |
| 714 | 5190 u8cc[0] = 0; |
| 819 | 5191 c = 0xc0; |
| 7 | 5192 } |
| 5193 else | |
| 5194 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5195 } | |
| 5196 else if (c != NUL) | |
| 5197 { | |
| 5198 p_extra = transchar(c); | |
| 6064 | 5199 if (n_extra == 0) |
| 5200 n_extra = byte2cells(c) - 1; | |
| 7 | 5201 #ifdef FEAT_RIGHTLEFT |
| 5202 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5203 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5204 #endif | |
| 5205 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
|
5206 c_final = NUL; |
| 6026 | 5207 #ifdef FEAT_LINEBREAK |
| 5208 if (wp->w_p_lbr) | |
| 5209 { | |
| 5210 char_u *p; | |
| 5211 | |
| 5212 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
|
5213 p = alloc(n_extra + 1); |
| 6026 | 5214 vim_memset(p, ' ', n_extra); |
| 5215 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5216 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5217 vim_free(p_extra_free); |
| 6026 | 5218 p_extra_free = p_extra = p; |
| 5219 } | |
| 5220 else | |
| 5221 #endif | |
| 5222 { | |
| 5223 n_extra = byte2cells(c) - 1; | |
| 5224 c = *p_extra++; | |
| 5225 } | |
| 674 | 5226 if (!attr_pri) |
| 7 | 5227 { |
| 5228 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
|
5229 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5230 saved_attr2 = char_attr; /* save current attr */ |
| 5231 } | |
| 5232 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5233 } | |
| 5234 else if (VIsual_active | |
| 5235 && (VIsual_mode == Ctrl_V | |
| 5236 || VIsual_mode == 'v') | |
| 5237 && virtual_active() | |
| 5238 && tocol != MAXCOL | |
| 5239 && vcol < tocol | |
| 5240 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5241 #ifdef FEAT_RIGHTLEFT |
| 7 | 5242 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5243 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5244 (col < wp->w_width))) |
| 7 | 5245 { |
| 5246 c = ' '; | |
| 5247 --ptr; /* put it back at the NUL */ | |
| 5248 } | |
| 910 | 5249 #if defined(LINE_ATTR) |
| 7 | 5250 else if (( |
| 5251 # ifdef FEAT_DIFF | |
| 910 | 5252 diff_hlf != (hlf_T)0 || |
| 7 | 5253 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5254 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5255 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
|
5256 # endif |
| 7 | 5257 line_attr != 0 |
| 5258 ) && ( | |
| 5259 # ifdef FEAT_RIGHTLEFT | |
| 5260 wp->w_p_rl ? (col >= 0) : | |
| 5261 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5262 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5263 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5264 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5265 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5266 < wp->w_width))) |
| 7 | 5267 { |
| 5268 /* Highlight until the right side of the window */ | |
| 5269 c = ' '; | |
| 5270 --ptr; /* put it back at the NUL */ | |
| 867 | 5271 |
| 5272 /* Remember we do the char for line highlighting. */ | |
| 5273 ++did_line_attr; | |
| 5274 | |
| 5275 /* 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
|
5276 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
|
5277 && (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
|
5278 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5279 char_attr = line_attr; |
| 7 | 5280 # ifdef FEAT_DIFF |
| 5281 if (diff_hlf == HLF_TXD) | |
| 5282 { | |
| 5283 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5284 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5285 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5286 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5287 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5288 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
|
5289 HL_ATTR(HLF_CUL)); |
| 6106 | 5290 } |
| 7 | 5291 } |
| 5292 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5293 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5294 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
|
5295 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5296 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
|
5297 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
|
5298 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
|
5299 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
|
5300 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5301 # endif |
| 7 | 5302 } |
| 5303 #endif | |
| 5304 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5305 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5306 #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
|
5307 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
|
5308 && (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
|
5309 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
|
5310 && ((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
|
5311 && !(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
|
5312 && 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
|
5313 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5314 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5315 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5316 && (syn_get_sub_char() != NUL || match_conc |
| 5317 || 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
|
5318 && 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
|
5319 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5320 /* 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
|
5321 * character. */ |
| 6947 | 5322 if (match_conc) |
| 5323 c = match_conc; | |
| 5324 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
|
5325 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5326 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5327 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5328 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5329 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5330 |
|
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
|
5331 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5332 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5333 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5334 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5335 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5336 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
|
5337 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5338 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5339 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5340 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5341 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5342 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5343 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5344 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5345 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5346 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5347 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5348 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5349 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5350 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5351 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5352 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5353 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5354 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5355 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5356 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5357 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5358 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5359 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
|
5360 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
|
5361 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5362 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5363 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5364 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5365 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5366 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5367 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
|
5368 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5369 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5370 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5371 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
|
5372 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5373 } |
|
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
|
5374 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5375 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
|
5376 // 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
|
5377 ++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
|
5378 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5379 #endif // FEAT_CONCEAL |
| 7 | 5380 } |
| 5381 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5382 #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
|
5383 /* 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
|
5384 * 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
|
5385 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
|
5386 && 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
|
5387 && 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
|
5388 && (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
|
5389 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5390 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5391 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
|
5392 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
|
5393 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5394 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5395 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
|
5396 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
|
5397 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
|
5398 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5399 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5400 |
| 7 | 5401 /* Don't override visual selection highlighting. */ |
| 5402 if (n_attr > 0 | |
| 5403 && draw_state == WL_LINE | |
| 674 | 5404 && !attr_pri) |
| 7 | 5405 char_attr = extra_attr; |
| 5406 | |
| 42 | 5407 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5408 /* XIM don't send preedit_start and preedit_end, but they send |
| 5409 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5410 * 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
|
5411 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
|
5412 && xic != NULL |
| 1850 | 5413 && lnum == wp->w_cursor.lnum |
| 7 | 5414 && (State & INSERT) |
| 5415 && !p_imdisable | |
| 5416 && im_is_preediting() | |
| 5417 && draw_state == WL_LINE) | |
| 5418 { | |
| 5419 colnr_T tcol; | |
| 5420 | |
| 5421 if (preedit_end_col == MAXCOL) | |
| 1850 | 5422 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5423 else |
| 5424 tcol = preedit_end_col; | |
| 5425 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5426 { | |
| 5427 if (feedback_old_attr < 0) | |
| 5428 { | |
| 5429 feedback_col = 0; | |
| 5430 feedback_old_attr = char_attr; | |
| 5431 } | |
| 5432 char_attr = im_get_feedback_attr(feedback_col); | |
| 5433 if (char_attr < 0) | |
| 5434 char_attr = feedback_old_attr; | |
| 5435 feedback_col++; | |
| 5436 } | |
| 5437 else if (feedback_old_attr >= 0) | |
| 5438 { | |
| 5439 char_attr = feedback_old_attr; | |
| 5440 feedback_old_attr = -1; | |
| 5441 feedback_col = 0; | |
| 5442 } | |
| 5443 } | |
| 5444 #endif | |
| 5445 /* | |
| 5446 * Handle the case where we are in column 0 but not on the first | |
| 5447 * character of the line and the user wants us to show us a | |
| 5448 * special character (via 'listchars' option "precedes:<char>". | |
| 5449 */ | |
| 5450 if (lcs_prec_todo != NUL | |
| 6276 | 5451 && wp->w_p_list |
| 7 | 5452 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5453 #ifdef FEAT_DIFF | |
| 5454 && filler_todo <= 0 | |
| 5455 #endif | |
| 5456 && draw_state > WL_NR | |
| 5457 && c != NUL) | |
| 5458 { | |
| 5459 c = lcs_prec; | |
| 5460 lcs_prec_todo = NUL; | |
| 3586 | 5461 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5462 { | |
| 5463 /* Double-width character being overwritten by the "precedes" | |
| 5464 * character, need to fill up half the character. */ | |
| 5465 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
|
5466 c_final = NUL; |
| 3586 | 5467 n_extra = 1; |
| 5468 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
|
5469 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5470 } |
| 7 | 5471 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
|
5472 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5473 { |
| 5474 mb_utf8 = TRUE; | |
| 714 | 5475 u8cc[0] = 0; |
| 819 | 5476 c = 0xc0; |
| 7 | 5477 } |
| 5478 else | |
| 5479 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5480 if (!attr_pri) |
| 7 | 5481 { |
| 5482 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
|
5483 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5484 n_attr3 = 1; |
| 5485 } | |
| 5486 } | |
| 5487 | |
| 5488 /* | |
| 867 | 5489 * At end of the text line or just after the last character. |
| 7 | 5490 */ |
| 867 | 5491 if (c == NUL |
| 910 | 5492 #if defined(LINE_ATTR) |
| 867 | 5493 || did_line_attr == 1 |
| 5494 #endif | |
| 5495 ) | |
| 5496 { | |
| 5497 #ifdef FEAT_SEARCH_EXTRA | |
| 5498 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5499 |
| 5500 /* we're not really at that column when skipping some text */ | |
| 1439 | 5501 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5502 ++prevcol; |
| 867 | 5503 #endif |
| 5504 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5505 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5506 * highlight match at end of line. If it's beyond the last |
| 5507 * char on the screen, just overwrite that one (tricky!) Not | |
| 5508 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5509 #ifdef FEAT_SEARCH_EXTRA |
| 5510 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5511 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5512 prevcol_hl_flag = TRUE; |
| 5513 else | |
| 5514 { | |
| 5515 cur = wp->w_match_head; | |
| 5516 while (cur != NULL) | |
| 5517 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5518 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5519 { |
| 5520 prevcol_hl_flag = TRUE; | |
| 5521 break; | |
| 5522 } | |
| 5523 cur = cur->next; | |
| 5524 } | |
| 5525 } | |
| 5526 #endif | |
| 7 | 5527 if (lcs_eol == lcs_eol_one |
| 1850 | 5528 && ((area_attr != 0 && vcol == fromcol |
| 5529 && (VIsual_mode != Ctrl_V | |
| 5530 || lnum == VIsual.lnum | |
| 5531 || lnum == curwin->w_cursor.lnum) | |
| 5532 && c == NUL) | |
| 7 | 5533 #ifdef FEAT_SEARCH_EXTRA |
| 5534 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5535 || (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
|
5536 # 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
|
5537 && !(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
|
5538 && !(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
|
5539 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5540 # 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
|
5541 && 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
|
5542 # endif |
| 910 | 5543 # if defined(LINE_ATTR) |
| 867 | 5544 && did_line_attr <= 1 |
| 5545 # endif | |
| 5546 ) | |
| 7 | 5547 #endif |
| 5548 )) | |
| 5549 { | |
| 5550 int n = 0; | |
| 5551 | |
| 5552 #ifdef FEAT_RIGHTLEFT | |
| 5553 if (wp->w_p_rl) | |
| 5554 { | |
| 5555 if (col < 0) | |
| 5556 n = 1; | |
| 5557 } | |
| 5558 else | |
| 5559 #endif | |
| 5560 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5561 if (col >= wp->w_width) |
| 7 | 5562 n = -1; |
| 5563 } | |
| 5564 if (n != 0) | |
| 5565 { | |
| 5566 /* At the window boundary, highlight the last character | |
| 5567 * instead (better than nothing). */ | |
| 5568 off += n; | |
| 5569 col += n; | |
| 5570 } | |
| 5571 else | |
| 5572 { | |
| 5573 /* Add a blank character to highlight. */ | |
| 5574 ScreenLines[off] = ' '; | |
| 5575 if (enc_utf8) | |
| 5576 ScreenLinesUC[off] = 0; | |
| 5577 } | |
| 5578 #ifdef FEAT_SEARCH_EXTRA | |
| 5579 if (area_attr == 0) | |
| 5580 { | |
| 1326 | 5581 /* Use attributes from match with highest priority among |
| 5582 * 'search_hl' and the match list. */ | |
| 5583 char_attr = search_hl.attr; | |
| 5584 cur = wp->w_match_head; | |
| 5585 shl_flag = FALSE; | |
| 5586 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5587 { |
| 1326 | 5588 if (shl_flag == FALSE |
| 5589 && ((cur != NULL | |
| 5590 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5591 || cur == NULL)) | |
| 699 | 5592 { |
| 1326 | 5593 shl = &search_hl; |
| 5594 shl_flag = TRUE; | |
| 699 | 5595 } |
| 1326 | 5596 else |
| 5597 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5598 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
|
5599 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5600 char_attr = shl->attr; |
| 5601 if (shl != &search_hl && cur != NULL) | |
| 5602 cur = cur->next; | |
| 699 | 5603 } |
| 7 | 5604 } |
| 5605 #endif | |
| 5606 ScreenAttrs[off] = char_attr; | |
| 5607 #ifdef FEAT_RIGHTLEFT | |
| 5608 if (wp->w_p_rl) | |
| 1437 | 5609 { |
| 7 | 5610 --col; |
| 1437 | 5611 --off; |
| 5612 } | |
| 7 | 5613 else |
| 5614 #endif | |
| 1437 | 5615 { |
| 7 | 5616 ++col; |
| 1437 | 5617 ++off; |
| 5618 } | |
| 743 | 5619 ++vcol; |
| 1437 | 5620 #ifdef FEAT_SYN_HL |
| 5621 eol_hl_off = 1; | |
| 5622 #endif | |
| 743 | 5623 } |
| 867 | 5624 } |
| 5625 | |
| 5626 /* | |
| 5627 * At end of the text line. | |
| 5628 */ | |
| 5629 if (c == NUL) | |
| 5630 { | |
| 743 | 5631 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5632 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5633 if (wp->w_p_wrap) |
| 5634 v = wp->w_skipcol; | |
| 5635 else | |
| 5636 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5637 |
| 820 | 5638 /* check if line ends before left margin */ |
| 5639 if (vcol < v + col - win_col_off(wp)) | |
| 5640 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
|
5641 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5642 // 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
|
5643 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5644 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5645 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5646 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5647 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5648 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5649 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
|
5650 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5651 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5652 && (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
|
5653 && (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
|
5654 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
|
5655 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5656 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5657 || win_attr != 0) |
| 743 | 5658 # ifdef FEAT_RIGHTLEFT |
| 5659 && !wp->w_p_rl | |
| 5660 # endif | |
| 5661 ) | |
| 5662 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5663 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5664 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5665 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5666 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5667 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5668 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5669 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5670 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
|
5671 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5672 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5673 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5674 while (col < wp->w_width) |
| 743 | 5675 { |
| 5676 ScreenLines[off] = ' '; | |
| 5677 if (enc_utf8) | |
| 5678 ScreenLinesUC[off] = 0; | |
| 5679 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5680 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5681 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
|
5682 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5683 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5684 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
|
5685 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
|
5686 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
|
5687 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5688 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5689 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5690 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5691 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5692 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5693 |
| 743 | 5694 ++vcol; |
| 5695 } | |
| 5696 } | |
| 5697 #endif | |
| 7 | 5698 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5699 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
|
5700 (int)wp->w_width, screen_line_flags); |
| 7 | 5701 row++; |
| 5702 | |
| 5703 /* | |
| 5704 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5705 * updated (saves a call to plines() later). | |
| 5706 */ | |
| 5707 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5708 { | |
| 5709 curwin->w_cline_row = startrow; | |
| 5710 curwin->w_cline_height = row - startrow; | |
| 5711 #ifdef FEAT_FOLDING | |
| 5712 curwin->w_cline_folded = FALSE; | |
| 5713 #endif | |
| 5714 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5715 } | |
| 5716 | |
| 5717 break; | |
| 5718 } | |
| 5719 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5720 // 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
|
5721 // '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
|
5722 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
|
5723 && wp->w_p_list |
| 7 | 5724 && !wp->w_p_wrap |
| 5725 #ifdef FEAT_DIFF | |
| 5726 && filler_todo <= 0 | |
| 5727 #endif | |
| 5728 && ( | |
| 5729 #ifdef FEAT_RIGHTLEFT | |
| 5730 wp->w_p_rl ? col == 0 : | |
| 5731 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5732 col == wp->w_width - 1) |
| 7 | 5733 && (*ptr != NUL |
| 1555 | 5734 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5735 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5736 { | |
| 5737 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
|
5738 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5739 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
|
5740 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5741 { |
| 5742 mb_utf8 = TRUE; | |
| 714 | 5743 u8cc[0] = 0; |
| 819 | 5744 c = 0xc0; |
| 7 | 5745 } |
| 5746 else | |
| 5747 mb_utf8 = FALSE; | |
| 5748 } | |
| 5749 | |
| 743 | 5750 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5751 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5752 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5753 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
|
5754 |
| 743 | 5755 /* 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
|
5756 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5757 * 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
|
5758 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5759 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
|
5760 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
|
5761 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5762 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5763 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
|
5764 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5765 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5766 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
|
5767 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
|
5768 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5769 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
|
5770 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5771 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
|
5772 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
|
5773 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5774 } |
| 743 | 5775 #endif |
| 5776 | |
| 7 | 5777 /* |
| 5778 * Store character to be displayed. | |
| 5779 * Skip characters that are left of the screen for 'nowrap'. | |
| 5780 */ | |
| 5781 vcol_prev = vcol; | |
| 5782 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5783 { | |
| 5784 /* | |
| 5785 * Store the character. | |
| 5786 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5787 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5788 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5789 { | |
| 5790 /* A double-wide character is: put first halve in left cell. */ | |
| 5791 --off; | |
| 5792 --col; | |
| 5793 } | |
| 5794 #endif | |
| 5795 ScreenLines[off] = c; | |
| 5796 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5797 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5798 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5799 ScreenLines[off] = 0x8e; |
| 7 | 5800 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5801 } |
| 7 | 5802 else if (enc_utf8) |
| 5803 { | |
| 5804 if (mb_utf8) | |
| 5805 { | |
| 1326 | 5806 int i; |
| 5807 | |
| 7 | 5808 ScreenLinesUC[off] = mb_c; |
| 819 | 5809 if ((c & 0xff) == 0) |
| 5810 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5811 for (i = 0; i < Screen_mco; ++i) |
| 5812 { | |
| 5813 ScreenLinesC[i][off] = u8cc[i]; | |
| 5814 if (u8cc[i] == 0) | |
| 5815 break; | |
| 5816 } | |
| 7 | 5817 } |
| 5818 else | |
| 5819 ScreenLinesUC[off] = 0; | |
| 5820 } | |
| 5821 if (multi_attr) | |
| 5822 { | |
| 5823 ScreenAttrs[off] = multi_attr; | |
| 5824 multi_attr = 0; | |
| 5825 } | |
| 5826 else | |
| 5827 ScreenAttrs[off] = char_attr; | |
| 5828 | |
| 5829 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5830 { | |
| 5831 /* Need to fill two screen columns. */ | |
| 5832 ++off; | |
| 5833 ++col; | |
| 5834 if (enc_utf8) | |
| 5835 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5836 ScreenLines[off] = 0; | |
| 5837 else | |
| 5838 /* DBCS: Put second byte in the second screen char. */ | |
| 5839 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5840 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5841 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5842 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5843 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5844 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5845 ++vcol; |
| 7 | 5846 /* When "tocol" is halfway a character, set it to the end of |
| 5847 * the character, otherwise highlighting won't stop. */ | |
| 5848 if (tocol == vcol) | |
| 5849 ++tocol; | |
| 5850 #ifdef FEAT_RIGHTLEFT | |
| 5851 if (wp->w_p_rl) | |
| 5852 { | |
| 5853 /* now it's time to backup one cell */ | |
| 5854 --off; | |
| 5855 --col; | |
| 5856 } | |
| 5857 #endif | |
| 5858 } | |
| 5859 #ifdef FEAT_RIGHTLEFT | |
| 5860 if (wp->w_p_rl) | |
| 5861 { | |
| 5862 --off; | |
| 5863 --col; | |
| 5864 } | |
| 5865 else | |
| 5866 #endif | |
| 5867 { | |
| 5868 ++off; | |
| 5869 ++col; | |
| 5870 } | |
| 5871 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5872 #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
|
5873 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
|
5874 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5875 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5876 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5877 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5878 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5879 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5880 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5881 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5882 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5883 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5884 * 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
|
5885 * 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
|
5886 * 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
|
5887 * 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
|
5888 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5889 * 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
|
5890 * 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
|
5891 * 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
|
5892 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5893 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5894 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5895 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5896 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5897 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5898 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5899 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5900 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5901 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5902 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5903 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5904 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5905 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5906 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5907 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5908 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5909 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5910 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5911 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5912 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5913 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5914 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
|
5915 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5916 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5917 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5918 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5919 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5920 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5921 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5922 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5923 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5924 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5925 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5926 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5927 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5928 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5929 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5930 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5931 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5932 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5933 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5934 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5935 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5936 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5937 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5938 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5939 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5940 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5941 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5942 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5943 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5944 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5945 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5946 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5947 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5948 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5949 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5950 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5951 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5952 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5953 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5954 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5955 #endif /* FEAT_CONCEAL */ |
| 7 | 5956 else |
| 5957 --n_skip; | |
| 5958 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
5959 /* 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
|
5960 * column. */ |
| 1849 | 5961 if (draw_state > WL_NR |
| 7 | 5962 #ifdef FEAT_DIFF |
| 5963 && filler_todo <= 0 | |
| 5964 #endif | |
| 5965 ) | |
| 5966 ++vcol; | |
| 5967 | |
| 743 | 5968 #ifdef FEAT_SYN_HL |
| 5969 if (vcol_save_attr >= 0) | |
| 5970 char_attr = vcol_save_attr; | |
| 5971 #endif | |
| 5972 | |
| 7 | 5973 /* restore attributes after "predeces" in 'listchars' */ |
| 5974 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 5975 char_attr = saved_attr3; | |
| 5976 | |
| 5977 /* restore attributes after last 'listchars' or 'number' char */ | |
| 5978 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 5979 char_attr = saved_attr2; | |
| 5980 | |
| 5981 /* | |
| 5982 * At end of screen line and there is more to come: Display the line | |
| 1378 | 5983 * so far. If there is no more to display it is caught above. |
| 7 | 5984 */ |
| 5985 if (( | |
| 5986 #ifdef FEAT_RIGHTLEFT | |
| 5987 wp->w_p_rl ? (col < 0) : | |
| 5988 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5989 (col >= wp->w_width)) |
| 7 | 5990 && (*ptr != NUL |
| 5991 #ifdef FEAT_DIFF | |
| 5992 || filler_todo > 0 | |
| 5993 #endif | |
| 2724 | 5994 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 5995 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 5996 ) | |
| 5997 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5998 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5999 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
|
6000 (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
|
6001 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6002 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6003 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
|
6004 (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
|
6005 #endif |
| 7 | 6006 ++row; |
| 6007 ++screen_row; | |
| 6008 | |
| 6009 /* When not wrapping and finished diff lines, or when displayed | |
| 6010 * '$' and highlighting until last column, break here. */ | |
| 6011 if ((!wp->w_p_wrap | |
| 6012 #ifdef FEAT_DIFF | |
| 6013 && filler_todo <= 0 | |
| 6014 #endif | |
| 6015 ) || lcs_eol_one == -1) | |
| 6016 break; | |
| 6017 | |
| 6018 /* When the window is too narrow draw all "@" lines. */ | |
| 6019 if (draw_state != WL_LINE | |
| 6020 #ifdef FEAT_DIFF | |
| 6021 && filler_todo <= 0 | |
| 6022 #endif | |
| 6023 ) | |
| 6024 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6025 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6026 draw_vsep_win(wp, row); |
| 6027 row = endrow; | |
| 6028 } | |
| 6029 | |
| 6030 /* When line got too long for screen break here. */ | |
| 6031 if (row == endrow) | |
| 6032 { | |
| 6033 ++row; | |
| 6034 break; | |
| 6035 } | |
| 6036 | |
| 6037 if (screen_cur_row == screen_row - 1 | |
| 6038 #ifdef FEAT_DIFF | |
| 6039 && filler_todo <= 0 | |
| 6040 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6041 && wp->w_width == Columns) |
| 7 | 6042 { |
| 6043 /* Remember that the line wraps, used for modeless copy. */ | |
| 6044 LineWraps[screen_row - 1] = TRUE; | |
| 6045 | |
| 6046 /* | |
| 6047 * Special trick to make copy/paste of wrapped lines work with | |
| 6048 * xterm/screen: write an extra character beyond the end of | |
| 6049 * the line. This will work with all terminal types | |
| 6050 * (regardless of the xn,am settings). | |
| 6051 * Only do this on a fast tty. | |
| 6052 * Only do this if the cursor is on the current line | |
| 6053 * (something has been written in it). | |
| 6054 * Don't do this for the GUI. | |
| 6055 * Don't do this for double-width characters. | |
| 6056 * Don't do this for a window not at the right screen border. | |
| 6057 */ | |
| 6058 if (p_tf | |
| 6059 #ifdef FEAT_GUI | |
| 6060 && !gui.in_use | |
| 6061 #endif | |
| 6062 && !(has_mbyte | |
| 1378 | 6063 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6064 LineOffset[screen_row] + screen_Columns) | |
| 6065 == 2 | |
| 7 | 6066 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6067 + (int)Columns - 2, |
| 6068 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6069 == 2))) |
| 7 | 6070 { |
| 6071 /* First make sure we are at the end of the screen line, | |
| 6072 * then output the same character again to let the | |
| 6073 * terminal know about the wrap. If the terminal doesn't | |
| 6074 * 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
|
6075 if (screen_cur_col != wp->w_width) |
| 7 | 6076 screen_char(LineOffset[screen_row - 1] |
| 6077 + (unsigned)Columns - 1, | |
| 6078 screen_row - 1, (int)(Columns - 1)); | |
| 6079 | |
| 6080 /* When there is a multi-byte character, just output a | |
| 6081 * space to keep it simple. */ | |
| 148 | 6082 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6083 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6084 out_char(' '); |
| 6085 else | |
| 6086 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6087 + (Columns - 1)]); | |
| 6088 /* force a redraw of the first char on the next line */ | |
| 6089 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6090 screen_start(); /* don't know where cursor is now */ | |
| 6091 } | |
| 6092 } | |
| 6093 | |
| 6094 col = 0; | |
| 6095 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6096 #ifdef FEAT_RIGHTLEFT | |
| 6097 if (wp->w_p_rl) | |
| 6098 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6099 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6100 off += col; |
| 6101 } | |
| 6102 #endif | |
| 6103 | |
| 6104 /* reset the drawing state for the start of a wrapped line */ | |
| 6105 draw_state = WL_START; | |
| 6106 saved_n_extra = n_extra; | |
| 6107 saved_p_extra = p_extra; | |
| 6108 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
|
6109 saved_c_final = c_final; |
| 7 | 6110 saved_char_attr = char_attr; |
| 6111 n_extra = 0; | |
| 6112 lcs_prec_todo = lcs_prec; | |
| 6113 #ifdef FEAT_LINEBREAK | |
| 6114 # ifdef FEAT_DIFF | |
| 6115 if (filler_todo <= 0) | |
| 6116 # endif | |
| 6117 need_showbreak = TRUE; | |
| 6118 #endif | |
| 6119 #ifdef FEAT_DIFF | |
| 6120 --filler_todo; | |
| 6121 /* When the filler lines are actually below the last line of the | |
| 6122 * file, don't draw the line itself, break here. */ | |
| 6123 if (filler_todo == 0 && wp->w_botfill) | |
| 6124 break; | |
| 6125 #endif | |
| 6126 } | |
| 6127 | |
| 6128 } /* for every character in the line */ | |
| 6129 | |
| 743 | 6130 #ifdef FEAT_SPELL |
| 386 | 6131 /* After an empty line check first word for capital. */ |
| 6132 if (*skipwhite(line) == NUL) | |
| 6133 { | |
| 6134 capcol_lnum = lnum + 1; | |
| 6135 cap_col = 0; | |
| 6136 } | |
| 6137 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6138 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6139 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6140 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6141 #endif |
| 386 | 6142 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6143 vim_free(p_extra_free); |
| 7 | 6144 return row; |
| 6145 } | |
| 6146 | |
| 714 | 6147 /* |
| 6148 * 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
|
6149 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6150 */ |
| 6151 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6152 comp_char_differs(int off_from, int off_to) |
| 714 | 6153 { |
| 6154 int i; | |
| 6155 | |
| 6156 for (i = 0; i < Screen_mco; ++i) | |
| 6157 { | |
| 6158 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6159 return TRUE; | |
| 6160 if (ScreenLinesC[i][off_from] == 0) | |
| 6161 break; | |
| 6162 } | |
| 6163 return FALSE; | |
| 6164 } | |
| 6165 | |
| 7 | 6166 /* |
| 6167 * Check whether the given character needs redrawing: | |
| 6168 * - the (first byte of the) character is different | |
| 6169 * - the attributes are different | |
| 6170 * - the character is multi-byte and the next byte is different | |
| 1616 | 6171 * - the character is two cells wide and the second cell differs. |
| 7 | 6172 */ |
| 6173 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6174 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6175 { |
| 6176 if (cols > 0 | |
| 6177 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6178 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6179 || (enc_dbcs != 0 | |
| 6180 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6181 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6182 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6183 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6184 != ScreenLines[off_to + 1]))) | |
| 6185 || (enc_utf8 | |
| 6186 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6187 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6188 && comp_char_differs(off_from, off_to)) |
| 3759 | 6189 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6190 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6191 != ScreenLines[off_to + 1]))))) |
| 7 | 6192 return TRUE; |
| 6193 return FALSE; | |
| 6194 } | |
| 6195 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6196 #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
|
6197 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6198 * 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
|
6199 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6200 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6201 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
|
6202 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6203 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
|
6204 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6205 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6206 |
| 7 | 6207 /* |
| 6208 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6209 * have actually changed. Handle insert/delete character. | |
| 6210 * "coloff" gives the first column on the screen for this line. | |
| 6211 * "endcol" gives the columns where valid characters are. | |
| 6212 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6213 * 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
|
6214 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6215 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6216 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6217 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6218 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6219 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6220 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6221 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6222 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6223 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6224 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
|
6225 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6226 int flags UNUSED) |
| 7 | 6227 { |
| 6228 unsigned off_from; | |
| 6229 unsigned off_to; | |
| 1378 | 6230 unsigned max_off_from; |
| 6231 unsigned max_off_to; | |
| 7 | 6232 int col = 0; |
| 6233 int hl; | |
| 6234 int force = FALSE; /* force update rest of the line */ | |
| 6235 int redraw_this /* bool: does character need redraw? */ | |
| 6236 #ifdef FEAT_GUI | |
| 6237 = TRUE /* For GUI when while-loop empty */ | |
| 6238 #endif | |
| 6239 ; | |
| 6240 int redraw_next; /* redraw_this for next character */ | |
| 6241 int clear_next = FALSE; | |
| 6242 int char_cells; /* 1: normal char */ | |
| 6243 /* 2: occupies two display cells */ | |
| 6244 # define CHAR_CELLS char_cells | |
| 6245 | |
| 3413 | 6246 /* Check for illegal row and col, just in case. */ |
| 6247 if (row >= Rows) | |
| 6248 row = Rows - 1; | |
| 6249 if (endcol > Columns) | |
| 6250 endcol = Columns; | |
| 6251 | |
| 7 | 6252 # ifdef FEAT_CLIPBOARD |
| 6253 clip_may_clear_selection(row, row); | |
| 6254 # endif | |
| 6255 | |
| 6256 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6257 off_to = LineOffset[row] + coloff; | |
| 1378 | 6258 max_off_from = off_from + screen_Columns; |
| 6259 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6260 |
| 6261 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6262 if (flags & SLF_RIGHTLEFT) |
| 7 | 6263 { |
| 6264 /* Clear rest first, because it's left of the text. */ | |
| 6265 if (clear_width > 0) | |
| 6266 { | |
| 6267 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6268 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6269 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6270 { |
| 6271 ++off_to; | |
| 6272 ++col; | |
| 6273 } | |
| 6274 if (col <= endcol) | |
| 6275 screen_fill(row, row + 1, col + coloff, | |
| 6276 endcol + coloff + 1, ' ', ' ', 0); | |
| 6277 } | |
| 6278 col = endcol + 1; | |
| 6279 off_to = LineOffset[row] + col + coloff; | |
| 6280 off_from += col; | |
| 6281 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6282 } | |
| 6283 #endif /* FEAT_RIGHTLEFT */ | |
| 6284 | |
| 6285 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6286 | |
| 6287 while (col < endcol) | |
| 6288 { | |
| 6289 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6290 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6291 else |
| 6292 char_cells = 1; | |
| 6293 | |
| 6294 redraw_this = redraw_next; | |
| 6295 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6296 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6297 | |
| 6298 #ifdef FEAT_GUI | |
| 6299 /* If the next character was bold, then redraw the current character to | |
| 6300 * remove any pixels that might have spilt over into us. This only | |
| 6301 * happens in the GUI. | |
| 6302 */ | |
| 6303 if (redraw_next && gui.in_use) | |
| 6304 { | |
| 6305 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6306 if (hl > HL_ALL) |
| 6307 hl = syn_attr2attr(hl); | |
| 6308 if (hl & HL_BOLD) | |
| 7 | 6309 redraw_this = TRUE; |
| 6310 } | |
| 6311 #endif | |
| 6312 | |
| 6313 if (redraw_this) | |
| 6314 { | |
| 6315 /* | |
| 6316 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6317 * Attributes for characters are stored at the position where the | |
| 6318 * cursor is when writing the highlighting code. The | |
| 6319 * start-highlighting code must be written with the cursor on the | |
| 6320 * first highlighted character. The stop-highlighting code must | |
| 6321 * be written with the cursor just after the last highlighted | |
| 6322 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6323 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6324 * to clear the rest of the line, and force redrawing it |
| 6325 * completely. | |
| 6326 */ | |
| 6327 if ( p_wiv | |
| 6328 && !force | |
| 6329 #ifdef FEAT_GUI | |
| 6330 && !gui.in_use | |
| 6331 #endif | |
| 6332 && ScreenAttrs[off_to] != 0 | |
| 6333 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6334 { | |
| 6335 /* | |
| 6336 * Need to remove highlighting attributes here. | |
| 6337 */ | |
| 6338 windgoto(row, col + coloff); | |
| 6339 out_str(T_CE); /* clear rest of this screen line */ | |
| 6340 screen_start(); /* don't know where cursor is now */ | |
| 6341 force = TRUE; /* force redraw of rest of the line */ | |
| 6342 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6343 | |
| 6344 /* | |
| 6345 * If the previous character was highlighted, need to stop | |
| 6346 * highlighting at this character. | |
| 6347 */ | |
| 6348 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6349 { | |
| 6350 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6351 term_windgoto(row, col + coloff); | |
| 6352 screen_stop_highlight(); | |
| 6353 } | |
| 6354 else | |
| 6355 screen_attr = 0; /* highlighting has stopped */ | |
| 6356 } | |
| 6357 if (enc_dbcs != 0) | |
| 6358 { | |
| 6359 /* Check if overwriting a double-byte with a single-byte or | |
| 6360 * the other way around requires another character to be | |
| 6361 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6362 * ScreenLinesUC[] is sufficient. */ | |
| 6363 if (char_cells == 1 | |
| 6364 && col + 1 < endcol | |
| 1378 | 6365 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6366 { |
| 6367 /* Writing a single-cell character over a double-cell | |
| 6368 * character: need to redraw the next cell. */ | |
| 6369 ScreenLines[off_to + 1] = 0; | |
| 6370 redraw_next = TRUE; | |
| 6371 } | |
| 6372 else if (char_cells == 2 | |
| 6373 && col + 2 < endcol | |
| 1378 | 6374 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6375 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6376 { |
| 6377 /* Writing the second half of a double-cell character over | |
| 6378 * a double-cell character: need to redraw the second | |
| 6379 * cell. */ | |
| 6380 ScreenLines[off_to + 2] = 0; | |
| 6381 redraw_next = TRUE; | |
| 6382 } | |
| 6383 | |
| 6384 if (enc_dbcs == DBCS_JPNU) | |
| 6385 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6386 } | |
| 6387 /* When writing a single-width character over a double-width | |
| 6388 * character and at the end of the redrawn text, need to clear out | |
| 6389 * the right halve of the old character. | |
| 6390 * Also required when writing the right halve of a double-width | |
| 6391 * char over the left halve of an existing one. */ | |
| 6392 if (has_mbyte && col + char_cells == endcol | |
| 6393 && ((char_cells == 1 | |
| 1378 | 6394 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6395 || (char_cells == 2 |
| 1378 | 6396 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6397 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6398 clear_next = TRUE; |
| 6399 | |
| 6400 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6401 if (enc_utf8) | |
| 6402 { | |
| 6403 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6404 if (ScreenLinesUC[off_from] != 0) | |
| 6405 { | |
| 714 | 6406 int i; |
| 6407 | |
| 6408 for (i = 0; i < Screen_mco; ++i) | |
| 6409 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6410 } |
| 6411 } | |
| 6412 if (char_cells == 2) | |
| 6413 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6414 | |
| 6415 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6416 /* The bold trick makes a single column of pixels appear in the |
| 6417 * next character. When a bold character is removed, the next | |
| 7 | 6418 * character should be redrawn too. This happens for our own GUI |
| 6419 * and for some xterms. */ | |
| 6420 if ( | |
| 6421 # ifdef FEAT_GUI | |
| 6422 gui.in_use | |
| 6423 # endif | |
| 6424 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6425 || | |
| 6426 # endif | |
| 6427 # ifdef UNIX | |
| 6428 term_is_xterm | |
| 6429 # endif | |
| 6430 ) | |
| 6431 { | |
| 6432 hl = ScreenAttrs[off_to]; | |
| 743 | 6433 if (hl > HL_ALL) |
| 6434 hl = syn_attr2attr(hl); | |
| 6435 if (hl & HL_BOLD) | |
| 7 | 6436 redraw_next = TRUE; |
| 6437 } | |
| 6438 #endif | |
| 6439 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6440 |
| 819 | 6441 /* For simplicity set the attributes of second half of a |
| 6442 * double-wide character equal to the first half. */ | |
| 6443 if (char_cells == 2) | |
| 6444 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6445 | |
| 7 | 6446 if (enc_dbcs != 0 && char_cells == 2) |
| 6447 screen_char_2(off_to, row, col + coloff); | |
| 6448 else | |
| 6449 screen_char(off_to, row, col + coloff); | |
| 6450 } | |
| 6451 else if ( p_wiv | |
| 6452 #ifdef FEAT_GUI | |
| 6453 && !gui.in_use | |
| 6454 #endif | |
| 6455 && col + coloff > 0) | |
| 6456 { | |
| 6457 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6458 { | |
| 6459 /* | |
| 6460 * Don't output stop-highlight when moving the cursor, it will | |
| 6461 * stop the highlighting when it should continue. | |
| 6462 */ | |
| 6463 screen_attr = 0; | |
| 6464 } | |
| 6465 else if (screen_attr != 0) | |
| 6466 screen_stop_highlight(); | |
| 6467 } | |
| 6468 | |
| 6469 off_to += CHAR_CELLS; | |
| 6470 off_from += CHAR_CELLS; | |
| 6471 col += CHAR_CELLS; | |
| 6472 } | |
| 6473 | |
| 6474 if (clear_next) | |
| 6475 { | |
| 6476 /* Clear the second half of a double-wide character of which the left | |
| 6477 * half was overwritten with a single-wide character. */ | |
| 6478 ScreenLines[off_to] = ' '; | |
| 6479 if (enc_utf8) | |
| 6480 ScreenLinesUC[off_to] = 0; | |
| 6481 screen_char(off_to, row, col + coloff); | |
| 6482 } | |
| 6483 | |
| 6484 if (clear_width > 0 | |
| 6485 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6486 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6487 #endif |
| 6488 ) | |
| 6489 { | |
| 6490 #ifdef FEAT_GUI | |
| 6491 int startCol = col; | |
| 6492 #endif | |
| 6493 | |
| 6494 /* blank out the rest of the line */ | |
| 6495 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6496 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6497 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6498 { |
| 6499 ++off_to; | |
| 6500 ++col; | |
| 6501 } | |
| 6502 if (col < clear_width) | |
| 6503 { | |
| 6504 #ifdef FEAT_GUI | |
| 6505 /* | |
| 6506 * In the GUI, clearing the rest of the line may leave pixels | |
| 6507 * behind if the first character cleared was bold. Some bold | |
| 6508 * fonts spill over the left. In this case we redraw the previous | |
| 6509 * character too. If we didn't skip any blanks above, then we | |
| 6510 * only redraw if the character wasn't already redrawn anyway. | |
| 6511 */ | |
| 996 | 6512 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6513 { |
| 6514 hl = ScreenAttrs[off_to]; | |
| 6515 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6516 { |
| 6517 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6518 |
| 996 | 6519 if (enc_utf8) |
| 6520 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6521 * that its width is 2. */ | |
| 6522 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6523 else if (enc_dbcs != 0) | |
| 6524 { | |
| 6525 /* find previous character by counting from first | |
| 6526 * column and get its width. */ | |
| 6527 unsigned off = LineOffset[row]; | |
| 1378 | 6528 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6529 |
| 6530 while (off < off_to) | |
| 6531 { | |
| 1378 | 6532 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6533 off += prev_cells; |
| 6534 } | |
| 6535 } | |
| 6536 | |
| 6537 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6538 screen_char_2(off_to - prev_cells, row, | |
| 6539 col + coloff - prev_cells); | |
| 6540 else | |
| 6541 screen_char(off_to - prev_cells, row, | |
| 6542 col + coloff - prev_cells); | |
| 6543 } | |
| 7 | 6544 } |
| 6545 #endif | |
| 6546 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6547 ' ', ' ', 0); | |
| 6548 off_to += clear_width - col; | |
| 6549 col = clear_width; | |
| 6550 } | |
| 6551 } | |
| 6552 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6553 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6554 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6555 && !(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
|
6556 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6557 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6558 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6559 // 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
|
6560 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6561 if (coloff + col < Columns) |
| 7 | 6562 { |
| 6563 int c; | |
| 6564 | |
| 6565 c = fillchar_vsep(&hl); | |
| 6477 | 6566 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6567 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6568 != (c >= 0x80 ? c : 0)) | |
| 7 | 6569 || ScreenAttrs[off_to] != hl) |
| 6570 { | |
| 6571 ScreenLines[off_to] = c; | |
| 6572 ScreenAttrs[off_to] = hl; | |
| 6573 if (enc_utf8) | |
| 6574 { | |
| 6575 if (c >= 0x80) | |
| 6576 { | |
| 6577 ScreenLinesUC[off_to] = c; | |
| 714 | 6578 ScreenLinesC[0][off_to] = 0; |
| 7 | 6579 } |
| 6580 else | |
| 6581 ScreenLinesUC[off_to] = 0; | |
| 6582 } | |
| 6583 screen_char(off_to, row, col + coloff); | |
| 6584 } | |
| 6585 } | |
| 6586 else | |
| 6587 LineWraps[row] = FALSE; | |
| 6588 } | |
| 6589 } | |
| 6590 | |
| 474 | 6591 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6592 /* |
| 474 | 6593 * Mirror text "str" for right-left displaying. |
| 6594 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6595 */ |
| 474 | 6596 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6597 rl_mirror(char_u *str) |
| 7 | 6598 { |
| 6599 char_u *p1, *p2; | |
| 6600 int t; | |
| 6601 | |
| 6602 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6603 { | |
| 6604 t = *p1; | |
| 6605 *p1 = *p2; | |
| 6606 *p2 = t; | |
| 6607 } | |
| 6608 } | |
| 6609 #endif | |
| 6610 | |
| 6611 /* | |
| 6612 * mark all status lines for redraw; used after first :cd | |
| 6613 */ | |
| 6614 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6615 status_redraw_all(void) |
| 7 | 6616 { |
| 6617 win_T *wp; | |
| 6618 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6619 FOR_ALL_WINDOWS(wp) |
| 7 | 6620 if (wp->w_status_height) |
| 6621 { | |
| 6622 wp->w_redr_status = TRUE; | |
| 6623 redraw_later(VALID); | |
| 6624 } | |
| 6625 } | |
| 6626 | |
| 6627 /* | |
| 6628 * mark all status lines of the current buffer for redraw | |
| 6629 */ | |
| 6630 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6631 status_redraw_curbuf(void) |
| 7 | 6632 { |
| 6633 win_T *wp; | |
| 6634 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6635 FOR_ALL_WINDOWS(wp) |
| 7 | 6636 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6637 { | |
| 6638 wp->w_redr_status = TRUE; | |
| 6639 redraw_later(VALID); | |
| 6640 } | |
| 6641 } | |
| 6642 | |
| 6643 /* | |
| 6644 * Redraw all status lines that need to be redrawn. | |
| 6645 */ | |
| 6646 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6647 redraw_statuslines(void) |
| 7 | 6648 { |
| 6649 win_T *wp; | |
| 6650 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6651 FOR_ALL_WINDOWS(wp) |
| 7 | 6652 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
|
6653 win_redr_status(wp, FALSE); |
| 673 | 6654 if (redraw_tabline) |
| 677 | 6655 draw_tabline(); |
| 7 | 6656 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6657 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6658 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6659 /* |
| 6660 * Redraw all status lines at the bottom of frame "frp". | |
| 6661 */ | |
| 6662 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6663 win_redraw_last_status(frame_T *frp) |
| 7 | 6664 { |
| 6665 if (frp->fr_layout == FR_LEAF) | |
| 6666 frp->fr_win->w_redr_status = TRUE; | |
| 6667 else if (frp->fr_layout == FR_ROW) | |
| 6668 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6669 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6670 win_redraw_last_status(frp); |
| 6671 } | |
| 6672 else /* frp->fr_layout == FR_COL */ | |
| 6673 { | |
| 6674 frp = frp->fr_child; | |
| 6675 while (frp->fr_next != NULL) | |
| 6676 frp = frp->fr_next; | |
| 6677 win_redraw_last_status(frp); | |
| 6678 } | |
| 6679 } | |
| 6680 #endif | |
| 6681 | |
| 6682 /* | |
| 6683 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6684 */ | |
| 6685 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6686 draw_vsep_win(win_T *wp, int row) |
| 7 | 6687 { |
| 6688 int hl; | |
| 6689 int c; | |
| 6690 | |
| 6691 if (wp->w_vsep_width) | |
| 6692 { | |
| 6693 /* draw the vertical separator right of this window */ | |
| 6694 c = fillchar_vsep(&hl); | |
| 6695 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6696 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6697 c, ' ', hl); | |
| 6698 } | |
| 6699 } | |
| 6700 | |
| 6701 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6702 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6703 |
| 6704 /* | |
| 1378 | 6705 * Get the length of an item as it will be shown in the status line. |
| 7 | 6706 */ |
| 6707 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6708 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6709 { |
| 6710 int len = 0; | |
| 6711 | |
| 6712 #ifdef FEAT_MENU | |
| 6713 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6714 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6715 | |
| 6716 /* Check for menu separators - replace with '|'. */ | |
| 6717 if (emenu && menu_is_separator(s)) | |
| 6718 return 1; | |
| 6719 #endif | |
| 6720 | |
| 6721 while (*s != NUL) | |
| 6722 { | |
| 1685 | 6723 s += skip_status_match_char(xp, s); |
| 42 | 6724 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6725 MB_PTR_ADV(s); |
| 7 | 6726 } |
| 6727 | |
| 6728 return len; | |
| 6729 } | |
| 6730 | |
| 6731 /* | |
| 1685 | 6732 * Return the number of characters that should be skipped in a status match. |
| 277 | 6733 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6734 */ | |
| 6735 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6736 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6737 { |
| 1685 | 6738 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6739 #ifdef FEAT_MENU |
| 6740 || ((xp->xp_context == EXPAND_MENUS | |
| 6741 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6742 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6743 #endif | |
| 1685 | 6744 ) |
| 6745 { | |
| 6746 #ifndef BACKSLASH_IN_FILENAME | |
| 6747 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6748 return 2; | |
| 6749 #endif | |
| 6750 return 1; | |
| 6751 } | |
| 6752 return 0; | |
| 277 | 6753 } |
| 6754 | |
| 6755 /* | |
| 7 | 6756 * Show wildchar matches in the status line. |
| 6757 * Show at least the "match" item. | |
| 6758 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6759 * | |
| 6760 * If inversion is possible we use it. Else '=' characters are used. | |
| 6761 */ | |
| 6762 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6763 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6764 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6765 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6766 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6767 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6768 int showtail) |
| 7 | 6769 { |
| 6770 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6771 int row; | |
| 6772 char_u *buf; | |
| 6773 int len; | |
| 1378 | 6774 int clen; /* length in screen cells */ |
| 7 | 6775 int fillchar; |
| 6776 int attr; | |
| 6777 int i; | |
| 6778 int highlight = TRUE; | |
| 6779 char_u *selstart = NULL; | |
| 6780 int selstart_col = 0; | |
| 6781 char_u *selend = NULL; | |
| 6782 static int first_match = 0; | |
| 6783 int add_left = FALSE; | |
| 6784 char_u *s; | |
| 6785 #ifdef FEAT_MENU | |
| 6786 int emenu; | |
| 6787 #endif | |
| 6788 int l; | |
| 6789 | |
| 6790 if (matches == NULL) /* interrupted completion? */ | |
| 6791 return; | |
| 6792 | |
| 39 | 6793 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
|
6794 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6795 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
|
6796 buf = alloc(Columns + 1); |
| 7 | 6797 if (buf == NULL) |
| 6798 return; | |
| 6799 | |
| 6800 if (match == -1) /* don't show match but original text */ | |
| 6801 { | |
| 6802 match = 0; | |
| 6803 highlight = FALSE; | |
| 6804 } | |
| 6805 /* count 1 for the ending ">" */ | |
| 6806 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6807 if (match == 0) | |
| 6808 first_match = 0; | |
| 6809 else if (match < first_match) | |
| 6810 { | |
| 6811 /* jumping left, as far as we can go */ | |
| 6812 first_match = match; | |
| 6813 add_left = TRUE; | |
| 6814 } | |
| 6815 else | |
| 6816 { | |
| 6817 /* check if match fits on the screen */ | |
| 6818 for (i = first_match; i < match; ++i) | |
| 6819 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6820 if (first_match > 0) | |
| 6821 clen += 2; | |
| 6822 /* jumping right, put match at the left */ | |
| 6823 if ((long)clen > Columns) | |
| 6824 { | |
| 6825 first_match = match; | |
| 6826 /* if showing the last match, we can add some on the left */ | |
| 6827 clen = 2; | |
| 6828 for (i = match; i < num_matches; ++i) | |
| 6829 { | |
| 6830 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6831 if ((long)clen >= Columns) | |
| 6832 break; | |
| 6833 } | |
| 6834 if (i == num_matches) | |
| 6835 add_left = TRUE; | |
| 6836 } | |
| 6837 } | |
| 6838 if (add_left) | |
| 6839 while (first_match > 0) | |
| 6840 { | |
| 6841 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 6842 if ((long)clen >= Columns) | |
| 6843 break; | |
| 6844 --first_match; | |
| 6845 } | |
| 6846 | |
|
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
|
6847 fillchar = fillchar_status(&attr, curwin); |
| 7 | 6848 |
| 6849 if (first_match == 0) | |
| 6850 { | |
| 6851 *buf = NUL; | |
| 6852 len = 0; | |
| 6853 } | |
| 6854 else | |
| 6855 { | |
| 6856 STRCPY(buf, "< "); | |
| 6857 len = 2; | |
| 6858 } | |
| 6859 clen = len; | |
| 6860 | |
| 6861 i = first_match; | |
| 6862 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 6863 { | |
| 6864 if (i == match) | |
| 6865 { | |
| 6866 selstart = buf + len; | |
| 6867 selstart_col = clen; | |
| 6868 } | |
| 6869 | |
| 6870 s = L_MATCH(i); | |
| 6871 /* Check for menu separators - replace with '|' */ | |
| 6872 #ifdef FEAT_MENU | |
| 6873 emenu = (xp->xp_context == EXPAND_MENUS | |
| 6874 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6875 if (emenu && menu_is_separator(s)) | |
| 6876 { | |
| 6877 STRCPY(buf + len, transchar('|')); | |
| 6878 l = (int)STRLEN(buf + len); | |
| 6879 len += l; | |
| 6880 clen += l; | |
| 6881 } | |
| 6882 else | |
| 6883 #endif | |
| 6884 for ( ; *s != NUL; ++s) | |
| 6885 { | |
| 1685 | 6886 s += skip_status_match_char(xp, s); |
| 7 | 6887 clen += ptr2cells(s); |
| 474 | 6888 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 6889 { |
| 6890 STRNCPY(buf + len, s, l); | |
| 6891 s += l - 1; | |
| 6892 len += l; | |
| 6893 } | |
| 6894 else | |
| 6895 { | |
| 6896 STRCPY(buf + len, transchar_byte(*s)); | |
| 6897 len += (int)STRLEN(buf + len); | |
| 6898 } | |
| 6899 } | |
| 6900 if (i == match) | |
| 6901 selend = buf + len; | |
| 6902 | |
| 6903 *(buf + len++) = ' '; | |
| 6904 *(buf + len++) = ' '; | |
| 6905 clen += 2; | |
| 6906 if (++i == num_matches) | |
| 6907 break; | |
| 6908 } | |
| 6909 | |
| 6910 if (i != num_matches) | |
| 6911 { | |
| 6912 *(buf + len++) = '>'; | |
| 6913 ++clen; | |
| 6914 } | |
| 6915 | |
| 6916 buf[len] = NUL; | |
| 6917 | |
| 6918 row = cmdline_row - 1; | |
| 6919 if (row >= 0) | |
| 6920 { | |
| 6921 if (wild_menu_showing == 0) | |
| 6922 { | |
| 6923 if (msg_scrolled > 0) | |
| 6924 { | |
| 6925 /* Put the wildmenu just above the command line. If there is | |
| 6926 * no room, scroll the screen one line up. */ | |
| 6927 if (cmdline_row == Rows - 1) | |
| 6928 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
6929 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 6930 ++msg_scrolled; |
| 6931 } | |
| 6932 else | |
| 6933 { | |
| 6934 ++cmdline_row; | |
| 6935 ++row; | |
| 6936 } | |
| 6937 wild_menu_showing = WM_SCROLLED; | |
| 6938 } | |
| 6939 else | |
| 6940 { | |
| 6941 /* Create status line if needed by setting 'laststatus' to 2. | |
| 6942 * Set 'winminheight' to zero to avoid that the window is | |
| 6943 * resized. */ | |
| 6944 if (lastwin->w_status_height == 0) | |
| 6945 { | |
| 6946 save_p_ls = p_ls; | |
| 6947 save_p_wmh = p_wmh; | |
| 6948 p_ls = 2; | |
| 6949 p_wmh = 0; | |
| 6950 last_status(FALSE); | |
| 6951 } | |
| 6952 wild_menu_showing = WM_SHOWN; | |
| 6953 } | |
| 6954 } | |
| 6955 | |
| 6956 screen_puts(buf, row, 0, attr); | |
| 6957 if (selstart != NULL && highlight) | |
| 6958 { | |
| 6959 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
6960 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 6961 } |
| 6962 | |
| 6963 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 6964 } | |
| 6965 | |
| 6966 win_redraw_last_status(topframe); | |
| 6967 vim_free(buf); | |
| 6968 } | |
| 6969 #endif | |
| 6970 | |
| 6971 /* | |
| 6972 * Redraw the status line of window wp. | |
| 6973 * | |
| 6974 * 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
|
6975 * 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
|
6976 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6977 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
6978 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
6979 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 6980 { |
| 6981 int row; | |
| 6982 char_u *p; | |
| 6983 int len; | |
| 6984 int fillchar; | |
| 6985 int attr; | |
| 6986 int this_ru_col; | |
| 1910 | 6987 static int busy = FALSE; |
| 6988 | |
| 6989 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 6990 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 6991 if (busy) | |
| 6992 return; | |
| 6993 busy = TRUE; | |
| 7 | 6994 |
| 6995 wp->w_redr_status = FALSE; | |
| 6996 if (wp->w_status_height == 0) | |
| 6997 { | |
| 6998 /* no status line, can only be last window */ | |
| 6999 redraw_cmdline = TRUE; | |
| 7000 } | |
| 540 | 7001 else if (!redrawing() |
| 7002 #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
|
7003 // 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
|
7004 // 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
|
7005 || (!ignore_pum && pum_visible()) |
| 540 | 7006 #endif |
| 7007 ) | |
| 7 | 7008 { |
| 7009 /* Don't redraw right now, do it later. */ | |
| 7010 wp->w_redr_status = TRUE; | |
| 7011 } | |
| 7012 #ifdef FEAT_STL_OPT | |
| 40 | 7013 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7014 { |
| 7015 /* redraw custom status line */ | |
| 1983 | 7016 redraw_custom_statusline(wp); |
| 7 | 7017 } |
| 7018 #endif | |
| 7019 else | |
| 7020 { | |
|
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
|
7021 fillchar = fillchar_status(&attr, wp); |
| 7 | 7022 |
| 685 | 7023 get_trans_bufname(wp->w_buffer); |
| 7 | 7024 p = NameBuff; |
| 7025 len = (int)STRLEN(p); | |
| 7026 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7027 if (bt_help(wp->w_buffer) |
| 7 | 7028 #ifdef FEAT_QUICKFIX |
| 7029 || wp->w_p_pvw | |
| 7030 #endif | |
| 7031 || bufIsChanged(wp->w_buffer) | |
| 7032 || wp->w_buffer->b_p_ro) | |
| 7033 *(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
|
7034 if (bt_help(wp->w_buffer)) |
| 7 | 7035 { |
| 809 | 7036 STRCPY(p + len, _("[Help]")); |
| 7 | 7037 len += (int)STRLEN(p + len); |
| 7038 } | |
| 7039 #ifdef FEAT_QUICKFIX | |
| 7040 if (wp->w_p_pvw) | |
| 7041 { | |
| 7042 STRCPY(p + len, _("[Preview]")); | |
| 7043 len += (int)STRLEN(p + len); | |
| 7044 } | |
| 7045 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7046 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
|
7047 #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
|
7048 && !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
|
7049 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7050 ) |
| 7 | 7051 { |
| 7052 STRCPY(p + len, "[+]"); | |
| 7053 len += 3; | |
| 7054 } | |
| 7055 if (wp->w_buffer->b_p_ro) | |
| 7056 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7057 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
|
7058 len += (int)STRLEN(p + len); |
| 7 | 7059 } |
| 7060 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7061 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
|
7062 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
|
7063 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7064 if (this_ru_col <= 1) |
| 7065 { | |
| 7066 p = (char_u *)"<"; /* No room for file name! */ | |
| 7067 len = 1; | |
| 7068 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7069 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7070 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7071 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7072 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7073 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7074 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7075 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7076 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7077 * 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
|
7078 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
|
7079 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7080 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7081 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7082 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7083 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7084 p = p + i - 1; |
| 7 | 7085 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7086 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7087 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7088 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7089 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7090 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7091 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7092 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7093 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7094 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7095 } |
| 7 | 7096 |
| 7097 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
|
7098 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
|
7099 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
|
7100 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7101 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7102 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7103 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7104 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
|
7105 - 1 + wp->w_wincol), attr); |
| 7 | 7106 |
| 7107 #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
|
7108 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7109 #endif |
| 7110 } | |
| 7111 | |
| 7112 /* | |
| 7113 * May need to draw the character below the vertical separator. | |
| 7114 */ | |
| 7115 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7116 { | |
| 7117 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
|
7118 fillchar = fillchar_status(&attr, wp); |
| 7 | 7119 else |
| 7120 fillchar = fillchar_vsep(&attr); | |
| 7121 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7122 attr); | |
| 7123 } | |
| 1910 | 7124 busy = FALSE; |
| 7 | 7125 } |
| 7126 | |
| 680 | 7127 #ifdef FEAT_STL_OPT |
| 7128 /* | |
| 7129 * Redraw the status line according to 'statusline' and take care of any | |
| 7130 * errors encountered. | |
| 7131 */ | |
| 7132 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7133 redraw_custom_statusline(win_T *wp) |
| 680 | 7134 { |
| 1983 | 7135 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7136 int saved_did_emsg = did_emsg; |
| 1983 | 7137 |
| 7138 /* When called recursively return. This can happen when the statusline | |
| 7139 * contains an expression that triggers a redraw. */ | |
| 7140 if (entered) | |
| 7141 return; | |
| 7142 entered = TRUE; | |
| 680 | 7143 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7144 did_emsg = FALSE; |
| 680 | 7145 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7146 if (did_emsg) |
| 1983 | 7147 { |
| 7148 /* When there is an error disable the statusline, otherwise the | |
| 7149 * display is messed up with errors and a redraw triggers the problem | |
| 7150 * again and again. */ | |
| 680 | 7151 set_string_option_direct((char_u *)"statusline", -1, |
| 7152 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7153 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7154 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7155 did_emsg |= saved_did_emsg; |
| 1983 | 7156 entered = FALSE; |
| 680 | 7157 } |
| 7158 #endif | |
| 7159 | |
| 7 | 7160 /* |
| 7161 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7162 * line of the window right of it. If not, then it's a vertical separator. | |
| 7163 * Only call if (wp->w_vsep_width != 0). | |
| 7164 */ | |
| 7165 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7166 stl_connected(win_T *wp) |
| 7 | 7167 { |
| 7168 frame_T *fr; | |
| 7169 | |
| 7170 fr = wp->w_frame; | |
| 7171 while (fr->fr_parent != NULL) | |
| 7172 { | |
| 7173 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7174 { | |
| 7175 if (fr->fr_next != NULL) | |
| 7176 break; | |
| 7177 } | |
| 7178 else | |
| 7179 { | |
| 7180 if (fr->fr_next != NULL) | |
| 7181 return TRUE; | |
| 7182 } | |
| 7183 fr = fr->fr_parent; | |
| 7184 } | |
| 7185 return FALSE; | |
| 7186 } | |
| 7187 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7188 |
| 7 | 7189 /* |
| 7190 * Get the value to show for the language mappings, active 'keymap'. | |
| 7191 */ | |
| 7192 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7193 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7194 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7195 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
|
7196 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
|
7197 int len) /* length of buffer */ |
| 7 | 7198 { |
| 7199 char_u *p; | |
| 7200 | |
| 7201 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7202 return FALSE; | |
| 7203 | |
| 7204 { | |
| 7205 #ifdef FEAT_EVAL | |
| 7206 buf_T *old_curbuf = curbuf; | |
| 7207 win_T *old_curwin = curwin; | |
| 7208 char_u *s; | |
| 7209 | |
| 7210 curbuf = wp->w_buffer; | |
| 7211 curwin = wp; | |
| 7212 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7213 ++emsg_skip; | |
| 714 | 7214 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7215 --emsg_skip; |
| 7216 curbuf = old_curbuf; | |
| 7217 curwin = old_curwin; | |
| 7218 if (p == NULL || *p == NUL) | |
| 7219 #endif | |
| 7220 { | |
| 7221 #ifdef FEAT_KEYMAP | |
| 7222 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7223 p = wp->w_buffer->b_p_keymap; | |
| 7224 else | |
| 7225 #endif | |
| 7226 p = (char_u *)"lang"; | |
| 7227 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7228 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7229 buf[0] = NUL; |
| 7230 #ifdef FEAT_EVAL | |
| 7231 vim_free(s); | |
| 7232 #endif | |
| 7233 } | |
| 7234 return buf[0] != NUL; | |
| 7235 } | |
| 7236 | |
| 7237 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7238 /* | |
| 677 | 7239 * Redraw the status line or ruler of window "wp". |
| 7240 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7241 */ |
| 7242 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7243 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7244 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7245 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7246 { |
| 5539 | 7247 static int entered = FALSE; |
| 7 | 7248 int attr; |
| 7249 int curattr; | |
| 7250 int row; | |
| 7251 int col = 0; | |
| 7252 int maxwidth; | |
| 7253 int width; | |
| 7254 int n; | |
| 7255 int len; | |
| 7256 int fillchar; | |
| 7257 char_u buf[MAXPATHL]; | |
| 1983 | 7258 char_u *stl; |
| 7 | 7259 char_u *p; |
| 681 | 7260 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7261 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7262 int use_sandbox = FALSE; |
| 2693 | 7263 win_T *ewp; |
| 7264 int p_crb_save; | |
| 7 | 7265 |
| 5539 | 7266 /* There is a tiny chance that this gets called recursively: When |
| 7267 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7268 * Avoid trouble by not allowing recursion. */ | |
| 7269 if (entered) | |
| 7270 return; | |
| 7271 entered = TRUE; | |
| 7272 | |
| 7 | 7273 /* setup environment for the task at hand */ |
| 677 | 7274 if (wp == NULL) |
| 7275 { | |
| 7276 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7277 stl = p_tal; |
| 677 | 7278 row = 0; |
| 707 | 7279 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7280 attr = HL_ATTR(HLF_TPF); |
| 677 | 7281 maxwidth = Columns; |
| 7282 # ifdef FEAT_EVAL | |
| 681 | 7283 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7284 # endif |
| 7285 } | |
| 40 | 7286 else |
| 677 | 7287 { |
| 7288 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
|
7289 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
|
7290 maxwidth = wp->w_width; |
| 677 | 7291 |
| 7292 if (draw_ruler) | |
| 7293 { | |
| 1983 | 7294 stl = p_ruf; |
| 677 | 7295 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7296 if (*stl == '%') |
| 7297 { | |
| 7298 if (*++stl == '-') | |
| 7299 stl++; | |
| 7300 if (atoi((char *)stl)) | |
| 7301 while (VIM_ISDIGIT(*stl)) | |
| 7302 stl++; | |
| 7303 if (*stl++ != '(') | |
| 7304 stl = p_ruf; | |
| 677 | 7305 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7306 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
|
7307 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
|
7308 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
|
7309 maxwidth = wp->w_width - col; |
| 677 | 7310 if (!wp->w_status_height) |
| 7311 { | |
| 7312 row = Rows - 1; | |
| 7313 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7314 fillchar = ' '; | |
| 7315 attr = 0; | |
| 7316 } | |
| 7317 | |
| 7318 # ifdef FEAT_EVAL | |
| 681 | 7319 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7320 # endif |
| 7321 } | |
| 7322 else | |
| 7323 { | |
| 7324 if (*wp->w_p_stl != NUL) | |
| 1983 | 7325 stl = wp->w_p_stl; |
| 677 | 7326 else |
| 1983 | 7327 stl = p_stl; |
| 677 | 7328 # ifdef FEAT_EVAL |
| 681 | 7329 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7330 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7331 # endif |
| 7332 } | |
| 7333 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7334 col += wp->w_wincol; |
| 677 | 7335 } |
| 7336 | |
| 7 | 7337 if (maxwidth <= 0) |
| 5539 | 7338 goto theend; |
| 677 | 7339 |
| 2693 | 7340 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7341 * the cursor away and back. */ | |
| 7342 ewp = wp == NULL ? curwin : wp; | |
| 7343 p_crb_save = ewp->w_p_crb; | |
| 7344 ewp->w_p_crb = FALSE; | |
| 7345 | |
| 1983 | 7346 /* Make a copy, because the statusline may include a function call that |
| 7347 * might change the option value and free the memory. */ | |
| 7348 stl = vim_strsave(stl); | |
| 2693 | 7349 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7350 stl, use_sandbox, |
| 681 | 7351 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7352 vim_free(stl); |
| 2693 | 7353 ewp->w_p_crb = p_crb_save; |
| 2661 | 7354 |
| 7355 /* Make all characters printable. */ | |
| 7356 p = transstr(buf); | |
| 7357 if (p != NULL) | |
| 7358 { | |
| 7359 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7360 vim_free(p); | |
| 7361 } | |
| 7362 | |
| 7363 /* fill up with "fillchar" */ | |
| 835 | 7364 len = (int)STRLEN(buf); |
| 1883 | 7365 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7366 { |
| 7367 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7368 ++width; | |
| 7369 } | |
| 7370 buf[len] = NUL; | |
| 7371 | |
| 681 | 7372 /* |
| 7373 * Draw each snippet with the specified highlighting. | |
| 7374 */ | |
| 7 | 7375 curattr = attr; |
| 7376 p = buf; | |
| 681 | 7377 for (n = 0; hltab[n].start != NULL; n++) |
| 7378 { | |
| 7379 len = (int)(hltab[n].start - p); | |
| 7 | 7380 screen_puts_len(p, len, row, col, curattr); |
| 7381 col += vim_strnsize(p, len); | |
| 681 | 7382 p = hltab[n].start; |
| 7383 | |
| 7384 if (hltab[n].userhl == 0) | |
| 7 | 7385 curattr = attr; |
| 681 | 7386 else if (hltab[n].userhl < 0) |
| 7387 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
|
7388 #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
|
7389 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
|
7390 && 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
|
7391 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
|
7392 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
|
7393 && 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
|
7394 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
|
7395 #endif |
| 680 | 7396 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7397 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7398 else |
| 681 | 7399 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7400 } |
| 7401 screen_puts(p, row, col, curattr); | |
| 681 | 7402 |
| 7403 if (wp == NULL) | |
| 7404 { | |
| 7405 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7406 col = 0; | |
| 7407 len = 0; | |
| 7408 p = buf; | |
| 7409 fillchar = 0; | |
| 7410 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7411 { | |
| 7412 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7413 while (col < len) | |
| 7414 TabPageIdxs[col++] = fillchar; | |
| 7415 p = tabtab[n].start; | |
| 7416 fillchar = tabtab[n].userhl; | |
| 7417 } | |
| 7418 while (col < Columns) | |
| 7419 TabPageIdxs[col++] = fillchar; | |
| 7420 } | |
| 5539 | 7421 |
| 7422 theend: | |
| 7423 entered = FALSE; | |
| 7 | 7424 } |
| 7425 | |
| 7426 #endif /* FEAT_STL_OPT */ | |
| 7427 | |
| 7428 /* | |
| 7429 * Output a single character directly to the screen and update ScreenLines. | |
| 7430 */ | |
| 7431 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7432 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7433 { |
| 3549 | 7434 char_u buf[MB_MAXBYTES + 1]; |
| 7435 | |
| 7436 if (has_mbyte) | |
| 7437 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7438 else | |
| 7439 { | |
| 7440 buf[0] = c; | |
| 7441 buf[1] = NUL; | |
| 7442 } | |
| 7 | 7443 screen_puts(buf, row, col, attr); |
| 7444 } | |
| 7445 | |
| 7446 /* | |
| 7447 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7448 * Also return its attribute in *attrp; | |
| 7449 */ | |
| 7450 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7451 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7452 { |
| 7453 unsigned off; | |
| 7454 | |
| 7455 /* safety check */ | |
| 7456 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7457 { | |
| 7458 off = LineOffset[row] + col; | |
| 7459 *attrp = ScreenAttrs[off]; | |
| 7460 bytes[0] = ScreenLines[off]; | |
| 7461 bytes[1] = NUL; | |
| 7462 | |
| 7463 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7464 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7465 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7466 { | |
| 7467 bytes[0] = ScreenLines[off]; | |
| 7468 bytes[1] = ScreenLines2[off]; | |
| 7469 bytes[2] = NUL; | |
| 7470 } | |
| 7471 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7472 { | |
| 7473 bytes[1] = ScreenLines[off + 1]; | |
| 7474 bytes[2] = NUL; | |
| 7475 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7476 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7477 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7478 |
| 714 | 7479 /* |
| 7480 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7481 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7482 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7483 */ |
| 7484 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7485 screen_comp_differs(int off, int *u8cc) |
| 714 | 7486 { |
| 7487 int i; | |
| 7488 | |
| 7489 for (i = 0; i < Screen_mco; ++i) | |
| 7490 { | |
| 7491 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7492 return TRUE; | |
| 7493 if (u8cc[i] == 0) | |
| 7494 break; | |
| 7495 } | |
| 7496 return FALSE; | |
| 7497 } | |
| 7498 | |
| 7 | 7499 /* |
| 7500 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7501 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7502 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7503 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7504 */ | |
| 7505 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7506 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7507 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7508 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7509 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7510 int attr) |
| 7 | 7511 { |
| 7512 screen_puts_len(text, -1, row, col, attr); | |
| 7513 } | |
| 7514 | |
| 7515 /* | |
| 7516 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7517 * a NUL. | |
| 7518 */ | |
| 7519 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7520 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7521 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7522 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7523 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7524 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7525 int attr) |
| 7 | 7526 { |
| 7527 unsigned off; | |
| 7528 char_u *ptr = text; | |
| 5923 | 7529 int len = textlen; |
| 7 | 7530 int c; |
| 1378 | 7531 unsigned max_off; |
| 7 | 7532 int mbyte_blen = 1; |
| 7533 int mbyte_cells = 1; | |
| 7534 int u8c = 0; | |
| 714 | 7535 int u8cc[MAX_MCO]; |
| 7 | 7536 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7537 #ifdef FEAT_ARABIC |
| 7 | 7538 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7539 int pc, nc, nc1; |
| 7540 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7541 #endif |
| 1843 | 7542 int force_redraw_this; |
| 7543 int force_redraw_next = FALSE; | |
| 7544 int need_redraw; | |
| 7 | 7545 |
| 7546 if (ScreenLines == NULL || row >= screen_Rows) /* safety check */ | |
| 7547 return; | |
| 1843 | 7548 off = LineOffset[row] + col; |
| 7 | 7549 |
| 1668 | 7550 /* When drawing over the right halve of a double-wide char clear out the |
| 7551 * left halve. Only needed in a terminal. */ | |
| 1685 | 7552 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
|
7553 #ifdef FEAT_GUI |
| 1668 | 7554 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7555 #endif |
| 1668 | 7556 && mb_fix_col(col, row) != col) |
| 1843 | 7557 { |
| 7558 ScreenLines[off - 1] = ' '; | |
| 7559 ScreenAttrs[off - 1] = 0; | |
| 7560 if (enc_utf8) | |
| 7561 { | |
| 7562 ScreenLinesUC[off - 1] = 0; | |
| 7563 ScreenLinesC[0][off - 1] = 0; | |
| 7564 } | |
| 7565 /* redraw the previous cell, make it empty */ | |
| 7566 screen_char(off - 1, row, col - 1); | |
| 7567 /* force the cell at "col" to be redrawn */ | |
| 7568 force_redraw_next = TRUE; | |
| 7569 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7570 |
| 1378 | 7571 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7572 while (col < screen_Columns |
| 7573 && (len < 0 || (int)(ptr - text) < len) | |
| 7574 && *ptr != NUL) | |
| 7 | 7575 { |
| 7576 c = *ptr; | |
| 7577 /* check if this is the first byte of a multibyte */ | |
| 7578 if (has_mbyte) | |
| 7579 { | |
| 7580 if (enc_utf8 && len > 0) | |
| 474 | 7581 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7582 else |
| 474 | 7583 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7584 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7585 mbyte_cells = 1; | |
| 7586 else if (enc_dbcs != 0) | |
| 7587 mbyte_cells = mbyte_blen; | |
| 7588 else /* enc_utf8 */ | |
| 7589 { | |
| 7590 if (len >= 0) | |
| 714 | 7591 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7592 (int)((text + len) - ptr)); |
| 7593 else | |
| 714 | 7594 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7595 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7596 #ifdef FEAT_ARABIC |
| 7 | 7597 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7598 { | |
| 7599 /* Do Arabic shaping. */ | |
| 7600 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7601 { | |
| 7602 /* Past end of string to be displayed. */ | |
| 7603 nc = NUL; | |
| 7604 nc1 = NUL; | |
| 7605 } | |
| 7606 else | |
| 714 | 7607 { |
| 1994 | 7608 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7609 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7610 nc1 = pcc[0]; |
| 7611 } | |
| 7 | 7612 pc = prev_c; |
| 7613 prev_c = u8c; | |
| 714 | 7614 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7615 } |
| 7616 else | |
| 7617 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7618 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7619 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7620 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7621 /* 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
|
7622 * 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
|
7623 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7624 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7625 } |
| 7 | 7626 } |
| 7627 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7628 |
| 1843 | 7629 force_redraw_this = force_redraw_next; |
| 7630 force_redraw_next = FALSE; | |
| 7631 | |
| 7632 need_redraw = ScreenLines[off] != c | |
| 7 | 7633 || (mbyte_cells == 2 |
| 7634 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7635 || (enc_dbcs == DBCS_JPNU | |
| 7636 && c == 0x8e | |
| 7637 && ScreenLines2[off] != ptr[1]) | |
| 7638 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7639 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7640 (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
|
7641 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7642 && screen_comp_differs(off, u8cc)))) |
| 7 | 7643 || ScreenAttrs[off] != attr |
| 1843 | 7644 || exmode_active; |
| 7645 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7646 if (need_redraw || force_redraw_this) |
| 7 | 7647 { |
| 7648 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7649 /* The bold trick makes a single row of pixels appear in the next | |
| 7650 * character. When a bold character is removed, the next | |
| 7651 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7652 * and for some xterms. */ |
| 7653 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7654 # ifdef FEAT_GUI |
| 7655 gui.in_use | |
| 7656 # endif | |
| 7657 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7658 || | |
| 7659 # endif | |
| 7660 # ifdef UNIX | |
| 7661 term_is_xterm | |
| 7662 # endif | |
| 1843 | 7663 )) |
| 7664 { | |
| 7665 int n = ScreenAttrs[off]; | |
| 7666 | |
| 7667 if (n > HL_ALL) | |
| 7668 n = syn_attr2attr(n); | |
| 7669 if (n & HL_BOLD) | |
| 7670 force_redraw_next = TRUE; | |
| 7 | 7671 } |
| 7672 #endif | |
| 7673 /* When at the end of the text and overwriting a two-cell | |
| 7674 * character with a one-cell character, need to clear the next | |
| 7675 * cell. Also when overwriting the left halve of a two-cell char | |
| 7676 * with the right halve of a two-cell char. Do this only once | |
| 7677 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7678 if (clear_next_cell) | |
| 7679 clear_next_cell = FALSE; | |
| 7680 else if (has_mbyte | |
| 7681 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7682 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7683 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7684 || (mbyte_cells == 2 |
| 1378 | 7685 && (*mb_off2cells)(off, max_off) == 1 |
| 7686 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7687 clear_next_cell = TRUE; |
| 7688 | |
| 7689 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7690 * it confuses mb_off2cells(). */ | |
| 7691 if (enc_dbcs | |
| 1378 | 7692 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7693 || (mbyte_cells == 2 |
| 1378 | 7694 && (*mb_off2cells)(off, max_off) == 1 |
| 7695 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7696 ScreenLines[off + mbyte_blen] = 0; |
| 7697 ScreenLines[off] = c; | |
| 7698 ScreenAttrs[off] = attr; | |
| 7699 if (enc_utf8) | |
| 7700 { | |
| 714 | 7701 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7702 ScreenLinesUC[off] = 0; |
| 7703 else | |
| 7704 { | |
| 714 | 7705 int i; |
| 7706 | |
| 7 | 7707 ScreenLinesUC[off] = u8c; |
| 714 | 7708 for (i = 0; i < Screen_mco; ++i) |
| 7709 { | |
| 7710 ScreenLinesC[i][off] = u8cc[i]; | |
| 7711 if (u8cc[i] == 0) | |
| 7712 break; | |
| 7713 } | |
| 7 | 7714 } |
| 7715 if (mbyte_cells == 2) | |
| 7716 { | |
| 7717 ScreenLines[off + 1] = 0; | |
| 7718 ScreenAttrs[off + 1] = attr; | |
| 7719 } | |
| 7720 screen_char(off, row, col); | |
| 7721 } | |
| 7722 else if (mbyte_cells == 2) | |
| 7723 { | |
| 7724 ScreenLines[off + 1] = ptr[1]; | |
| 7725 ScreenAttrs[off + 1] = attr; | |
| 7726 screen_char_2(off, row, col); | |
| 7727 } | |
| 7728 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7729 { | |
| 7730 ScreenLines2[off] = ptr[1]; | |
| 7731 screen_char(off, row, col); | |
| 7732 } | |
| 7733 else | |
| 7734 screen_char(off, row, col); | |
| 7735 } | |
| 7736 if (has_mbyte) | |
| 7737 { | |
| 7738 off += mbyte_cells; | |
| 7739 col += mbyte_cells; | |
| 7740 ptr += mbyte_blen; | |
| 7741 if (clear_next_cell) | |
| 5923 | 7742 { |
| 7743 /* This only happens at the end, display one space next. */ | |
| 7 | 7744 ptr = (char_u *)" "; |
| 5923 | 7745 len = -1; |
| 7746 } | |
| 7 | 7747 } |
| 7748 else | |
| 7749 { | |
| 7750 ++off; | |
| 7751 ++col; | |
| 7752 ++ptr; | |
| 7753 } | |
| 7754 } | |
| 1843 | 7755 |
| 7756 /* If we detected the next character needs to be redrawn, but the text | |
| 7757 * doesn't extend up to there, update the character here. */ | |
| 7758 if (force_redraw_next && col < screen_Columns) | |
| 7759 { | |
| 7760 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7761 screen_char_2(off, row, col); | |
| 7762 else | |
| 7763 screen_char(off, row, col); | |
| 7764 } | |
| 7 | 7765 } |
| 7766 | |
| 7767 #ifdef FEAT_SEARCH_EXTRA | |
| 7768 /* | |
| 1326 | 7769 * Prepare for 'hlsearch' highlighting. |
| 7 | 7770 */ |
| 7771 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7772 start_search_hl(void) |
| 7 | 7773 { |
| 7774 if (p_hls && !no_hlsearch) | |
| 7775 { | |
| 7776 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
|
7777 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7778 # ifdef FEAT_RELTIME |
| 7779 /* Set the time limit to 'redrawtime'. */ | |
| 7780 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7781 # endif | |
| 7 | 7782 } |
| 7783 } | |
| 7784 | |
| 7785 /* | |
| 1326 | 7786 * Clean up for 'hlsearch' highlighting. |
| 7 | 7787 */ |
| 7788 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7789 end_search_hl(void) |
| 7 | 7790 { |
| 7791 if (search_hl.rm.regprog != NULL) | |
| 7792 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7793 vim_regfree(search_hl.rm.regprog); |
| 7 | 7794 search_hl.rm.regprog = NULL; |
| 7795 } | |
| 7796 } | |
| 7797 | |
| 7798 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7799 * 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
|
7800 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7801 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7802 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
|
7803 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7804 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7805 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7806 /* 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
|
7807 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7808 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7809 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7810 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7811 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7812 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7813 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7814 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7815 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
|
7816 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
|
7817 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7818 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7819 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7820 /* 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
|
7821 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
|
7822 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7823 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7824 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7825 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
|
7826 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7827 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7828 /* 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
|
7829 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7830 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7831 /* |
| 7 | 7832 * Advance to the match in window "wp" line "lnum" or past it. |
| 7833 */ | |
| 7834 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7835 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 7836 { |
| 1326 | 7837 matchitem_T *cur; /* points to the match list */ |
| 7838 match_T *shl; /* points to search_hl or a match */ | |
| 7839 int shl_flag; /* flag to indicate whether search_hl | |
| 7840 has been processed or not */ | |
| 5979 | 7841 int pos_inprogress; /* marks that position match search is |
| 7842 in progress */ | |
| 7 | 7843 int n; |
| 7844 | |
| 7845 /* | |
| 7846 * When using a multi-line pattern, start searching at the top | |
| 7847 * of the window or just after a closed fold. | |
| 1326 | 7848 * Do this both for search_hl and the match list. |
| 7 | 7849 */ |
| 1326 | 7850 cur = wp->w_match_head; |
| 7851 shl_flag = FALSE; | |
| 7852 while (cur != NULL || shl_flag == FALSE) | |
| 7853 { | |
| 7854 if (shl_flag == FALSE) | |
| 7855 { | |
| 7856 shl = &search_hl; | |
| 7857 shl_flag = TRUE; | |
| 7858 } | |
| 7859 else | |
| 7860 shl = &cur->hl; | |
| 7 | 7861 if (shl->rm.regprog != NULL |
| 7862 && shl->lnum == 0 | |
| 7863 && re_multiline(shl->rm.regprog)) | |
| 7864 { | |
| 7865 if (shl->first_lnum == 0) | |
| 7866 { | |
| 7867 # ifdef FEAT_FOLDING | |
| 7868 for (shl->first_lnum = lnum; | |
| 7869 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 7870 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 7871 NULL, NULL, TRUE, NULL)) | |
| 7872 break; | |
| 7873 # else | |
| 7874 shl->first_lnum = wp->w_topline; | |
| 7875 # endif | |
| 7876 } | |
| 5979 | 7877 if (cur != NULL) |
| 7878 cur->pos.cur = 0; | |
| 7879 pos_inprogress = TRUE; | |
| 7 | 7880 n = 0; |
| 5979 | 7881 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 7882 || (cur != NULL && pos_inprogress))) | |
| 7883 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
7884 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
|
7885 shl == &search_hl ? NULL : cur); |
| 5979 | 7886 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 7887 ? FALSE : TRUE; | |
| 7 | 7888 if (shl->lnum != 0) |
| 7889 { | |
| 7890 shl->first_lnum = shl->lnum | |
| 7891 + shl->rm.endpos[0].lnum | |
| 7892 - shl->rm.startpos[0].lnum; | |
| 7893 n = shl->rm.endpos[0].col; | |
| 7894 } | |
| 7895 else | |
| 7896 { | |
| 7897 ++shl->first_lnum; | |
| 7898 n = 0; | |
| 7899 } | |
| 7900 } | |
| 7901 } | |
| 1326 | 7902 if (shl != &search_hl && cur != NULL) |
| 7903 cur = cur->next; | |
| 7 | 7904 } |
| 7905 } | |
| 7906 | |
| 7907 /* | |
| 1326 | 7908 * Search for a next 'hlsearch' or match. |
| 7 | 7909 * Uses shl->buf. |
| 7910 * Sets shl->lnum and shl->rm contents. | |
| 7911 * Note: Assumes a previous match is always before "lnum", unless | |
| 7912 * shl->lnum is zero. | |
| 7913 * Careful: Any pointers for buffer lines will become invalid. | |
| 7914 */ | |
| 7915 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7916 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7917 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7918 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
|
7919 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7920 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
|
7921 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 7922 { |
| 7923 linenr_T l; | |
| 7924 colnr_T matchcol; | |
| 7925 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
|
7926 int save_called_emsg = called_emsg; |
| 7 | 7927 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7928 // 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
|
7929 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
|
7930 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7931 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
|
7932 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7933 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
7934 |
| 7 | 7935 if (shl->lnum != 0) |
| 7936 { | |
| 7937 /* Check for three situations: | |
| 7938 * 1. If the "lnum" is below a previous match, start a new search. | |
| 7939 * 2. If the previous match includes "mincol", use it. | |
| 7940 * 3. Continue after the previous match. | |
| 7941 */ | |
| 7942 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 7943 if (lnum > l) | |
| 7944 shl->lnum = 0; | |
| 7945 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 7946 return; | |
| 7947 } | |
| 7948 | |
| 7949 /* | |
| 7950 * Repeat searching for a match until one is found that includes "mincol" | |
| 7951 * or none is found in this line. | |
| 7952 */ | |
| 7953 called_emsg = FALSE; | |
| 7954 for (;;) | |
| 7955 { | |
| 1521 | 7956 #ifdef FEAT_RELTIME |
| 7957 /* Stop searching after passing the time limit. */ | |
| 7958 if (profile_passed_limit(&(shl->tm))) | |
| 7959 { | |
| 7960 shl->lnum = 0; /* no match found in time */ | |
| 7961 break; | |
| 7962 } | |
| 7963 #endif | |
| 7 | 7964 /* Three situations: |
| 7965 * 1. No useful previous match: search from start of line. | |
| 7966 * 2. Not Vi compatible or empty match: continue at next character. | |
| 7967 * Break the loop if this is beyond the end of the line. | |
| 7968 * 3. Vi compatible searching: continue at end of previous match. | |
| 7969 */ | |
| 7970 if (shl->lnum == 0) | |
| 7971 matchcol = 0; | |
| 7972 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 7973 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 7974 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 7975 { | |
| 688 | 7976 char_u *ml; |
| 685 | 7977 |
| 7978 matchcol = shl->rm.startpos[0].col; | |
| 688 | 7979 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 7980 if (*ml == NUL) |
| 7981 { | |
| 7982 ++matchcol; | |
| 7 | 7983 shl->lnum = 0; |
| 7984 break; | |
| 7985 } | |
| 685 | 7986 if (has_mbyte) |
| 7987 matchcol += mb_ptr2len(ml); | |
| 7988 else | |
| 7989 ++matchcol; | |
| 7 | 7990 } |
| 7991 else | |
| 7992 matchcol = shl->rm.endpos[0].col; | |
| 7993 | |
| 7994 shl->lnum = lnum; | |
| 5979 | 7995 if (shl->rm.regprog != NULL) |
| 7996 { | |
| 6394 | 7997 /* Remember whether shl->rm is using a copy of the regprog in |
| 7998 * cur->match. */ | |
| 7999 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8000 && shl == &cur->hl | |
| 8001 && 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
|
8002 int timed_out = FALSE; |
| 6394 | 8003 |
| 5979 | 8004 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8005 matchcol, | |
| 1521 | 8006 #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
|
8007 &(shl->tm), &timed_out |
| 1521 | 8008 #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
|
8009 NULL, NULL |
| 5979 | 8010 #endif |
| 8011 ); | |
| 6394 | 8012 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8013 if (regprog_is_copy) | |
| 8014 cur->match.regprog = cur->hl.rm.regprog; | |
| 8015 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8016 if (called_emsg || got_int || timed_out) |
| 5979 | 8017 { |
| 8018 /* Error while handling regexp: stop using this regexp. */ | |
| 8019 if (shl == &search_hl) | |
| 8020 { | |
| 8021 /* don't free regprog in the match list, it's a copy */ | |
| 8022 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
|
8023 set_no_hlsearch(TRUE); |
| 5979 | 8024 } |
| 8025 shl->rm.regprog = NULL; | |
| 8026 shl->lnum = 0; | |
| 8027 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8028 message */ | |
| 8029 break; | |
| 8030 } | |
| 8031 } | |
| 8032 else if (cur != NULL) | |
| 8033 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8034 else |
| 8035 nmatched = 0; | |
| 7 | 8036 if (nmatched == 0) |
| 8037 { | |
| 8038 shl->lnum = 0; /* no match found */ | |
| 8039 break; | |
| 8040 } | |
| 8041 if (shl->rm.startpos[0].lnum > 0 | |
| 8042 || shl->rm.startpos[0].col >= mincol | |
| 8043 || nmatched > 1 | |
| 8044 || shl->rm.endpos[0].col > mincol) | |
| 8045 { | |
| 8046 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8047 break; /* useful match found */ | |
| 8048 } | |
| 8049 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8050 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8051 // 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
|
8052 called_emsg = save_called_emsg; |
| 7 | 8053 } |
| 8054 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8055 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8056 * 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
|
8057 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8058 */ |
| 5979 | 8059 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8060 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8061 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
|
8062 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8063 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8064 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8065 { |
| 8066 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8067 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8068 |
| 5979 | 8069 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8070 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8071 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8072 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8073 if (pos->lnum == 0) |
| 5979 | 8074 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8075 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8076 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8077 if (pos->lnum == lnum) |
| 5979 | 8078 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8079 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8080 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8081 /* 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
|
8082 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8083 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
|
8084 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8085 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8086 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8087 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8088 posmatch->pos[found] = tmp; |
| 5979 | 8089 } |
| 8090 } | |
| 8091 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8092 found = i; |
| 5979 | 8093 } |
| 8094 } | |
| 8095 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8096 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8097 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8098 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
|
8099 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8100 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
|
8101 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8102 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8103 shl->lnum = lnum; |
| 5979 | 8104 shl->rm.startpos[0].lnum = 0; |
| 8105 shl->rm.startpos[0].col = start; | |
| 8106 shl->rm.endpos[0].lnum = 0; | |
| 8107 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
|
8108 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8109 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8110 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8111 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8112 return 0; |
| 5979 | 8113 } |
| 5985 | 8114 #endif |
| 5979 | 8115 |
| 7 | 8116 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8117 screen_start_highlight(int attr) |
| 7 | 8118 { |
| 8119 attrentry_T *aep = NULL; | |
| 8120 | |
| 8121 screen_attr = attr; | |
| 8122 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8123 #ifdef MSWIN |
| 7 | 8124 && termcap_active |
| 8125 #endif | |
| 8126 ) | |
| 8127 { | |
| 8128 #ifdef FEAT_GUI | |
| 8129 if (gui.in_use) | |
| 8130 { | |
| 8131 char buf[20]; | |
| 8132 | |
| 681 | 8133 /* The GUI handles this internally. */ |
| 8134 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8135 OUT_STR(buf); |
| 8136 } | |
| 8137 else | |
| 8138 #endif | |
| 8139 { | |
| 8140 if (attr > HL_ALL) /* special HL attr. */ | |
| 8141 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8142 if (IS_CTERM) |
| 7 | 8143 aep = syn_cterm_attr2entry(attr); |
| 8144 else | |
| 8145 aep = syn_term_attr2entry(attr); | |
| 8146 if (aep == NULL) /* did ":syntax clear" */ | |
| 8147 attr = 0; | |
| 8148 else | |
| 8149 attr = aep->ae_attr; | |
| 8150 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8151 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8152 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
|
8153 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
|
8154 #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
|
8155 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
|
8156 ? 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
|
8157 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8158 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8159 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8160 /* If the Normal FG color has BOLD attribute and the new HL |
| 8161 * has a FG color defined, clear BOLD. */ | |
| 8162 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
|
8163 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8164 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
|
8165 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
|
8166 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
|
8167 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
|
8168 || ((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
|
8169 && *T_US != NUL) |
| 7 | 8170 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
|
8171 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8172 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
|
8173 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8174 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
|
8175 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
|
8176 out_str(T_STS); |
| 7 | 8177 |
| 8178 /* | |
| 8179 * Output the color or start string after bold etc., in case the | |
| 8180 * bold etc. override the color setting. | |
| 8181 */ | |
| 8182 if (aep != NULL) | |
| 8183 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8184 #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
|
8185 /* 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
|
8186 * 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
|
8187 * 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
|
8188 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
|
8189 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8190 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
|
8191 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
|
8192 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8193 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8194 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8195 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
|
8196 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8197 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
|
8198 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
|
8199 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8200 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8201 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
|
8202 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8203 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
|
8204 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8205 } |
| 8206 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8207 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8208 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
|
8209 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8210 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
|
8211 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
|
8212 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8213 |
|
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
|
8214 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
|
8215 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8216 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
|
8217 out_str(aep->ae_u.term.start); |
| 7 | 8218 } |
| 8219 } | |
| 8220 } | |
| 8221 } | |
| 8222 } | |
| 8223 | |
| 8224 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8225 screen_stop_highlight(void) |
| 7 | 8226 { |
| 8227 int do_ME = FALSE; /* output T_ME code */ | |
| 8228 | |
| 8229 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
|
8230 #ifdef MSWIN |
| 7 | 8231 && termcap_active |
| 8232 #endif | |
| 8233 ) | |
| 8234 { | |
| 8235 #ifdef FEAT_GUI | |
| 8236 if (gui.in_use) | |
| 8237 { | |
| 8238 char buf[20]; | |
| 8239 | |
| 8240 /* use internal GUI code */ | |
| 8241 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8242 OUT_STR(buf); | |
| 8243 } | |
| 8244 else | |
| 8245 #endif | |
| 8246 { | |
| 8247 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8248 { | |
| 8249 attrentry_T *aep; | |
| 8250 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8251 if (IS_CTERM) |
| 7 | 8252 { |
| 8253 /* | |
| 8254 * Assume that t_me restores the original colors! | |
| 8255 */ | |
| 8256 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
|
8257 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8258 #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
|
8259 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
|
8260 ? 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
|
8261 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8262 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8263 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
|
8264 #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
|
8265 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
|
8266 ? 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
|
8267 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8268 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8269 aep->ae_u.cterm.bg_color))) |
| 7 | 8270 do_ME = TRUE; |
| 8271 } | |
| 8272 else | |
| 8273 { | |
| 8274 aep = syn_term_attr2entry(screen_attr); | |
| 8275 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8276 { | |
| 8277 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8278 do_ME = TRUE; | |
| 8279 else | |
| 8280 out_str(aep->ae_u.term.stop); | |
| 8281 } | |
| 8282 } | |
| 8283 if (aep == NULL) /* did ":syntax clear" */ | |
| 8284 screen_attr = 0; | |
| 8285 else | |
| 8286 screen_attr = aep->ae_attr; | |
| 8287 } | |
| 8288 | |
| 8289 /* | |
| 8290 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8291 * same sequence several times. | |
| 8292 */ | |
| 8293 if (screen_attr & HL_STANDOUT) | |
| 8294 { | |
| 8295 if (STRCMP(T_SE, T_ME) == 0) | |
| 8296 do_ME = TRUE; | |
| 8297 else | |
| 8298 out_str(T_SE); | |
| 8299 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8300 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
|
8301 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8302 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
|
8303 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8304 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8305 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
|
8306 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8307 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
|
8308 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8309 { |
| 8310 if (STRCMP(T_UE, T_ME) == 0) | |
| 8311 do_ME = TRUE; | |
| 8312 else | |
| 8313 out_str(T_UE); | |
| 8314 } | |
| 8315 if (screen_attr & HL_ITALIC) | |
| 8316 { | |
| 8317 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8318 do_ME = TRUE; | |
| 8319 else | |
| 8320 out_str(T_CZR); | |
| 8321 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8322 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8323 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8324 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
|
8325 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8326 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8327 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8328 } |
| 7 | 8329 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8330 out_str(T_ME); | |
| 8331 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8332 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8333 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8334 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8335 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
|
8336 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
|
8337 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
|
8338 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
|
8339 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8340 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8341 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8342 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8343 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8344 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8345 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8346 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8347 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
|
8348 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8349 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
|
8350 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8351 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8352 } |
| 7 | 8353 } |
| 8354 } | |
| 8355 } | |
| 8356 screen_attr = 0; | |
| 8357 } | |
| 8358 | |
| 8359 /* | |
| 8360 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8361 * The machine specific code may override this again. | |
| 8362 */ | |
| 8363 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8364 reset_cterm_colors(void) |
| 7 | 8365 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8366 if (IS_CTERM) |
| 7 | 8367 { |
| 8368 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8369 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8370 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
|
8371 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8372 : (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
|
8373 #else |
| 7 | 8374 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
|
8375 #endif |
| 7 | 8376 { |
| 8377 out_str(T_OP); | |
| 8378 screen_attr = -1; | |
| 8379 } | |
| 8380 if (cterm_normal_fg_bold) | |
| 8381 { | |
| 8382 out_str(T_ME); | |
| 8383 screen_attr = -1; | |
| 8384 } | |
| 8385 } | |
| 8386 } | |
| 8387 | |
| 8388 /* | |
| 8389 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8390 * using the attributes from ScreenAttrs["off"]. | |
| 8391 */ | |
| 8392 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8393 screen_char(unsigned off, int row, int col) |
| 7 | 8394 { |
| 8395 int attr; | |
| 8396 | |
| 8397 /* Check for illegal values, just in case (could happen just after | |
| 8398 * resizing). */ | |
| 8399 if (row >= screen_Rows || col >= screen_Columns) | |
| 8400 return; | |
| 8401 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8402 #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
|
8403 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
|
8404 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8405 #endif |
| 6602 | 8406 /* Outputting a character in the last cell on the screen may scroll the |
| 8407 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8408 * mark the character invalid (update it when scrolled up). */ | |
| 8409 if (*T_XN == NUL | |
| 8410 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8411 #ifdef FEAT_RIGHTLEFT |
| 8412 /* account for first command-line character in rightleft mode */ | |
| 8413 && !cmdmsg_rl | |
| 8414 #endif | |
| 8415 ) | |
| 8416 { | |
| 8417 ScreenAttrs[off] = (sattr_T)-1; | |
| 8418 return; | |
| 8419 } | |
| 8420 | |
| 8421 /* | |
| 8422 * Stop highlighting first, so it's easier to move the cursor. | |
| 8423 */ | |
| 8424 if (screen_char_attr != 0) | |
| 8425 attr = screen_char_attr; | |
| 8426 else | |
| 8427 attr = ScreenAttrs[off]; | |
| 8428 if (screen_attr != attr) | |
| 8429 screen_stop_highlight(); | |
| 8430 | |
| 8431 windgoto(row, col); | |
| 8432 | |
| 8433 if (screen_attr != attr) | |
| 8434 screen_start_highlight(attr); | |
| 8435 | |
| 8436 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8437 { | |
| 8438 char_u buf[MB_MAXBYTES + 1]; | |
| 8439 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8440 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
|
8441 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8442 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8443 #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
|
8444 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8445 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8446 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8447 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8448 /* 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
|
8449 * 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
|
8450 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
|
8451 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
|
8452 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8453 /* 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
|
8454 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8455 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
|
8456 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8457 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8458 ++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
|
8459 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8460 /* 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
|
8461 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
|
8462 out_str(buf); |
| 7 | 8463 } |
| 8464 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8465 { |
| 7 | 8466 out_flush_check(); |
| 8467 out_char(ScreenLines[off]); | |
| 8468 /* double-byte character in single-width cell */ | |
| 8469 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8470 out_char(ScreenLines2[off]); | |
| 8471 } | |
| 8472 | |
| 8473 screen_cur_col++; | |
| 8474 } | |
| 8475 | |
| 8476 /* | |
| 8477 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8478 * on the screen at position 'row' and 'col'. | |
| 8479 * The attributes of the first byte is used for all. This is required to | |
| 8480 * output the two bytes of a double-byte character with nothing in between. | |
| 8481 */ | |
| 8482 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8483 screen_char_2(unsigned off, int row, int col) |
| 7 | 8484 { |
| 8485 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8486 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8487 return; | |
| 8488 | |
| 8489 /* Outputting the last character on the screen may scrollup the screen. | |
| 8490 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8491 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8492 { | |
| 8493 ScreenAttrs[off] = (sattr_T)-1; | |
| 8494 return; | |
| 8495 } | |
| 8496 | |
| 8497 /* Output the first byte normally (positions the cursor), then write the | |
| 8498 * second byte directly. */ | |
| 8499 screen_char(off, row, col); | |
| 8500 out_char(ScreenLines[off + 1]); | |
| 8501 ++screen_cur_col; | |
| 8502 } | |
| 8503 | |
| 8504 /* | |
| 8505 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8506 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8507 */ | |
| 8508 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8509 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8510 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8511 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8512 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8513 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8514 int invert) |
| 7 | 8515 { |
| 8516 int r, c; | |
| 8517 int off; | |
| 1378 | 8518 int max_off; |
| 7 | 8519 |
| 534 | 8520 /* Can't use ScreenLines unless initialized */ |
| 8521 if (ScreenLines == NULL) | |
| 8522 return; | |
| 8523 | |
| 7 | 8524 if (invert) |
| 8525 screen_char_attr = HL_INVERSE; | |
| 8526 for (r = row; r < row + height; ++r) | |
| 8527 { | |
| 8528 off = LineOffset[r]; | |
| 1378 | 8529 max_off = off + screen_Columns; |
| 7 | 8530 for (c = col; c < col + width; ++c) |
| 8531 { | |
| 1378 | 8532 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8533 { |
| 8534 screen_char_2(off + c, r, c); | |
| 8535 ++c; | |
| 8536 } | |
| 8537 else | |
| 8538 { | |
| 8539 screen_char(off + c, r, c); | |
| 1378 | 8540 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8541 ++c; |
| 8542 } | |
| 8543 } | |
| 8544 } | |
| 8545 screen_char_attr = 0; | |
| 8546 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8547 |
| 7 | 8548 /* |
| 8549 * Redraw the characters for a vertically split window. | |
| 8550 */ | |
| 8551 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8552 redraw_block(int row, int end, win_T *wp) |
| 7 | 8553 { |
| 8554 int col; | |
| 8555 int width; | |
| 8556 | |
| 8557 # ifdef FEAT_CLIPBOARD | |
| 8558 clip_may_clear_selection(row, end - 1); | |
| 8559 # endif | |
| 8560 | |
| 8561 if (wp == NULL) | |
| 8562 { | |
| 8563 col = 0; | |
| 8564 width = Columns; | |
| 8565 } | |
| 8566 else | |
| 8567 { | |
| 8568 col = wp->w_wincol; | |
| 8569 width = wp->w_width; | |
| 8570 } | |
| 8571 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8572 } | |
| 8573 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8574 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8575 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
|
8576 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8577 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8578 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8579 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8580 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8581 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8582 |
| 7 | 8583 /* |
| 8584 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8585 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8586 * Use attributes 'attr'. | |
| 8587 */ | |
| 8588 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8589 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8590 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8591 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8592 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8593 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8594 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8595 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8596 int attr) |
| 7 | 8597 { |
| 8598 int row; | |
| 8599 int col; | |
| 8600 int off; | |
| 8601 int end_off; | |
| 8602 int did_delete; | |
| 8603 int c; | |
| 8604 int norm_term; | |
| 8605 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8606 int force_next = FALSE; | |
| 8607 #endif | |
| 8608 | |
| 8609 if (end_row > screen_Rows) /* safety check */ | |
| 8610 end_row = screen_Rows; | |
| 8611 if (end_col > screen_Columns) /* safety check */ | |
| 8612 end_col = screen_Columns; | |
| 8613 if (ScreenLines == NULL | |
| 8614 || start_row >= end_row | |
| 8615 || start_col >= end_col) /* nothing to do */ | |
| 8616 return; | |
| 8617 | |
| 8618 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8619 norm_term = ( | |
| 8620 #ifdef FEAT_GUI | |
| 8621 !gui.in_use && | |
| 8622 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8623 !IS_CTERM); |
| 7 | 8624 for (row = start_row; row < end_row; ++row) |
| 8625 { | |
| 1668 | 8626 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8627 #ifdef FEAT_GUI |
| 1668 | 8628 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8629 #endif |
| 1668 | 8630 ) |
| 8631 { | |
| 8632 /* When drawing over the right halve of a double-wide char clear | |
| 8633 * out the left halve. When drawing over the left halve of a | |
| 8634 * double wide-char clear out the right halve. Only needed in a | |
| 8635 * terminal. */ | |
| 1685 | 8636 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8637 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8638 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8639 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8640 } |
| 7 | 8641 /* |
| 8642 * Try to use delete-line termcap code, when no attributes or in a | |
| 8643 * "normal" terminal, where a bold/italic space is just a | |
| 8644 * space. | |
| 8645 */ | |
| 8646 did_delete = FALSE; | |
| 8647 if (c2 == ' ' | |
| 8648 && end_col == Columns | |
| 8649 && can_clear(T_CE) | |
| 8650 && (attr == 0 | |
| 8651 || (norm_term | |
| 8652 && attr <= HL_ALL | |
| 8653 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8654 { | |
| 8655 /* | |
| 8656 * check if we really need to clear something | |
| 8657 */ | |
| 8658 col = start_col; | |
| 8659 if (c1 != ' ') /* don't clear first char */ | |
| 8660 ++col; | |
| 8661 | |
| 8662 off = LineOffset[row] + col; | |
| 8663 end_off = LineOffset[row] + end_col; | |
| 8664 | |
| 8665 /* skip blanks (used often, keep it fast!) */ | |
| 8666 if (enc_utf8) | |
| 8667 while (off < end_off && ScreenLines[off] == ' ' | |
| 8668 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8669 ++off; | |
| 8670 else | |
| 8671 while (off < end_off && ScreenLines[off] == ' ' | |
| 8672 && ScreenAttrs[off] == 0) | |
| 8673 ++off; | |
| 8674 if (off < end_off) /* something to be cleared */ | |
| 8675 { | |
| 8676 col = off - LineOffset[row]; | |
| 8677 screen_stop_highlight(); | |
| 8678 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8679 out_str(T_CE); | |
| 8680 screen_start(); /* don't know where cursor is now */ | |
| 8681 col = end_col - col; | |
| 8682 while (col--) /* clear chars in ScreenLines */ | |
| 8683 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8684 space_to_screenline(off, 0); |
| 7 | 8685 ++off; |
| 8686 } | |
| 8687 } | |
| 8688 did_delete = TRUE; /* the chars are cleared now */ | |
| 8689 } | |
| 8690 | |
| 8691 off = LineOffset[row] + start_col; | |
| 8692 c = c1; | |
| 8693 for (col = start_col; col < end_col; ++col) | |
| 8694 { | |
| 8695 if (ScreenLines[off] != c | |
| 714 | 8696 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8697 != (c >= 0x80 ? c : 0)) | |
| 7 | 8698 || ScreenAttrs[off] != attr |
| 8699 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8700 || force_next | |
| 8701 #endif | |
| 8702 ) | |
| 8703 { | |
| 8704 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8705 /* The bold trick may make a single row of pixels appear in | |
| 8706 * the next character. When a bold character is removed, the | |
| 8707 * next character should be redrawn too. This happens for our | |
| 8708 * own GUI and for some xterms. */ | |
| 8709 if ( | |
| 8710 # ifdef FEAT_GUI | |
| 8711 gui.in_use | |
| 8712 # endif | |
| 8713 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8714 || | |
| 8715 # endif | |
| 8716 # ifdef UNIX | |
| 8717 term_is_xterm | |
| 8718 # endif | |
| 8719 ) | |
| 8720 { | |
| 8721 if (ScreenLines[off] != ' ' | |
| 8722 && (ScreenAttrs[off] > HL_ALL | |
| 8723 || ScreenAttrs[off] & HL_BOLD)) | |
| 8724 force_next = TRUE; | |
| 8725 else | |
| 8726 force_next = FALSE; | |
| 8727 } | |
| 8728 #endif | |
| 8729 ScreenLines[off] = c; | |
| 8730 if (enc_utf8) | |
| 8731 { | |
| 8732 if (c >= 0x80) | |
| 8733 { | |
| 8734 ScreenLinesUC[off] = c; | |
| 714 | 8735 ScreenLinesC[0][off] = 0; |
| 7 | 8736 } |
| 8737 else | |
| 8738 ScreenLinesUC[off] = 0; | |
| 8739 } | |
| 8740 ScreenAttrs[off] = attr; | |
| 8741 if (!did_delete || c != ' ') | |
| 8742 screen_char(off, row, col); | |
| 8743 } | |
| 8744 ++off; | |
| 8745 if (col == start_col) | |
| 8746 { | |
| 8747 if (did_delete) | |
| 8748 break; | |
| 8749 c = c2; | |
| 8750 } | |
| 8751 } | |
| 8752 if (end_col == Columns) | |
| 8753 LineWraps[row] = FALSE; | |
| 8754 if (row == Rows - 1) /* overwritten the command line */ | |
| 8755 { | |
| 8756 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
|
8757 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
|
8758 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8759 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8760 if (start_col == 0) |
| 8761 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8762 } |
| 8763 } | |
| 8764 } | |
| 8765 | |
| 8766 /* | |
| 8767 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8768 * screen or the command line. | |
| 8769 */ | |
| 8770 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8771 check_for_delay(int check_msg_scroll) |
| 7 | 8772 { |
| 8773 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8774 && !did_wait_return | |
| 8775 && emsg_silent == 0) | |
| 8776 { | |
| 8777 out_flush(); | |
| 8778 ui_delay(1000L, TRUE); | |
| 8779 emsg_on_display = FALSE; | |
| 8780 if (check_msg_scroll) | |
| 8781 msg_scroll = FALSE; | |
| 8782 } | |
| 8783 } | |
| 8784 | |
| 8785 /* | |
|
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
|
8786 * 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
|
8787 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8788 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
|
8789 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
|
8790 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8791 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
|
8792 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8793 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
|
8794 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
|
8795 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8796 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8797 /* |
| 7 | 8798 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8799 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8800 * Returns TRUE if there is a valid screen to write to. |
| 8801 * Returns FALSE when starting up and screen not initialized yet. | |
| 8802 */ | |
| 8803 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8804 screen_valid(int doclear) |
| 7 | 8805 { |
| 3263 | 8806 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8807 return (ScreenLines != NULL); |
| 8808 } | |
| 8809 | |
| 8810 /* | |
| 8811 * Resize the shell to Rows and Columns. | |
| 8812 * Allocate ScreenLines[] and associated items. | |
| 8813 * | |
| 8814 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8815 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8816 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8817 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8818 * final size of the shell is needed. | |
| 8819 */ | |
| 8820 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8821 screenalloc(int doclear) |
| 7 | 8822 { |
| 8823 int new_row, old_row; | |
| 8824 #ifdef FEAT_GUI | |
| 8825 int old_Rows; | |
| 8826 #endif | |
| 8827 win_T *wp; | |
| 8828 int outofmem = FALSE; | |
| 8829 int len; | |
| 8830 schar_T *new_ScreenLines; | |
| 8831 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 8832 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 8833 schar_T *new_ScreenLines2 = NULL; |
| 714 | 8834 int i; |
| 7 | 8835 sattr_T *new_ScreenAttrs; |
| 8836 unsigned *new_LineOffset; | |
| 8837 char_u *new_LineWraps; | |
| 681 | 8838 short *new_TabPageIdxs; |
| 671 | 8839 tabpage_T *tp; |
| 7 | 8840 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 8841 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 8842 int retry_count = 0; |
| 8843 | |
| 8844 retry: | |
| 7 | 8845 /* |
| 8846 * Allocation of the screen buffers is done only when the size changes and | |
| 8847 * when Rows and Columns have been set and we have started doing full | |
| 8848 * screen stuff. | |
| 8849 */ | |
| 8850 if ((ScreenLines != NULL | |
| 8851 && Rows == screen_Rows | |
| 8852 && Columns == screen_Columns | |
| 8853 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 8854 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8855 && p_mco == Screen_mco) |
| 7 | 8856 || Rows == 0 |
| 8857 || Columns == 0 | |
| 8858 || (!full_screen && ScreenLines == NULL)) | |
| 8859 return; | |
| 8860 | |
| 8861 /* | |
| 8862 * It's possible that we produce an out-of-memory message below, which | |
| 8863 * will cause this function to be called again. To break the loop, just | |
| 8864 * return here. | |
| 8865 */ | |
| 8866 if (entered) | |
| 8867 return; | |
| 8868 entered = TRUE; | |
| 8869 | |
| 911 | 8870 /* |
| 8871 * Note that the window sizes are updated before reallocating the arrays, | |
| 8872 * thus we must not redraw here! | |
| 8873 */ | |
| 8874 ++RedrawingDisabled; | |
| 8875 | |
| 7 | 8876 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 8877 | |
| 8878 comp_col(); /* recompute columns for shown command and ruler */ | |
| 8879 | |
| 8880 /* | |
| 8881 * We're changing the size of the screen. | |
| 8882 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 8883 * - Move lines from the old arrays into the new arrays, clear extra | |
| 8884 * lines (unless the screen is going to be cleared). | |
| 8885 * - Free the old arrays. | |
| 8886 * | |
| 8887 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 8888 * Continuing with the old ScreenLines may result in a crash, because the | |
| 8889 * size is wrong. | |
| 8890 */ | |
| 671 | 8891 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8892 win_free_lsize(wp); |
| 1946 | 8893 if (aucmd_win != NULL) |
| 8894 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
|
8895 #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
|
8896 // 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
|
8897 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
|
8898 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
|
8899 // 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
|
8900 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
|
8901 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
|
8902 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
|
8903 #endif |
| 7 | 8904 |
|
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
|
8905 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
|
8906 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 8907 if (enc_utf8) |
| 8908 { | |
|
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
|
8909 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 8910 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
|
8911 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
|
8912 (Rows + 1) * Columns); |
| 7 | 8913 } |
| 8914 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
|
8915 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
|
8916 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
|
8917 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
|
8918 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
|
8919 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
| 7 | 8920 |
| 677 | 8921 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 8922 { |
| 8923 if (win_alloc_lines(wp) == FAIL) | |
| 8924 { | |
| 8925 outofmem = TRUE; | |
| 1819 | 8926 goto give_up; |
| 8927 } | |
| 8928 } | |
| 1946 | 8929 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 8930 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 8931 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
|
8932 #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
|
8933 // 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
|
8934 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
|
8935 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
|
8936 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8937 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
|
8938 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
|
8939 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8940 // 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
|
8941 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
|
8942 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
|
8943 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
|
8944 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8945 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
|
8946 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
|
8947 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
8948 #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
|
8949 |
| 1819 | 8950 give_up: |
| 7 | 8951 |
| 714 | 8952 for (i = 0; i < p_mco; ++i) |
| 8953 if (new_ScreenLinesC[i] == NULL) | |
| 8954 break; | |
| 7 | 8955 if (new_ScreenLines == NULL |
| 714 | 8956 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 8957 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 8958 || new_ScreenAttrs == NULL | |
| 8959 || new_LineOffset == NULL | |
| 8960 || new_LineWraps == NULL | |
| 671 | 8961 || new_TabPageIdxs == NULL |
| 7 | 8962 || outofmem) |
| 8963 { | |
| 944 | 8964 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 8965 { |
| 8966 /* guess the size */ | |
| 8967 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 8968 | |
| 8969 /* Remember we did this to avoid getting outofmem messages over | |
| 8970 * and over again. */ | |
| 944 | 8971 done_outofmem_msg = TRUE; |
| 534 | 8972 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8973 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8974 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 8975 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
|
8976 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
|
8977 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8978 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8979 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8980 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
8981 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 8982 } |
| 8983 else | |
| 8984 { | |
| 944 | 8985 done_outofmem_msg = FALSE; |
| 534 | 8986 |
| 7 | 8987 for (new_row = 0; new_row < Rows; ++new_row) |
| 8988 { | |
| 8989 new_LineOffset[new_row] = new_row * Columns; | |
| 8990 new_LineWraps[new_row] = FALSE; | |
| 8991 | |
| 8992 /* | |
| 8993 * If the screen is not going to be cleared, copy as much as | |
| 8994 * possible from the old screen to the new one and clear the rest | |
| 8995 * (used when resizing the window at the "--more--" prompt or when | |
| 8996 * executing an external command, for the GUI). | |
| 8997 */ | |
| 3263 | 8998 if (!doclear) |
| 7 | 8999 { |
| 9000 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9001 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9002 if (enc_utf8) | |
| 9003 { | |
| 9004 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9005 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9006 for (i = 0; i < p_mco; ++i) |
| 9007 (void)vim_memset(new_ScreenLinesC[i] | |
| 9008 + new_row * Columns, | |
| 7 | 9009 0, (size_t)Columns * sizeof(u8char_T)); |
| 9010 } | |
| 9011 if (enc_dbcs == DBCS_JPNU) | |
| 9012 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9013 0, (size_t)Columns * sizeof(schar_T)); | |
| 9014 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9015 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9016 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9017 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9018 { |
| 9019 if (screen_Columns < Columns) | |
| 9020 len = screen_Columns; | |
| 9021 else | |
| 9022 len = Columns; | |
| 571 | 9023 /* When switching to utf-8 don't copy characters, they |
| 714 | 9024 * may be invalid now. Also when p_mco changes. */ |
| 9025 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9026 && p_mco == Screen_mco) | |
| 26 | 9027 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9028 ScreenLines + LineOffset[old_row], | |
| 9029 (size_t)len * sizeof(schar_T)); | |
| 714 | 9030 if (enc_utf8 && ScreenLinesUC != NULL |
| 9031 && p_mco == Screen_mco) | |
| 7 | 9032 { |
| 9033 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9034 ScreenLinesUC + LineOffset[old_row], | |
| 9035 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9036 for (i = 0; i < p_mco; ++i) |
| 9037 mch_memmove(new_ScreenLinesC[i] | |
| 9038 + new_LineOffset[new_row], | |
| 9039 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9040 (size_t)len * sizeof(u8char_T)); |
| 9041 } | |
| 9042 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9043 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9044 ScreenLines2 + LineOffset[old_row], | |
| 9045 (size_t)len * sizeof(schar_T)); | |
| 9046 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9047 ScreenAttrs + LineOffset[old_row], | |
| 9048 (size_t)len * sizeof(sattr_T)); | |
| 9049 } | |
| 9050 } | |
| 9051 } | |
| 9052 /* Use the last line of the screen for the current line. */ | |
| 9053 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9054 } | |
| 9055 | |
| 356 | 9056 free_screenlines(); |
| 9057 | |
| 7 | 9058 ScreenLines = new_ScreenLines; |
| 9059 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9060 for (i = 0; i < p_mco; ++i) |
| 9061 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9062 Screen_mco = p_mco; | |
| 7 | 9063 ScreenLines2 = new_ScreenLines2; |
| 9064 ScreenAttrs = new_ScreenAttrs; | |
| 9065 LineOffset = new_LineOffset; | |
| 9066 LineWraps = new_LineWraps; | |
| 671 | 9067 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9068 |
| 9069 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9070 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9071 #ifdef FEAT_GUI | |
| 9072 old_Rows = screen_Rows; | |
| 9073 #endif | |
| 9074 screen_Rows = Rows; | |
| 9075 screen_Columns = Columns; | |
| 9076 | |
| 9077 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9078 if (doclear) |
| 7 | 9079 screenclear2(); |
| 9080 #ifdef FEAT_GUI | |
| 9081 else if (gui.in_use | |
| 9082 && !gui.starting | |
| 9083 && ScreenLines != NULL | |
| 9084 && old_Rows != Rows) | |
| 9085 { | |
| 9086 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9087 /* | |
| 9088 * Adjust the position of the cursor, for when executing an external | |
| 9089 * command. | |
| 9090 */ | |
| 9091 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9092 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9093 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9094 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9095 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9096 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9097 } | |
| 9098 #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
|
9099 clear_TabPageIdxs(); |
| 7 | 9100 |
| 9101 entered = FALSE; | |
| 911 | 9102 --RedrawingDisabled; |
| 766 | 9103 |
| 1824 | 9104 /* |
| 9105 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9106 * in case applying autocommands always changes Rows or Columns. | |
| 9107 */ | |
| 9108 if (starting == 0 && ++retry_count <= 3) | |
| 9109 { | |
| 766 | 9110 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9111 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9112 * jump back to check if we need to allocate the screen again. */ | |
| 9113 goto retry; | |
| 9114 } | |
| 7 | 9115 } |
| 9116 | |
| 9117 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9118 free_screenlines(void) |
| 356 | 9119 { |
| 714 | 9120 int i; |
| 9121 | |
| 356 | 9122 vim_free(ScreenLinesUC); |
| 714 | 9123 for (i = 0; i < Screen_mco; ++i) |
| 9124 vim_free(ScreenLinesC[i]); | |
| 356 | 9125 vim_free(ScreenLines2); |
| 714 | 9126 vim_free(ScreenLines); |
| 356 | 9127 vim_free(ScreenAttrs); |
| 9128 vim_free(LineOffset); | |
| 9129 vim_free(LineWraps); | |
| 671 | 9130 vim_free(TabPageIdxs); |
| 356 | 9131 } |
| 9132 | |
| 9133 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9134 screenclear(void) |
| 7 | 9135 { |
| 9136 check_for_delay(FALSE); | |
| 9137 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9138 screenclear2(); /* clear the screen */ | |
| 9139 } | |
| 9140 | |
| 9141 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9142 screenclear2(void) |
| 7 | 9143 { |
| 9144 int i; | |
| 9145 | |
| 9146 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9147 #ifdef FEAT_GUI | |
| 9148 || (gui.in_use && gui.starting) | |
| 9149 #endif | |
| 9150 ) | |
| 9151 return; | |
| 9152 | |
| 9153 #ifdef FEAT_GUI | |
| 9154 if (!gui.in_use) | |
| 9155 #endif | |
| 9156 screen_attr = -1; /* force setting the Normal colors */ | |
| 9157 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9158 | |
| 9159 #ifdef FEAT_CLIPBOARD | |
| 9160 /* disable selection without redrawing it */ | |
| 9161 clip_scroll_selection(9999); | |
| 9162 #endif | |
| 9163 | |
| 9164 /* blank out ScreenLines */ | |
| 9165 for (i = 0; i < Rows; ++i) | |
| 9166 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9167 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9168 LineWraps[i] = FALSE; |
| 9169 } | |
| 9170 | |
| 9171 if (can_clear(T_CL)) | |
| 9172 { | |
| 9173 out_str(T_CL); /* clear the display */ | |
| 9174 clear_cmdline = FALSE; | |
| 644 | 9175 mode_displayed = FALSE; |
| 7 | 9176 } |
| 9177 else | |
| 9178 { | |
| 9179 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9180 for (i = 0; i < Rows; ++i) | |
| 9181 lineinvalid(LineOffset[i], (int)Columns); | |
| 9182 clear_cmdline = TRUE; | |
| 9183 } | |
| 9184 | |
| 9185 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9186 | |
| 9187 win_rest_invalid(firstwin); | |
| 9188 redraw_cmdline = TRUE; | |
| 673 | 9189 redraw_tabline = TRUE; |
| 7 | 9190 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9191 must_redraw = NOT_VALID; | |
| 9192 compute_cmdrow(); | |
| 9193 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9194 msg_col = 0; | |
| 9195 screen_start(); /* don't know where cursor is now */ | |
| 9196 msg_scrolled = 0; /* can't scroll back */ | |
| 9197 msg_didany = FALSE; | |
| 9198 msg_didout = FALSE; | |
| 9199 } | |
| 9200 | |
| 9201 /* | |
| 9202 * Clear one line in ScreenLines. | |
| 9203 */ | |
| 9204 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9205 lineclear(unsigned off, int width, int attr) |
| 7 | 9206 { |
| 9207 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9208 if (enc_utf8) | |
| 9209 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9210 (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
|
9211 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9212 } |
| 9213 | |
| 9214 /* | |
| 9215 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9216 * invalid value. | |
| 9217 */ | |
| 9218 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9219 lineinvalid(unsigned off, int width) |
| 7 | 9220 { |
| 9221 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9222 } | |
| 9223 | |
| 9224 /* | |
| 9225 * Copy part of a Screenline for vertically split window "wp". | |
| 9226 */ | |
| 9227 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9228 linecopy(int to, int from, win_T *wp) |
| 7 | 9229 { |
| 9230 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9231 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9232 | |
| 9233 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9234 wp->w_width * sizeof(schar_T)); | |
| 9235 if (enc_utf8) | |
| 9236 { | |
| 714 | 9237 int i; |
| 9238 | |
| 7 | 9239 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9240 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9241 for (i = 0; i < p_mco; ++i) |
| 9242 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9243 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9244 } |
| 9245 if (enc_dbcs == DBCS_JPNU) | |
| 9246 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9247 wp->w_width * sizeof(schar_T)); | |
| 9248 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9249 wp->w_width * sizeof(sattr_T)); | |
| 9250 } | |
| 9251 | |
| 9252 /* | |
| 9253 * Return TRUE if clearing with term string "p" would work. | |
| 9254 * It can't work when the string is empty or it won't set the right background. | |
| 9255 */ | |
| 9256 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9257 can_clear(char_u *p) |
| 7 | 9258 { |
| 9259 return (*p != NUL && (t_colors <= 1 | |
| 9260 #ifdef FEAT_GUI | |
| 9261 || gui.in_use | |
| 9262 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9263 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9264 || (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
|
9265 || (!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
|
9266 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9267 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9268 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9269 || *T_UT != NUL)); |
| 7 | 9270 } |
| 9271 | |
| 9272 /* | |
| 9273 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9274 * something directly to the screen (shell commands) or a terminal control | |
| 9275 * code. | |
| 9276 */ | |
| 9277 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9278 screen_start(void) |
| 7 | 9279 { |
| 9280 screen_cur_row = screen_cur_col = 9999; | |
| 9281 } | |
| 9282 | |
| 9283 /* | |
| 9284 * Move the cursor to position "row","col" in the screen. | |
| 9285 * This tries to find the most efficient way to move, minimizing the number of | |
| 9286 * characters sent to the terminal. | |
| 9287 */ | |
| 9288 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9289 windgoto(int row, int col) |
| 7 | 9290 { |
| 205 | 9291 sattr_T *p; |
| 7 | 9292 int i; |
| 9293 int plan; | |
| 9294 int cost; | |
| 9295 int wouldbe_col; | |
| 9296 int noinvcurs; | |
| 9297 char_u *bs; | |
| 9298 int goto_cost; | |
| 9299 int attr; | |
| 9300 | |
| 1213 | 9301 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9302 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9303 | |
| 9304 #define PLAN_LE 1 | |
| 9305 #define PLAN_CR 2 | |
| 9306 #define PLAN_NL 3 | |
| 9307 #define PLAN_WRITE 4 | |
| 9308 /* Can't use ScreenLines unless initialized */ | |
| 9309 if (ScreenLines == NULL) | |
| 9310 return; | |
| 9311 | |
| 9312 if (col != screen_cur_col || row != screen_cur_row) | |
| 9313 { | |
| 9314 /* Check for valid position. */ | |
| 9315 if (row < 0) /* window without text lines? */ | |
| 9316 row = 0; | |
| 9317 if (row >= screen_Rows) | |
| 9318 row = screen_Rows - 1; | |
| 9319 if (col >= screen_Columns) | |
| 9320 col = screen_Columns - 1; | |
| 9321 | |
| 9322 /* check if no cursor movement is allowed in highlight mode */ | |
| 9323 if (screen_attr && *T_MS == NUL) | |
| 9324 noinvcurs = HIGHL_COST; | |
| 9325 else | |
| 9326 noinvcurs = 0; | |
| 9327 goto_cost = GOTO_COST + noinvcurs; | |
| 9328 | |
| 9329 /* | |
| 9330 * Plan how to do the positioning: | |
| 9331 * 1. Use CR to move it to column 0, same row. | |
| 9332 * 2. Use T_LE to move it a few columns to the left. | |
| 9333 * 3. Use NL to move a few lines down, column 0. | |
| 9334 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9335 * | |
| 9336 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9337 * position is unknown then (some terminals wrap, some don't ) | |
| 9338 * | |
| 1213 | 9339 * First check if the highlighting attributes allow us to write |
| 7 | 9340 * characters to move the cursor to the right. |
| 9341 */ | |
| 9342 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9343 { | |
| 9344 /* | |
| 9345 * If the cursor is in the same row, bigger col, we can use CR | |
| 9346 * or T_LE. | |
| 9347 */ | |
| 9348 bs = NULL; /* init for GCC */ | |
| 9349 attr = screen_attr; | |
| 9350 if (row == screen_cur_row && col < screen_cur_col) | |
| 9351 { | |
| 9352 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9353 if (*T_LE) | |
| 9354 bs = T_LE; /* "cursor left" */ | |
| 9355 else | |
| 9356 bs = T_BC; /* "backspace character (old) */ | |
| 9357 if (*bs) | |
| 9358 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9359 else | |
| 9360 cost = 999; | |
| 9361 if (col + 1 < cost) /* using CR is less characters */ | |
| 9362 { | |
| 9363 plan = PLAN_CR; | |
| 9364 wouldbe_col = 0; | |
| 9365 cost = 1; /* CR is just one character */ | |
| 9366 } | |
| 9367 else | |
| 9368 { | |
| 9369 plan = PLAN_LE; | |
| 9370 wouldbe_col = col; | |
| 9371 } | |
| 9372 if (noinvcurs) /* will stop highlighting */ | |
| 9373 { | |
| 9374 cost += noinvcurs; | |
| 9375 attr = 0; | |
| 9376 } | |
| 9377 } | |
| 9378 | |
| 9379 /* | |
| 9380 * If the cursor is above where we want to be, we can use CR LF. | |
| 9381 */ | |
| 9382 else if (row > screen_cur_row) | |
| 9383 { | |
| 9384 plan = PLAN_NL; | |
| 9385 wouldbe_col = 0; | |
| 9386 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9387 if (noinvcurs) /* will stop highlighting */ | |
| 9388 { | |
| 9389 cost += noinvcurs; | |
| 9390 attr = 0; | |
| 9391 } | |
| 9392 } | |
| 9393 | |
| 9394 /* | |
| 9395 * If the cursor is in the same row, smaller col, just use write. | |
| 9396 */ | |
| 9397 else | |
| 9398 { | |
| 9399 plan = PLAN_WRITE; | |
| 9400 wouldbe_col = screen_cur_col; | |
| 9401 cost = 0; | |
| 9402 } | |
| 9403 | |
| 9404 /* | |
| 9405 * Check if any characters that need to be written have the | |
| 9406 * correct attributes. Also avoid UTF-8 characters. | |
| 9407 */ | |
| 9408 i = col - wouldbe_col; | |
| 9409 if (i > 0) | |
| 9410 cost += i; | |
| 9411 if (cost < goto_cost && i > 0) | |
| 9412 { | |
| 9413 /* | |
| 9414 * Check if the attributes are correct without additionally | |
| 9415 * stopping highlighting. | |
| 9416 */ | |
| 9417 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9418 while (i && *p++ == attr) | |
| 9419 --i; | |
| 9420 if (i != 0) | |
| 9421 { | |
| 9422 /* | |
| 9423 * Try if it works when highlighting is stopped here. | |
| 9424 */ | |
| 9425 if (*--p == 0) | |
| 9426 { | |
| 9427 cost += noinvcurs; | |
| 9428 while (i && *p++ == 0) | |
| 9429 --i; | |
| 9430 } | |
| 9431 if (i != 0) | |
| 9432 cost = 999; /* different attributes, don't do it */ | |
| 9433 } | |
| 9434 if (enc_utf8) | |
| 9435 { | |
| 9436 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9437 for (i = wouldbe_col; i < col; ++i) | |
| 9438 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9439 { | |
| 9440 cost = 999; | |
| 9441 break; | |
| 9442 } | |
| 9443 } | |
| 9444 } | |
| 9445 | |
| 9446 /* | |
| 9447 * We can do it without term_windgoto()! | |
| 9448 */ | |
| 9449 if (cost < goto_cost) | |
| 9450 { | |
| 9451 if (plan == PLAN_LE) | |
| 9452 { | |
| 9453 if (noinvcurs) | |
| 9454 screen_stop_highlight(); | |
| 9455 while (screen_cur_col > col) | |
| 9456 { | |
| 9457 out_str(bs); | |
| 9458 --screen_cur_col; | |
| 9459 } | |
| 9460 } | |
| 9461 else if (plan == PLAN_CR) | |
| 9462 { | |
| 9463 if (noinvcurs) | |
| 9464 screen_stop_highlight(); | |
| 9465 out_char('\r'); | |
| 9466 screen_cur_col = 0; | |
| 9467 } | |
| 9468 else if (plan == PLAN_NL) | |
| 9469 { | |
| 9470 if (noinvcurs) | |
| 9471 screen_stop_highlight(); | |
| 9472 while (screen_cur_row < row) | |
| 9473 { | |
| 9474 out_char('\n'); | |
| 9475 ++screen_cur_row; | |
| 9476 } | |
| 9477 screen_cur_col = 0; | |
| 9478 } | |
| 9479 | |
| 9480 i = col - screen_cur_col; | |
| 9481 if (i > 0) | |
| 9482 { | |
| 9483 /* | |
| 9484 * Use cursor-right if it's one character only. Avoids | |
| 9485 * removing a line of pixels from the last bold char, when | |
| 9486 * using the bold trick in the GUI. | |
| 9487 */ | |
| 9488 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9489 { | |
| 9490 while (i-- > 0) | |
| 9491 out_char(*T_ND); | |
| 9492 } | |
| 9493 else | |
| 9494 { | |
| 9495 int off; | |
| 9496 | |
| 9497 off = LineOffset[row] + screen_cur_col; | |
| 9498 while (i-- > 0) | |
| 9499 { | |
| 9500 if (ScreenAttrs[off] != screen_attr) | |
| 9501 screen_stop_highlight(); | |
| 9502 out_flush_check(); | |
| 9503 out_char(ScreenLines[off]); | |
| 9504 if (enc_dbcs == DBCS_JPNU | |
| 9505 && ScreenLines[off] == 0x8e) | |
| 9506 out_char(ScreenLines2[off]); | |
| 9507 ++off; | |
| 9508 } | |
| 9509 } | |
| 9510 } | |
| 9511 } | |
| 9512 } | |
| 9513 else | |
| 9514 cost = 999; | |
| 9515 | |
| 9516 if (cost >= goto_cost) | |
| 9517 { | |
| 9518 if (noinvcurs) | |
| 9519 screen_stop_highlight(); | |
| 5995 | 9520 if (row == screen_cur_row && (col > screen_cur_col) |
| 9521 && *T_CRI != NUL) | |
| 7 | 9522 term_cursor_right(col - screen_cur_col); |
| 9523 else | |
| 9524 term_windgoto(row, col); | |
| 9525 } | |
| 9526 screen_cur_row = row; | |
| 9527 screen_cur_col = col; | |
| 9528 } | |
| 9529 } | |
| 9530 | |
| 9531 /* | |
| 9532 * Set cursor to its position in the current window. | |
| 9533 */ | |
| 9534 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9535 setcursor(void) |
| 7 | 9536 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9537 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
|
9538 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9539 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9540 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9541 * 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
|
9542 * 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
|
9543 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9544 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9545 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
|
9546 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9547 if (force || redrawing()) |
| 7 | 9548 { |
| 9549 validate_cursor(); | |
| 9550 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
|
9551 curwin->w_wincol + ( |
| 7 | 9552 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9553 /* With 'rightleft' set and the cursor on a double-wide |
| 9554 * 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
|
9555 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
|
9556 - ((has_mbyte |
| 1545 | 9557 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9558 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9559 #endif |
| 9560 curwin->w_wcol)); | |
| 9561 } | |
| 9562 } | |
| 9563 | |
| 9564 | |
| 9565 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9566 * 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
|
9567 * 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
|
9568 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9569 * scrolling. |
| 9570 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9571 */ | |
| 9572 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9573 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9574 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9575 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9576 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9577 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9578 int mayclear) |
| 7 | 9579 { |
| 9580 int did_delete; | |
| 9581 int nextrow; | |
| 9582 int lastrow; | |
| 9583 int retval; | |
| 9584 | |
| 9585 if (invalid) | |
| 9586 wp->w_lines_valid = 0; | |
| 9587 | |
| 9588 if (wp->w_height < 5) | |
| 9589 return FAIL; | |
| 9590 | |
| 9591 if (line_count > wp->w_height - row) | |
| 9592 line_count = wp->w_height - row; | |
| 9593 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9594 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9595 if (retval != MAYBE) |
| 9596 return retval; | |
| 9597 | |
| 9598 /* | |
| 9599 * If there is a next window or a status line, we first try to delete the | |
| 9600 * lines at the bottom to avoid messing what is after the window. | |
| 9601 * If this fails and there are following windows, don't do anything to avoid | |
| 9602 * messing up those windows, better just redraw. | |
| 9603 */ | |
| 9604 did_delete = FALSE; | |
| 9605 if (wp->w_next != NULL || wp->w_status_height) | |
| 9606 { | |
| 9607 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
|
9608 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9609 did_delete = TRUE; |
| 9610 else if (wp->w_next) | |
| 9611 return FAIL; | |
| 9612 } | |
| 9613 /* | |
| 9614 * if no lines deleted, blank the lines that will end up below the window | |
| 9615 */ | |
| 9616 if (!did_delete) | |
| 9617 { | |
| 9618 wp->w_redr_status = TRUE; | |
| 9619 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
|
9620 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9621 lastrow = nextrow + line_count; |
| 9622 if (lastrow > Rows) | |
| 9623 lastrow = Rows; | |
| 9624 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
|
9625 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9626 ' ', ' ', 0); |
| 9627 } | |
| 9628 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9629 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9630 == FAIL) |
| 9631 { | |
| 9632 /* deletion will have messed up other windows */ | |
| 9633 if (did_delete) | |
| 9634 { | |
| 9635 wp->w_redr_status = TRUE; | |
| 9636 win_rest_invalid(W_NEXT(wp)); | |
| 9637 } | |
| 9638 return FAIL; | |
| 9639 } | |
| 9640 | |
| 9641 return OK; | |
| 9642 } | |
| 9643 | |
| 9644 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9645 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9646 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9647 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9648 * scrolling | |
| 9649 * Return OK for success, FAIL if the lines are not deleted. | |
| 9650 */ | |
| 9651 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9652 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9653 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9654 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9655 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9656 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9657 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9658 int clear_attr) /* for clearing lines */ |
| 7 | 9659 { |
| 9660 int retval; | |
| 9661 | |
| 9662 if (invalid) | |
| 9663 wp->w_lines_valid = 0; | |
| 9664 | |
| 9665 if (line_count > wp->w_height - row) | |
| 9666 line_count = wp->w_height - row; | |
| 9667 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9668 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9669 if (retval != MAYBE) |
| 9670 return retval; | |
| 9671 | |
| 9672 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
|
9673 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9674 return FAIL; |
| 9675 | |
| 9676 /* | |
| 9677 * If there are windows or status lines below, try to put them at the | |
| 9678 * correct place. If we can't do that, they have to be redrawn. | |
| 9679 */ | |
| 9680 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9681 { | |
| 9682 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
|
9683 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9684 { |
| 9685 wp->w_redr_status = TRUE; | |
| 9686 win_rest_invalid(wp->w_next); | |
| 9687 } | |
| 9688 } | |
| 9689 /* | |
| 9690 * If this is the last window and there is no status line, redraw the | |
| 9691 * command line later. | |
| 9692 */ | |
| 9693 else | |
| 9694 redraw_cmdline = TRUE; | |
| 9695 return OK; | |
| 9696 } | |
| 9697 | |
| 9698 /* | |
| 9699 * Common code for win_ins_lines() and win_del_lines(). | |
| 9700 * Returns OK or FAIL when the work has been done. | |
| 9701 * Returns MAYBE when not finished yet. | |
| 9702 */ | |
| 9703 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9704 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9705 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9706 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9707 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9708 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9709 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9710 int clear_attr) |
| 7 | 9711 { |
| 9712 int retval; | |
| 9713 | |
| 9714 if (!redrawing() || line_count <= 0) | |
| 9715 return FAIL; | |
| 9716 | |
|
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
|
9717 /* 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
|
9718 * 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
|
9719 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
|
9720 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
|
9721 |
| 7 | 9722 /* 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
|
9723 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9724 { |
|
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
|
9725 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
|
9726 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9727 return FAIL; |
| 9728 } | |
| 9729 | |
| 9730 /* | |
| 9731 * Delete all remaining lines | |
| 9732 */ | |
| 9733 if (row + line_count >= wp->w_height) | |
| 9734 { | |
| 9735 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
|
9736 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9737 ' ', ' ', 0); |
| 9738 return OK; | |
| 9739 } | |
| 9740 | |
| 9741 /* | |
|
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
|
9742 * When scrolling, the message on the command line should be cleared, |
| 7 | 9743 * 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
|
9744 * Don't do this when avoiding to insert lines. |
| 7 | 9745 */ |
|
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
|
9746 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
|
9747 clear_cmdline = TRUE; |
| 7 | 9748 |
| 9749 /* | |
| 9750 * If the terminal can set a scroll region, use that. | |
| 9751 * Always do this in a vertically split window. This will redraw from | |
| 9752 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9753 * win_line(). | |
| 9754 * 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
|
9755 * 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
|
9756 * scroll-up . |
| 7 | 9757 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9758 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
|
9759 { |
| 7 | 9760 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9761 scroll_region_set(wp, row); | |
| 9762 if (del) | |
| 9763 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
|
9764 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9765 else |
| 9766 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
|
9767 wp->w_height - row, clear_attr, wp); |
| 7 | 9768 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9769 scroll_region_reset(); | |
| 9770 return retval; | |
| 9771 } | |
| 9772 | |
| 9773 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9774 return FAIL; | |
| 9775 | |
| 9776 return MAYBE; | |
| 9777 } | |
| 9778 | |
| 9779 /* | |
| 9780 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9781 */ | |
| 9782 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9783 win_rest_invalid(win_T *wp) |
| 7 | 9784 { |
| 9785 while (wp != NULL) | |
| 9786 { | |
| 9787 redraw_win_later(wp, NOT_VALID); | |
| 9788 wp->w_redr_status = TRUE; | |
| 9789 wp = wp->w_next; | |
| 9790 } | |
| 9791 redraw_cmdline = TRUE; | |
| 9792 } | |
| 9793 | |
| 9794 /* | |
| 9795 * The rest of the routines in this file perform screen manipulations. The | |
| 9796 * given operation is performed physically on the screen. The corresponding | |
| 9797 * change is also made to the internal screen image. In this way, the editor | |
| 9798 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9799 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9800 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9801 * screen changes, and in the meantime, everything still works. | |
| 9802 */ | |
| 9803 | |
| 9804 /* | |
| 9805 * types for inserting or deleting lines | |
| 9806 */ | |
| 9807 #define USE_T_CAL 1 | |
| 9808 #define USE_T_CDL 2 | |
| 9809 #define USE_T_AL 3 | |
| 9810 #define USE_T_CE 4 | |
| 9811 #define USE_T_DL 5 | |
| 9812 #define USE_T_SR 6 | |
| 9813 #define USE_NL 7 | |
| 9814 #define USE_T_CD 8 | |
| 9815 #define USE_REDRAW 9 | |
| 9816 | |
| 9817 /* | |
| 9818 * insert lines on the screen and update ScreenLines[] | |
| 9819 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9820 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9821 * 'row' and 'end' are relative to the start of the region. | |
| 9822 * | |
| 9823 * return FAIL for failure, OK for success. | |
| 9824 */ | |
| 446 | 9825 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9826 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9827 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9828 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9829 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9830 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9831 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9832 win_T *wp) /* NULL or window to use width from */ |
| 7 | 9833 { |
| 9834 int i; | |
| 9835 int j; | |
| 9836 unsigned temp; | |
| 9837 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9838 int cursor_col = 0; |
| 7 | 9839 int type; |
| 9840 int result_empty; | |
| 9841 int can_ce = can_clear(T_CE); | |
| 9842 | |
| 9843 /* | |
| 9844 * FAIL if | |
| 9845 * - there is no valid screen | |
| 9846 * - the screen has to be redrawn completely | |
| 9847 * - the line count is less than one | |
| 9848 * - 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
|
9849 * - redrawing for a callback and there is a modeless selection |
| 7 | 9850 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9851 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
|
9852 #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
|
9853 || (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
|
9854 && 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
|
9855 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
9856 ) |
| 7 | 9857 return FAIL; |
| 9858 | |
| 9859 /* | |
| 9860 * There are seven ways to insert lines: | |
| 9861 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 9862 * characters from ScreenLines[]. | |
| 9863 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 9864 * the insert is just empty lines | |
| 9865 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 9866 * present or line_count > 1. It looks better if we do all the inserts | |
| 9867 * at once. | |
| 9868 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 9869 * insert is just empty lines and T_CE is not present or line_count > | |
| 9870 * 1. | |
| 9871 * 4. Use T_AL (insert line) if it exists. | |
| 9872 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 9873 * just empty lines. | |
| 9874 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 9875 * just empty lines. | |
| 9876 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 9877 * the 'da' flag is not set or we have clear line capability. | |
| 9878 * 8. redraw the characters from ScreenLines[]. | |
| 9879 * | |
| 9880 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 9881 * the scrollbar for the window. It does have insert line, use that if it | |
| 9882 * exists. | |
| 9883 */ | |
| 9884 result_empty = (row + line_count >= end); | |
| 9885 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 9886 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
|
9887 else if (can_clear(T_CD) && result_empty) |
| 7 | 9888 type = USE_T_CD; |
| 9889 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 9890 type = USE_T_CAL; | |
| 9891 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 9892 type = USE_T_CDL; | |
| 9893 else if (*T_AL != NUL) | |
| 9894 type = USE_T_AL; | |
| 9895 else if (can_ce && result_empty) | |
| 9896 type = USE_T_CE; | |
| 9897 else if (*T_DL != NUL && result_empty) | |
| 9898 type = USE_T_DL; | |
| 9899 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 9900 type = USE_T_SR; | |
| 9901 else | |
| 9902 return FAIL; | |
| 9903 | |
| 9904 /* | |
| 9905 * For clearing the lines screen_del_lines() is used. This will also take | |
| 9906 * care of t_db if necessary. | |
| 9907 */ | |
| 9908 if (type == USE_T_CD || type == USE_T_CDL || | |
| 9909 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
|
9910 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 9911 |
| 9912 /* | |
| 9913 * If text is retained below the screen, first clear or delete as many | |
| 9914 * lines at the bottom of the window as are about to be inserted so that | |
| 9915 * the deleted lines won't later surface during a screen_del_lines. | |
| 9916 */ | |
| 9917 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
|
9918 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 9919 |
| 9920 #ifdef FEAT_CLIPBOARD | |
| 9921 /* Remove a modeless selection when inserting lines halfway the screen | |
| 9922 * 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
|
9923 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 9924 clip_clear_selection(&clip_star); |
| 7 | 9925 else |
| 9926 clip_scroll_selection(-line_count); | |
| 9927 #endif | |
| 9928 | |
| 9929 #ifdef FEAT_GUI | |
| 9930 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 9931 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
9932 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 9933 #endif |
| 9934 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9935 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
|
9936 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
|
9937 |
| 7 | 9938 if (*T_CCS != NUL) /* cursor relative to region */ |
| 9939 cursor_row = row; | |
| 9940 else | |
| 9941 cursor_row = row + off; | |
| 9942 | |
| 9943 /* | |
| 9944 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 9945 * Clear the inserted lines in ScreenLines[]. | |
| 9946 */ | |
| 9947 row += off; | |
| 9948 end += off; | |
| 9949 for (i = 0; i < line_count; ++i) | |
| 9950 { | |
| 9951 if (wp != NULL && wp->w_width != Columns) | |
| 9952 { | |
| 9953 /* need to copy part of a line */ | |
| 9954 j = end - 1 - i; | |
| 9955 while ((j -= line_count) >= row) | |
| 9956 linecopy(j + line_count, j, wp); | |
| 9957 j += line_count; | |
| 9958 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
|
9959 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
|
9960 clear_attr); |
| 7 | 9961 else |
| 9962 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 9963 LineWraps[j] = FALSE; | |
| 9964 } | |
| 9965 else | |
| 9966 { | |
| 9967 j = end - 1 - i; | |
| 9968 temp = LineOffset[j]; | |
| 9969 while ((j -= line_count) >= row) | |
| 9970 { | |
| 9971 LineOffset[j + line_count] = LineOffset[j]; | |
| 9972 LineWraps[j + line_count] = LineWraps[j]; | |
| 9973 } | |
| 9974 LineOffset[j + line_count] = temp; | |
| 9975 LineWraps[j + line_count] = FALSE; | |
| 9976 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
|
9977 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 9978 else |
| 9979 lineinvalid(temp, (int)Columns); | |
| 9980 } | |
| 9981 } | |
| 9982 | |
| 9983 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
9984 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
|
9985 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
|
9986 screen_start_highlight(clear_attr); |
| 7 | 9987 |
| 9988 /* redraw the characters */ | |
| 9989 if (type == USE_REDRAW) | |
| 9990 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
|
9991 else if (type == USE_T_CAL) |
| 7 | 9992 { |
| 9993 term_append_lines(line_count); | |
| 9994 screen_start(); /* don't know where cursor is now */ | |
| 9995 } | |
| 9996 else | |
| 9997 { | |
| 9998 for (i = 0; i < line_count; i++) | |
| 9999 { | |
| 10000 if (type == USE_T_AL) | |
| 10001 { | |
| 10002 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
|
10003 windgoto(cursor_row, cursor_col); |
| 7 | 10004 out_str(T_AL); |
| 10005 } | |
| 10006 else /* type == USE_T_SR */ | |
| 10007 out_str(T_SR); | |
| 10008 screen_start(); /* don't know where cursor is now */ | |
| 10009 } | |
| 10010 } | |
| 10011 | |
| 10012 /* | |
| 10013 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10014 * have been scrolled down into the region. | |
| 10015 */ | |
| 10016 if (type == USE_T_SR && *T_DA) | |
| 10017 { | |
| 10018 for (i = 0; i < line_count; ++i) | |
| 10019 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10020 windgoto(off + i, cursor_col); |
| 7 | 10021 out_str(T_CE); |
| 10022 screen_start(); /* don't know where cursor is now */ | |
| 10023 } | |
| 10024 } | |
| 10025 | |
| 10026 #ifdef FEAT_GUI | |
| 10027 gui_can_update_cursor(); | |
| 10028 if (gui.in_use) | |
| 10029 out_flush(); /* always flush after a scroll */ | |
| 10030 #endif | |
| 10031 return OK; | |
| 10032 } | |
| 10033 | |
| 10034 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10035 * 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
|
10036 * "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
|
10037 * 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
|
10038 * "row" and "end" are relative to the start of the region. |
| 7 | 10039 * |
| 10040 * Return OK for success, FAIL if the lines are not deleted. | |
| 10041 */ | |
| 10042 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10043 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10044 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10045 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10046 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10047 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10048 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
|
10049 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
|
10050 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10051 { |
| 10052 int j; | |
| 10053 int i; | |
| 10054 unsigned temp; | |
| 10055 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10056 int cursor_col = 0; |
| 7 | 10057 int cursor_end; |
| 10058 int result_empty; /* result is empty until end of region */ | |
| 10059 int can_delete; /* deleting line codes can be used */ | |
| 10060 int type; | |
| 10061 | |
| 10062 /* | |
| 10063 * FAIL if | |
| 10064 * - there is no valid screen | |
| 10065 * - the screen has to be redrawn completely | |
| 10066 * - the line count is less than one | |
| 10067 * - 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
|
10068 * - redrawing for a callback and there is a modeless selection |
| 7 | 10069 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10070 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
|
10071 || (!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
|
10072 #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
|
10073 || (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
|
10074 && 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
|
10075 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10076 ) |
| 7 | 10077 return FAIL; |
| 10078 | |
| 10079 /* | |
| 10080 * Check if the rest of the current region will become empty. | |
| 10081 */ | |
| 10082 result_empty = row + line_count >= end; | |
| 10083 | |
| 10084 /* | |
| 10085 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10086 * available. | |
| 10087 */ | |
| 10088 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10089 | |
| 10090 /* | |
| 10091 * There are six ways to delete lines: | |
| 10092 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10093 * characters from ScreenLines[]. | |
| 10094 * 1. Use T_CD if it exists and the result is empty. | |
| 10095 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10096 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10097 * none of the other ways work. | |
| 10098 * 4. Use T_CE (erase line) if the result is empty. | |
| 10099 * 5. Use T_DL (delete line) if it exists. | |
| 10100 * 6. redraw the characters from ScreenLines[]. | |
| 10101 */ | |
| 10102 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10103 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
|
10104 else if (can_clear(T_CD) && result_empty) |
| 7 | 10105 type = USE_T_CD; |
| 10106 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10107 /* | |
| 10108 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10109 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10110 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10111 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10112 * the trick... | |
| 10113 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10114 * (Olaf Seibert) | |
| 10115 */ | |
| 10116 else if (row == 0 && T_DB == empty_option | |
| 10117 && (line_count == 1 || *T_CDL == NUL)) | |
| 10118 #else | |
| 10119 else if (row == 0 && ( | |
| 10120 #ifndef AMIGA | |
| 10121 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10122 * up, so use delete-line command */ | |
| 10123 line_count == 1 || | |
| 10124 #endif | |
| 10125 *T_CDL == NUL)) | |
| 10126 #endif | |
| 10127 type = USE_NL; | |
| 10128 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10129 type = USE_T_CDL; | |
| 10130 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
|
10131 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10132 type = USE_T_CE; |
| 10133 else if (*T_DL != NUL && can_delete) | |
| 10134 type = USE_T_DL; | |
| 10135 else if (*T_CDL != NUL && can_delete) | |
| 10136 type = USE_T_CDL; | |
| 10137 else | |
| 10138 return FAIL; | |
| 10139 | |
| 10140 #ifdef FEAT_CLIPBOARD | |
| 10141 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10142 * 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
|
10143 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10144 clip_clear_selection(&clip_star); |
| 7 | 10145 else |
| 10146 clip_scroll_selection(line_count); | |
| 10147 #endif | |
| 10148 | |
| 10149 #ifdef FEAT_GUI | |
| 10150 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10151 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10152 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
|
10153 && gui.cursor_row < end + off); |
| 7 | 10154 #endif |
| 10155 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10156 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
|
10157 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
|
10158 |
| 7 | 10159 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10160 { | |
| 10161 cursor_row = row; | |
| 10162 cursor_end = end; | |
| 10163 } | |
| 10164 else | |
| 10165 { | |
| 10166 cursor_row = row + off; | |
| 10167 cursor_end = end + off; | |
| 10168 } | |
| 10169 | |
| 10170 /* | |
| 10171 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10172 * Clear the inserted lines in ScreenLines[]. | |
| 10173 */ | |
| 10174 row += off; | |
| 10175 end += off; | |
| 10176 for (i = 0; i < line_count; ++i) | |
| 10177 { | |
| 10178 if (wp != NULL && wp->w_width != Columns) | |
| 10179 { | |
| 10180 /* need to copy part of a line */ | |
| 10181 j = row + i; | |
| 10182 while ((j += line_count) <= end - 1) | |
| 10183 linecopy(j - line_count, j, wp); | |
| 10184 j -= line_count; | |
| 10185 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
|
10186 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
|
10187 clear_attr); |
| 7 | 10188 else |
| 10189 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10190 LineWraps[j] = FALSE; | |
| 10191 } | |
| 10192 else | |
| 10193 { | |
| 10194 /* whole width, moving the line pointers is faster */ | |
| 10195 j = row + i; | |
| 10196 temp = LineOffset[j]; | |
| 10197 while ((j += line_count) <= end - 1) | |
| 10198 { | |
| 10199 LineOffset[j - line_count] = LineOffset[j]; | |
| 10200 LineWraps[j - line_count] = LineWraps[j]; | |
| 10201 } | |
| 10202 LineOffset[j - line_count] = temp; | |
| 10203 LineWraps[j - line_count] = FALSE; | |
| 10204 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
|
10205 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10206 else |
| 10207 lineinvalid(temp, (int)Columns); | |
| 10208 } | |
| 10209 } | |
| 10210 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10211 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
|
10212 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10213 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
|
10214 screen_start_highlight(clear_attr); |
| 7 | 10215 |
| 10216 /* redraw the characters */ | |
| 10217 if (type == USE_REDRAW) | |
| 10218 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
|
10219 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10220 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10221 windgoto(cursor_row, cursor_col); |
| 7 | 10222 out_str(T_CD); |
| 10223 screen_start(); /* don't know where cursor is now */ | |
| 10224 } | |
| 10225 else if (type == USE_T_CDL) | |
| 10226 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10227 windgoto(cursor_row, cursor_col); |
| 7 | 10228 term_delete_lines(line_count); |
| 10229 screen_start(); /* don't know where cursor is now */ | |
| 10230 } | |
| 10231 /* | |
| 10232 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10233 * the whole screen (scroll region) up by outputting newlines on the | |
| 10234 * last line. | |
| 10235 */ | |
| 10236 else if (type == USE_NL) | |
| 10237 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10238 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10239 for (i = line_count; --i >= 0; ) |
| 10240 out_char('\n'); /* cursor will remain on same line */ | |
| 10241 } | |
| 10242 else | |
| 10243 { | |
| 10244 for (i = line_count; --i >= 0; ) | |
| 10245 { | |
| 10246 if (type == USE_T_DL) | |
| 10247 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10248 windgoto(cursor_row, cursor_col); |
| 7 | 10249 out_str(T_DL); /* delete a line */ |
| 10250 } | |
| 10251 else /* type == USE_T_CE */ | |
| 10252 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10253 windgoto(cursor_row + i, cursor_col); |
| 7 | 10254 out_str(T_CE); /* erase a line */ |
| 10255 } | |
| 10256 screen_start(); /* don't know where cursor is now */ | |
| 10257 } | |
| 10258 } | |
| 10259 | |
| 10260 /* | |
| 10261 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10262 * scrolled up at the bottom of the region. | |
| 10263 */ | |
| 10264 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10265 { | |
| 10266 for (i = line_count; i > 0; --i) | |
| 10267 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10268 windgoto(cursor_end - i, cursor_col); |
| 7 | 10269 out_str(T_CE); /* erase a line */ |
| 10270 screen_start(); /* don't know where cursor is now */ | |
| 10271 } | |
| 10272 } | |
| 10273 | |
| 10274 #ifdef FEAT_GUI | |
| 10275 gui_can_update_cursor(); | |
| 10276 if (gui.in_use) | |
| 10277 out_flush(); /* always flush after a scroll */ | |
| 10278 #endif | |
| 10279 | |
| 10280 return OK; | |
| 10281 } | |
| 10282 | |
| 10283 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10284 * 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
|
10285 * 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
|
10286 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10287 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10288 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10289 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10290 // 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
|
10291 // 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
|
10292 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10293 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10294 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10295 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10296 { |
|
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
|
10297 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
|
10298 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10299 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10300 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10301 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10302 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10303 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10304 * Show the current mode and ruler. |
| 7 | 10305 * |
| 10306 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10307 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10308 * 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
|
10309 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10310 * Return the length of the message (0 if no message). |
| 10311 */ | |
| 10312 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10313 showmode(void) |
| 7 | 10314 { |
| 10315 int need_clear; | |
| 10316 int length = 0; | |
| 10317 int do_mode; | |
| 10318 int attr; | |
| 10319 int nwr_save; | |
| 10320 #ifdef FEAT_INS_EXPAND | |
| 10321 int sub_attr; | |
| 10322 #endif | |
| 10323 | |
| 642 | 10324 do_mode = ((p_smd && msg_silent == 0) |
| 10325 && ((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
|
10326 || restart_edit != NUL |
| 5735 | 10327 || 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
|
10328 if (do_mode || reg_recording != 0) |
| 7 | 10329 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10330 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10331 return 0; // show mode later |
| 7 | 10332 |
| 10333 nwr_save = need_wait_return; | |
| 10334 | |
| 10335 /* wait a bit before overwriting an important message */ | |
| 10336 check_for_delay(FALSE); | |
| 10337 | |
| 10338 /* if the cmdline is more than one line high, erase top lines */ | |
| 10339 need_clear = clear_cmdline; | |
| 10340 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10341 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10342 | |
| 10343 /* Position on the last line in the window, column 0 */ | |
| 10344 msg_pos_mode(); | |
| 10345 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10346 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10347 if (do_mode) |
| 10348 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10349 msg_puts_attr("--", attr); |
| 7 | 10350 #if defined(FEAT_XIM) |
| 2520 | 10351 if ( |
| 10352 # ifdef FEAT_GUI_GTK | |
| 10353 preedit_get_status() | |
| 1668 | 10354 # else |
| 10355 im_get_status() | |
| 2520 | 10356 # endif |
| 1668 | 10357 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10358 # 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
|
10359 msg_puts_attr(" IM", attr); |
| 7 | 10360 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10361 msg_puts_attr(" XIM", attr); |
| 7 | 10362 # endif |
| 10363 #endif | |
| 10364 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10365 if (gui.in_use) | |
| 10366 { | |
| 10367 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10368 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10369 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10370 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10371 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
|
10372 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10373 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
|
10374 } |
| 7 | 10375 } |
| 10376 #endif | |
| 10377 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10378 /* CTRL-X in Insert mode */ |
| 10379 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10380 { |
| 10381 /* These messages can get long, avoid a wrap in a narrow | |
| 10382 * window. Prefer showing edit_submode_extra. */ | |
| 10383 length = (Rows - msg_row) * Columns - 3; | |
| 10384 if (edit_submode_extra != NULL) | |
| 10385 length -= vim_strsize(edit_submode_extra); | |
| 10386 if (length > 0) | |
| 10387 { | |
| 10388 if (edit_submode_pre != NULL) | |
| 10389 length -= vim_strsize(edit_submode_pre); | |
| 10390 if (length - vim_strsize(edit_submode) > 0) | |
| 10391 { | |
| 10392 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
|
10393 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
|
10394 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10395 } |
| 10396 if (edit_submode_extra != NULL) | |
| 10397 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10398 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10399 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
|
10400 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10401 else |
| 10402 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10403 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10404 } |
| 10405 } | |
| 10406 } | |
| 10407 else | |
| 10408 #endif | |
| 10409 { | |
| 10410 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
|
10411 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10412 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
|
10413 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10414 else if (State & INSERT) |
| 10415 { | |
| 10416 #ifdef FEAT_RIGHTLEFT | |
| 10417 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10418 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
|
10419 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10420 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10421 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10422 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
|
10423 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10424 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
|
10425 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10426 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
|
10427 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10428 #ifdef FEAT_RIGHTLEFT |
| 10429 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10430 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10431 #endif |
| 10432 #ifdef FEAT_KEYMAP | |
| 10433 if (State & LANGMAP) | |
| 10434 { | |
| 10435 # ifdef FEAT_ARABIC | |
| 10436 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
|
10437 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10438 else |
| 10439 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10440 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
|
10441 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10442 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10443 } |
| 10444 #endif | |
| 10445 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
|
10446 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10447 |
| 10448 if (VIsual_active) | |
| 10449 { | |
| 10450 char *p; | |
| 10451 | |
| 10452 /* Don't concatenate separate words to avoid translation | |
| 10453 * problems. */ | |
| 10454 switch ((VIsual_select ? 4 : 0) | |
| 10455 + (VIsual_mode == Ctrl_V) * 2 | |
| 10456 + (VIsual_mode == 'V')) | |
| 10457 { | |
| 10458 case 0: p = N_(" VISUAL"); break; | |
| 10459 case 1: p = N_(" VISUAL LINE"); break; | |
| 10460 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10461 case 4: p = N_(" SELECT"); break; | |
| 10462 case 5: p = N_(" SELECT LINE"); break; | |
| 10463 default: p = N_(" SELECT BLOCK"); break; | |
| 10464 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10465 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
|
10466 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10467 msg_puts_attr(" --", attr); |
| 7 | 10468 } |
| 644 | 10469 |
| 7 | 10470 need_clear = TRUE; |
| 10471 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10472 if (reg_recording != 0 |
| 7 | 10473 #ifdef FEAT_INS_EXPAND |
| 10474 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10475 #endif | |
| 10476 ) | |
| 10477 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10478 recording_mode(attr); |
| 7 | 10479 need_clear = TRUE; |
| 10480 } | |
| 644 | 10481 |
| 10482 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
|
10483 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10484 msg_clr_eos(); |
| 10485 msg_didout = FALSE; /* overwrite this message */ | |
| 10486 length = msg_col; | |
| 10487 msg_col = 0; | |
| 10488 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10489 } | |
| 10490 else if (clear_cmdline && msg_silent == 0) | |
| 10491 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10492 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
|
10493 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
|
10494 { |
|
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
|
10495 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
|
10496 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
|
10497 } |
| 7 | 10498 |
| 10499 #ifdef FEAT_CMDL_INFO | |
| 10500 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10501 if (VIsual_active) | |
| 10502 clear_showcmd(); | |
| 10503 | |
| 10504 /* If the last window has no status line, the ruler is after the mode | |
| 10505 * 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
|
10506 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
|
10507 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10508 #endif |
| 10509 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
|
10510 redraw_mode = FALSE; |
| 7 | 10511 clear_cmdline = FALSE; |
| 10512 | |
| 10513 return length; | |
| 10514 } | |
| 10515 | |
| 10516 /* | |
| 10517 * Position for a mode message. | |
| 10518 */ | |
| 10519 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10520 msg_pos_mode(void) |
| 7 | 10521 { |
| 10522 msg_col = 0; | |
| 10523 msg_row = Rows - 1; | |
| 10524 } | |
| 10525 | |
| 10526 /* | |
| 10527 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10528 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10529 * Caller should check "mode_displayed". |
| 7 | 10530 */ |
| 10531 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10532 unshowmode(int force) |
| 7 | 10533 { |
| 10534 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10535 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10536 */ |
| 10537 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10538 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10539 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10540 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10541 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10542 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10543 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10544 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10545 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10546 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10547 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10548 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10549 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
|
10550 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
|
10551 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10552 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
|
10553 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
|
10554 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
|
10555 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10556 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10557 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10558 msg_row = save_msg_row; |
| 7 | 10559 } |
| 10560 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10561 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10562 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10563 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10564 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10565 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10566 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10567 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10568 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10569 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
|
10570 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10571 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10572 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10573 |
| 667 | 10574 /* |
| 10575 * Draw the tab pages line at the top of the Vim window. | |
| 10576 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10577 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10578 draw_tabline(void) |
| 667 | 10579 { |
| 10580 int tabcount = 0; | |
| 10581 tabpage_T *tp; | |
| 10582 int tabwidth; | |
| 10583 int col = 0; | |
| 673 | 10584 int scol = 0; |
| 667 | 10585 int attr; |
| 10586 win_T *wp; | |
| 671 | 10587 win_T *cwp; |
| 10588 int wincount; | |
| 10589 int modified; | |
| 667 | 10590 int c; |
| 10591 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10592 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
|
10593 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
|
10594 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10595 char_u *p; |
| 677 | 10596 int room; |
| 10597 int use_sep_chars = (t_colors < 8 | |
| 10598 #ifdef FEAT_GUI | |
| 10599 && !gui.in_use | |
| 10600 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10601 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10602 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10603 #endif |
| 677 | 10604 ); |
| 673 | 10605 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10606 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10607 return; |
| 673 | 10608 redraw_tabline = FALSE; |
| 667 | 10609 |
| 685 | 10610 #ifdef FEAT_GUI_TABLINE |
| 798 | 10611 /* Take care of a GUI tabline. */ |
| 685 | 10612 if (gui_use_tabline()) |
| 10613 { | |
| 10614 gui_update_tabline(); | |
| 10615 return; | |
| 10616 } | |
| 10617 #endif | |
| 10618 | |
| 10619 if (tabline_height() < 1) | |
| 667 | 10620 return; |
| 10621 | |
| 677 | 10622 #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
|
10623 clear_TabPageIdxs(); |
| 681 | 10624 |
| 677 | 10625 /* Use the 'tabline' option if it's set. */ |
| 10626 if (*p_tal != NUL) | |
| 10627 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10628 int saved_did_emsg = did_emsg; |
| 680 | 10629 |
| 10630 /* Check for an error. If there is one we would loop in redrawing the | |
| 10631 * 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
|
10632 did_emsg = FALSE; |
| 677 | 10633 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10634 if (did_emsg) |
| 680 | 10635 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10636 (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
|
10637 did_emsg |= saved_did_emsg; |
| 680 | 10638 } |
| 10639 else | |
| 10640 #endif | |
| 10641 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10642 FOR_ALL_TABPAGES(tp) |
| 680 | 10643 ++tabcount; |
| 10644 | |
| 10645 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10646 if (tabwidth < 6) | |
| 10647 tabwidth = 6; | |
| 10648 | |
| 10649 attr = attr_nosel; | |
| 10650 tabcount = 0; | |
| 699 | 10651 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10652 tp = tp->tp_next) | |
| 680 | 10653 { |
| 10654 scol = col; | |
| 10655 | |
| 10656 if (tp->tp_topframe == topframe) | |
| 10657 attr = attr_sel; | |
| 10658 if (use_sep_chars && col > 0) | |
| 10659 screen_putchar('|', 0, col++, attr); | |
| 10660 | |
| 10661 if (tp->tp_topframe != topframe) | |
| 10662 attr = attr_nosel; | |
| 10663 | |
| 10664 screen_putchar(' ', 0, col++, attr); | |
| 10665 | |
| 10666 if (tp == curtab) | |
| 10667 { | |
| 10668 cwp = curwin; | |
| 10669 wp = firstwin; | |
| 10670 } | |
| 10671 else | |
| 10672 { | |
| 10673 cwp = tp->tp_curwin; | |
| 10674 wp = tp->tp_firstwin; | |
| 10675 } | |
| 10676 | |
| 10677 modified = FALSE; | |
| 10678 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10679 if (bufIsChanged(wp->w_buffer)) | |
| 10680 modified = TRUE; | |
| 10681 if (modified || wincount > 1) | |
| 10682 { | |
| 10683 if (wincount > 1) | |
| 10684 { | |
| 10685 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10686 len = (int)STRLEN(NameBuff); |
| 699 | 10687 if (col + len >= Columns - 3) |
| 10688 break; | |
| 680 | 10689 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10690 #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
|
10691 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10692 #else |
| 6106 | 10693 attr |
| 680 | 10694 #endif |
| 10695 ); | |
| 10696 col += len; | |
| 10697 } | |
| 10698 if (modified) | |
| 10699 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10700 screen_putchar(' ', 0, col++, attr); | |
| 10701 } | |
| 10702 | |
| 10703 room = scol - col + tabwidth - 1; | |
| 10704 if (room > 0) | |
| 10705 { | |
| 685 | 10706 /* Get buffer name in NameBuff[] */ |
| 10707 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10708 shorten_dir(NameBuff); |
| 680 | 10709 len = vim_strsize(NameBuff); |
| 10710 p = NameBuff; | |
| 10711 if (has_mbyte) | |
| 10712 while (len > room) | |
| 10713 { | |
| 10714 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10715 MB_PTR_ADV(p); |
| 680 | 10716 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10717 else if (len > room) |
| 677 | 10718 { |
| 680 | 10719 p += len - room; |
| 10720 len = room; | |
| 677 | 10721 } |
| 699 | 10722 if (len > Columns - col - 1) |
| 10723 len = Columns - col - 1; | |
| 680 | 10724 |
| 835 | 10725 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10726 col += len; |
| 10727 } | |
| 10728 screen_putchar(' ', 0, col++, attr); | |
| 10729 | |
| 10730 /* Store the tab page number in TabPageIdxs[], so that | |
| 10731 * jump_to_mouse() knows where each one is. */ | |
| 10732 ++tabcount; | |
| 10733 while (scol < col) | |
| 10734 TabPageIdxs[scol++] = tabcount; | |
| 10735 } | |
| 10736 | |
| 10737 if (use_sep_chars) | |
| 10738 c = '_'; | |
| 10739 else | |
| 10740 c = ' '; | |
| 10741 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10742 |
| 10743 /* Put an "X" for closing the current tab if there are several. */ | |
| 10744 if (first_tabpage->tp_next != NULL) | |
| 10745 { | |
| 10746 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10747 TabPageIdxs[Columns - 1] = -999; | |
| 10748 } | |
| 10749 } | |
| 834 | 10750 |
| 10751 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10752 * set. */ | |
| 10753 redraw_tabline = FALSE; | |
| 667 | 10754 } |
| 685 | 10755 |
| 10756 /* | |
| 10757 * Get buffer name for "buf" into NameBuff[]. | |
| 10758 * Takes care of special buffer names and translates special characters. | |
| 10759 */ | |
| 10760 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10761 get_trans_bufname(buf_T *buf) |
| 685 | 10762 { |
| 10763 if (buf_spname(buf) != NULL) | |
| 3839 | 10764 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10765 else |
| 10766 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10767 trans_characters(NameBuff, MAXPATHL); | |
| 10768 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10769 |
| 7 | 10770 /* |
| 10771 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10772 */ | |
| 10773 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
|
10774 fillchar_status(int *attr, win_T *wp) |
| 7 | 10775 { |
| 10776 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
|
10777 |
|
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
|
10778 #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
|
10779 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
|
10780 { |
|
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
|
10781 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
|
10782 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10783 *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
|
10784 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
|
10785 } |
|
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
|
10786 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10787 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10788 *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
|
10789 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
|
10790 } |
|
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
|
10791 } |
|
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
|
10792 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
|
10793 #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
|
10794 if (wp == curwin) |
| 7 | 10795 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10796 *attr = HL_ATTR(HLF_S); |
| 7 | 10797 fill = fill_stl; |
| 10798 } | |
| 10799 else | |
| 10800 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10801 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10802 fill = fill_stlnc; |
| 10803 } | |
| 10804 /* Use fill when there is highlighting, and highlighting of current | |
| 10805 * window differs, or the fillchars differ, or this is not the | |
| 10806 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10807 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
|
10808 || wp != curwin || ONE_WINDOW) |
| 7 | 10809 || (fill_stl != fill_stlnc))) |
| 10810 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
|
10811 if (wp == curwin) |
| 7 | 10812 return '^'; |
| 10813 return '='; | |
| 10814 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10815 |
| 7 | 10816 /* |
| 10817 * Get the character to use in a separator between vertically split windows. | |
| 10818 * Get its attributes in "*attr". | |
| 10819 */ | |
| 10820 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10821 fillchar_vsep(int *attr) |
| 7 | 10822 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10823 *attr = HL_ATTR(HLF_C); |
| 7 | 10824 if (*attr == 0 && fill_vert == ' ') |
| 10825 return '|'; | |
| 10826 else | |
| 10827 return fill_vert; | |
| 10828 } | |
| 10829 | |
| 10830 /* | |
| 10831 * Return TRUE if redrawing should currently be done. | |
| 10832 */ | |
| 10833 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10834 redrawing(void) |
| 7 | 10835 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10836 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10837 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
|
10838 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10839 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
10840 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10841 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10842 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10843 || 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
|
10844 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
10845 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 10846 } |
| 10847 | |
| 10848 /* | |
| 10849 * Return TRUE if printing messages should currently be done. | |
| 10850 */ | |
| 10851 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10852 messaging(void) |
| 7 | 10853 { |
| 10854 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 10855 } | |
| 10856 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10857 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10858 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10859 * 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
|
10860 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10861 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10862 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
|
10863 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10864 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10865 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
|
10866 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
|
10867 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10868 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10869 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
|
10870 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
|
10871 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
|
10872 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10873 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
|
10874 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
|
10875 ++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
|
10876 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
|
10877 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10878 /* 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
|
10879 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
|
10880 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
|
10881 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10882 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
|
10883 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
|
10884 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10885 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10886 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10887 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
|
10888 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
|
10889 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10890 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10891 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10892 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
|
10893 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
|
10894 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
|
10895 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10896 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10897 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
|
10898 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
|
10899 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10900 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
|
10901 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10902 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10903 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
|
10904 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
|
10905 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10906 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10907 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
|
10908 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10909 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
|
10910 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10911 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10912 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
|
10913 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10914 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
|
10915 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10916 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10917 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
|
10918 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
10919 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
|
10920 (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
|
10921 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
10922 #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
|
10923 |
| 7 | 10924 /* |
| 10925 * Show current status info in ruler and various other places | |
| 10926 * If always is FALSE, only show ruler if position has changed. | |
| 10927 */ | |
| 10928 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10929 showruler(int always) |
| 7 | 10930 { |
| 10931 if (!always && !redrawing()) | |
| 10932 return; | |
| 574 | 10933 #ifdef FEAT_INS_EXPAND |
| 10934 if (pum_visible()) | |
| 10935 { | |
| 10936 /* Don't redraw right now, do it later. */ | |
| 10937 curwin->w_redr_status = TRUE; | |
| 10938 return; | |
| 10939 } | |
| 10940 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10941 #if defined(FEAT_STL_OPT) |
| 40 | 10942 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 10943 redraw_custom_statusline(curwin); |
| 7 | 10944 else |
| 10945 #endif | |
| 10946 #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
|
10947 win_redr_ruler(curwin, always, FALSE); |
| 7 | 10948 #endif |
| 10949 | |
| 10950 #ifdef FEAT_TITLE | |
| 10951 if (need_maketitle | |
| 10952 # ifdef FEAT_STL_OPT | |
| 10953 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 10954 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 10955 # endif | |
| 10956 ) | |
| 10957 maketitle(); | |
| 10958 #endif | |
| 1588 | 10959 /* Redraw the tab pages line if needed. */ |
| 10960 if (redraw_tabline) | |
| 10961 draw_tabline(); | |
| 7 | 10962 } |
| 10963 | |
| 10964 #ifdef FEAT_CMDL_INFO | |
| 10965 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
|
10966 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 10967 { |
| 1869 | 10968 #define RULER_BUF_LEN 70 |
| 10969 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 10970 int row; |
| 10971 int fillchar; | |
| 10972 int attr; | |
| 10973 int empty_line = FALSE; | |
| 10974 colnr_T virtcol; | |
| 10975 int i; | |
| 1869 | 10976 size_t len; |
| 7 | 10977 int o; |
| 10978 int this_ru_col; | |
| 10979 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
10980 int width; |
| 7 | 10981 |
| 10982 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 10983 if (!p_ru) | |
| 10984 return; | |
| 10985 | |
| 10986 /* | |
| 10987 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 10988 * after deleting lines, before cursor.lnum is corrected. | |
| 10989 */ | |
| 10990 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 10991 return; | |
| 10992 | |
| 10993 #ifdef FEAT_INS_EXPAND | |
| 10994 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 10995 * the (long) mode message. */ | |
| 10996 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 10997 if (edit_submode != NULL) | |
| 10998 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
|
10999 // 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
|
11000 // 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
|
11001 if (!ignore_pum && pum_visible()) |
| 540 | 11002 return; |
| 7 | 11003 #endif |
| 11004 | |
| 11005 #ifdef FEAT_STL_OPT | |
| 11006 if (*p_ruf) | |
| 11007 { | |
| 680 | 11008 int save_called_emsg = called_emsg; |
| 11009 | |
| 11010 called_emsg = FALSE; | |
| 7 | 11011 win_redr_custom(wp, TRUE); |
| 680 | 11012 if (called_emsg) |
| 11013 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11014 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11015 called_emsg |= save_called_emsg; |
| 7 | 11016 return; |
| 11017 } | |
| 11018 #endif | |
| 11019 | |
| 11020 /* | |
| 11021 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11022 */ | |
| 11023 if (!(State & INSERT) | |
| 11024 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11025 empty_line = TRUE; | |
| 11026 | |
| 11027 /* | |
| 11028 * Only draw the ruler when something changed. | |
| 11029 */ | |
| 11030 validate_virtcol_win(wp); | |
| 11031 if ( redraw_cmdline | |
| 11032 || always | |
| 11033 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11034 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11035 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11036 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11037 || wp->w_topline != wp->w_ru_topline | |
| 11038 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11039 #ifdef FEAT_DIFF | |
| 11040 || wp->w_topfill != wp->w_ru_topfill | |
| 11041 #endif | |
| 11042 || empty_line != wp->w_ru_empty) | |
| 11043 { | |
| 11044 cursor_off(); | |
| 11045 if (wp->w_status_height) | |
| 11046 { | |
| 11047 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
|
11048 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
|
11049 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
|
11050 width = wp->w_width; |
| 7 | 11051 } |
| 11052 else | |
| 11053 { | |
| 11054 row = Rows - 1; | |
| 11055 fillchar = ' '; | |
| 11056 attr = 0; | |
| 11057 width = Columns; | |
| 11058 off = 0; | |
| 11059 } | |
| 11060 | |
| 11061 /* In list mode virtcol needs to be recomputed */ | |
| 11062 virtcol = wp->w_virtcol; | |
| 11063 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11064 { | |
| 11065 wp->w_p_list = FALSE; | |
| 11066 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11067 wp->w_p_list = TRUE; | |
| 11068 } | |
| 11069 | |
| 11070 /* | |
| 11071 * Some sprintfs return the length, some return a pointer. | |
| 11072 * To avoid portability problems we use strlen() here. | |
| 11073 */ | |
| 1869 | 11074 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11075 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11076 ? 0L | |
| 11077 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11078 len = STRLEN(buffer); |
| 11079 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11080 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11081 (int)virtcol + 1); | |
| 11082 | |
| 11083 /* | |
| 11084 * Add a "50%" if there is room for it. | |
| 11085 * On the last line, don't print in the last column (scrolls the | |
| 11086 * screen up on some terminals). | |
| 11087 */ | |
| 11088 i = (int)STRLEN(buffer); | |
| 1869 | 11089 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11090 o = i + vim_strsize(buffer + i + 1); |
| 11091 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11092 ++o; | |
| 11093 this_ru_col = ru_col - (Columns - width); | |
| 11094 if (this_ru_col < 0) | |
| 11095 this_ru_col = 0; | |
| 11096 /* Never use more than half the window/screen width, leave the other | |
| 11097 * 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
|
11098 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
|
11099 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
|
11100 if (this_ru_col + o < width) |
| 7 | 11101 { |
| 6466 | 11102 /* 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
|
11103 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11104 { |
| 11105 if (has_mbyte) | |
| 11106 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11107 else | |
| 11108 buffer[i++] = fillchar; | |
| 11109 ++o; | |
| 11110 } | |
| 1869 | 11111 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11112 } |
| 11113 /* Truncate at window boundary. */ | |
| 11114 if (has_mbyte) | |
| 11115 { | |
| 11116 o = 0; | |
| 474 | 11117 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11118 { |
| 11119 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
|
11120 if (this_ru_col + o > width) |
| 7 | 11121 { |
| 11122 buffer[i] = NUL; | |
| 11123 break; | |
| 11124 } | |
| 11125 } | |
| 11126 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11127 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
|
11128 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
|
11129 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11130 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11131 i = redraw_cmdline; |
| 11132 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
|
11133 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
|
11134 (int)(off + width), |
| 7 | 11135 fillchar, fillchar, attr); |
| 11136 /* don't redraw the cmdline because of showing the ruler */ | |
| 11137 redraw_cmdline = i; | |
| 11138 wp->w_ru_cursor = wp->w_cursor; | |
| 11139 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11140 wp->w_ru_empty = empty_line; | |
| 11141 wp->w_ru_topline = wp->w_topline; | |
| 11142 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11143 #ifdef FEAT_DIFF | |
| 11144 wp->w_ru_topfill = wp->w_topfill; | |
| 11145 #endif | |
| 11146 } | |
| 11147 } | |
| 11148 #endif | |
| 13 | 11149 |
| 11150 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11151 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11152 * 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
|
11153 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11154 * Otherwise it depends on 'numberwidth' and the line count. |
| 11155 */ | |
| 11156 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11157 number_width(win_T *wp) |
| 13 | 11158 { |
| 11159 int n; | |
| 11160 linenr_T lnum; | |
| 11161 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11162 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
|
11163 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11164 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11165 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11166 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11167 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
|
11168 |
| 6679 | 11169 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11170 return wp->w_nrwidth_width; |
| 11171 wp->w_nrwidth_line_count = lnum; | |
| 11172 | |
| 11173 n = 0; | |
| 11174 do | |
| 11175 { | |
| 856 | 11176 lnum /= 10; |
| 11177 ++n; | |
| 13 | 11178 } while (lnum > 0); |
| 11179 | |
| 11180 /* 'numberwidth' gives the minimal width plus one */ | |
| 11181 if (n < wp->w_p_nuw - 1) | |
| 11182 n = wp->w_p_nuw - 1; | |
| 11183 | |
| 11184 wp->w_nrwidth_width = n; | |
| 6679 | 11185 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11186 return n; |
| 11187 } | |
| 11188 #endif | |
| 3986 | 11189 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11190 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11191 /* |
| 11192 * Return the current cursor column. This is the actual position on the | |
| 11193 * screen. First column is 0. | |
| 11194 */ | |
| 11195 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11196 screen_screencol(void) |
| 3986 | 11197 { |
| 11198 return screen_cur_col; | |
| 11199 } | |
| 11200 | |
| 11201 /* | |
| 11202 * Return the current cursor row. This is the actual position on the screen. | |
| 11203 * First row is 0. | |
| 11204 */ | |
| 11205 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11206 screen_screenrow(void) |
| 3986 | 11207 { |
| 11208 return screen_cur_row; | |
| 11209 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11210 #endif |