Mercurial > vim
annotate src/screen.c @ 16914:66a94fd8e37d v8.1.1458
patch 8.1.1458: crash when using gtags
commit https://github.com/vim/vim/commit/0b4c9eddb5752d46b65d16e42230b1228f230f40
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Jun 3 22:04:23 2019 +0200
patch 8.1.1458: crash when using gtags
Problem: Crash when using gtags. (issue https://github.com/vim/vim/issues/4102)
Solution: Check for negative row or col in screen_puts_len(). (Christian
Brabandt)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 03 Jun 2019 22:15:05 +0200 |
| parents | 6a99709c6ae3 |
| children | 90cec755ff80 |
| rev | line source |
|---|---|
|
10042
4aead6a9b7a9
commit https://github.com/vim/vim/commit/edf3f97ae2af024708ebb4ac614227327033ca47
Christian Brabandt <cb@256bit.org>
parents:
9992
diff
changeset
|
1 /* vi:set ts=8 sts=4 sw=4 noet: |
| 7 | 2 * |
| 3 * VIM - Vi IMproved by Bram Moolenaar | |
| 4 * | |
| 5 * Do ":help uganda" in Vim to read copying and usage conditions. | |
| 6 * Do ":help credits" in Vim to see a list of people who contributed. | |
| 7 * See README.txt for an overview of the Vim source code. | |
| 8 */ | |
| 9 | |
| 10 /* | |
| 11 * screen.c: code for displaying on the screen | |
| 12 * | |
| 13 * Output to the screen (console, terminal emulator or GUI window) is minimized | |
| 14 * by remembering what is already on the screen, and only updating the parts | |
| 15 * that changed. | |
| 16 * | |
| 17 * ScreenLines[off] Contains a copy of the whole screen, as it is currently | |
| 18 * displayed (excluding text written by external commands). | |
| 19 * ScreenAttrs[off] Contains the associated attributes. | |
| 20 * LineOffset[row] Contains the offset into ScreenLines*[] and ScreenAttrs[] | |
| 21 * for each line. | |
| 22 * LineWraps[row] Flag for each line whether it wraps to the next line. | |
| 23 * | |
| 24 * For double-byte characters, two consecutive bytes in ScreenLines[] can form | |
| 25 * one character which occupies two display cells. | |
| 26 * For UTF-8 a multi-byte character is converted to Unicode and stored in | |
| 27 * ScreenLinesUC[]. ScreenLines[] contains the first byte only. For an ASCII | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
28 * character without composing chars ScreenLinesUC[] will be 0 and |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
29 * ScreenLinesC[][] is not used. When the character occupies two display |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
30 * cells the next byte in ScreenLines[] is 0. |
| 714 | 31 * ScreenLinesC[][] contain up to 'maxcombine' composing characters |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
32 * (drawn on top of the first character). There is 0 after the last one used. |
| 7 | 33 * ScreenLines2[] is only used for euc-jp to store the second byte if the |
| 34 * first byte is 0x8e (single-width character). | |
| 35 * | |
| 36 * The screen_*() functions write to the screen and handle updating | |
| 37 * ScreenLines[]. | |
| 38 * | |
| 39 * update_screen() is the function that updates all windows and status lines. | |
| 40 * It is called form the main loop when must_redraw is non-zero. It may be | |
| 1213 | 41 * called from other places when an immediate screen update is needed. |
| 7 | 42 * |
| 43 * The part of the buffer that is displayed in a window is set with: | |
| 44 * - w_topline (first buffer line in window) | |
| 5946 | 45 * - w_topfill (filler lines above the first line) |
| 7 | 46 * - w_leftcol (leftmost window cell in window), |
| 47 * - w_skipcol (skipped window cells of first line) | |
| 48 * | |
| 49 * Commands that only move the cursor around in a window, do not need to take | |
| 50 * action to update the display. The main loop will check if w_topline is | |
| 51 * valid and update it (scroll the window) when needed. | |
| 52 * | |
| 53 * Commands that scroll a window change w_topline and must call | |
| 54 * check_cursor() to move the cursor into the visible part of the window, and | |
| 55 * call redraw_later(VALID) to have the window displayed by update_screen() | |
| 56 * later. | |
| 57 * | |
| 58 * Commands that change text in the buffer must call changed_bytes() or | |
| 59 * changed_lines() to mark the area that changed and will require updating | |
| 60 * later. The main loop will call update_screen(), which will update each | |
| 61 * window that shows the changed buffer. This assumes text above the change | |
| 62 * can remain displayed as it is. Text after the change may need updating for | |
| 63 * scrolling, folding and syntax highlighting. | |
| 64 * | |
| 65 * Commands that change how a window is displayed (e.g., setting 'list') or | |
| 66 * invalidate the contents of a window in another way (e.g., change fold | |
| 67 * settings), must call redraw_later(NOT_VALID) to have the whole window | |
| 68 * redisplayed by update_screen() later. | |
| 69 * | |
| 70 * Commands that change how a buffer is displayed (e.g., setting 'tabstop') | |
| 71 * must call redraw_curbuf_later(NOT_VALID) to have all the windows for the | |
| 72 * buffer redisplayed by update_screen() later. | |
| 73 * | |
| 743 | 74 * Commands that change highlighting and possibly cause a scroll too must call |
| 75 * redraw_later(SOME_VALID) to update the whole window but still use scrolling | |
| 76 * to avoid redrawing everything. But the length of displayed lines must not | |
| 77 * change, use NOT_VALID then. | |
| 78 * | |
| 7 | 79 * Commands that move the window position must call redraw_later(NOT_VALID). |
| 80 * TODO: should minimize redrawing by scrolling when possible. | |
| 81 * | |
| 82 * Commands that change everything (e.g., resizing the screen) must call | |
| 83 * redraw_all_later(NOT_VALID) or redraw_all_later(CLEAR). | |
| 84 * | |
| 85 * Things that are handled indirectly: | |
| 86 * - When messages scroll the screen up, msg_scrolled will be set and | |
| 87 * update_screen() called to redraw. | |
| 88 */ | |
| 89 | |
| 90 #include "vim.h" | |
| 91 | |
| 3586 | 92 #define MB_FILLER_CHAR '<' /* character used when a double-width character |
| 93 * doesn't fit. */ | |
| 94 | |
| 7 | 95 /* |
| 96 * The attributes that are actually active for writing to the screen. | |
| 97 */ | |
| 98 static int screen_attr = 0; | |
| 99 | |
| 100 /* | |
| 101 * Positioning the cursor is reduced by remembering the last position. | |
| 102 * Mostly used by windgoto() and screen_char(). | |
| 103 */ | |
| 104 static int screen_cur_row, screen_cur_col; /* last known cursor position */ | |
| 105 | |
| 106 #ifdef FEAT_SEARCH_EXTRA | |
| 107 static match_T search_hl; /* used for 'hlsearch' highlight matching */ | |
| 108 #endif | |
| 109 | |
| 110 #ifdef FEAT_FOLDING | |
| 111 static foldinfo_T win_foldinfo; /* info for 'foldcolumn' */ | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
112 static int compute_foldcolumn(win_T *wp, int col); |
| 7 | 113 #endif |
| 114 | |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
115 /* Flag that is set when drawing for a callback, not from the main command |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
116 * loop. */ |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
117 static int redrawing_for_callback = 0; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
118 |
| 7 | 119 /* |
| 120 * Buffer for one screen line (characters and attributes). | |
| 121 */ | |
| 122 static schar_T *current_ScreenLine; | |
| 123 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
124 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
125 static void update_popups(void); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
126 #endif |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
127 static void win_update(win_T *wp); |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
128 static void win_redr_status(win_T *wp, int ignore_pum); |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
129 static void win_draw_end(win_T *wp, int c1, int c2, int draw_margin, int row, int endrow, hlf_T hl); |
| 7 | 130 #ifdef FEAT_FOLDING |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
131 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
132 static void fill_foldcolumn(char_u *p, win_T *wp, int closed, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
133 static void copy_text_attr(int off, char_u *buf, int len, int attr); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
134 #endif |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
135 static int win_line(win_T *, linenr_T, int, int, int nochange, int number_only); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
136 static void draw_vsep_win(win_T *wp, int row); |
| 680 | 137 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
138 static void redraw_custom_statusline(win_T *wp); |
| 680 | 139 #endif |
| 7 | 140 #ifdef FEAT_SEARCH_EXTRA |
| 5985 | 141 # define SEARCH_HL_PRIORITY 0 |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
142 static void start_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
143 static void end_search_hl(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
144 static void init_search_hl(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
145 static void prepare_search_hl(win_T *wp, linenr_T lnum); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
146 static void next_search_hl(win_T *win, match_T *shl, linenr_T lnum, colnr_T mincol, matchitem_T *cur); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
147 static int next_search_hl_pos(match_T *shl, linenr_T lnum, posmatch_T *pos, colnr_T mincol); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
148 #endif |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
149 static void screen_char(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
150 static void screen_char_2(unsigned off, int row, int col); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
151 static void screenclear2(void); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
152 static void lineclear(unsigned off, int width, int attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
153 static void lineinvalid(unsigned off, int width); |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
154 static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
155 static void win_rest_invalid(win_T *wp); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
156 static void msg_pos_mode(void); |
|
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
157 static void recording_mode(int attr); |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
158 static int fillchar_status(int *attr, win_T *wp); |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
159 static int fillchar_vsep(int *attr); |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
160 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
161 static void redraw_win_toolbar(win_T *wp); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
162 #endif |
| 7 | 163 #ifdef FEAT_STL_OPT |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
164 static void win_redr_custom(win_T *wp, int draw_ruler); |
| 7 | 165 #endif |
| 166 #ifdef FEAT_CMDL_INFO | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
167 static void win_redr_ruler(win_T *wp, int always, int ignore_pum); |
| 7 | 168 #endif |
| 169 | |
| 170 /* Ugly global: overrule attribute used by screen_char() */ | |
| 171 static int screen_char_attr = 0; | |
| 172 | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
173 #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
174 /* Can limit syntax highlight time to 'redrawtime'. */ |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
175 # define SYN_TIME_LIMIT 1 |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
176 #endif |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
177 |
|
11672
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
178 #ifdef FEAT_RIGHTLEFT |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
179 # define HAS_RIGHTLEFT(x) x |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
180 #else |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
181 # define HAS_RIGHTLEFT(x) FALSE |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
182 #endif |
|
3c6cc2f24645
patch 8.0.0719: build failure without +terminal feature
Christian Brabandt <cb@256bit.org>
parents:
11670
diff
changeset
|
183 |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
184 // flags for screen_line() |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
185 #define SLF_RIGHTLEFT 1 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
186 #define SLF_POPUP 2 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
187 |
| 7 | 188 /* |
| 189 * Redraw the current window later, with update_screen(type). | |
| 190 * Set must_redraw only if not already set to a higher value. | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
191 * E.g. if must_redraw is CLEAR, type NOT_VALID will do nothing. |
| 7 | 192 */ |
| 193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
194 redraw_later(int type) |
| 7 | 195 { |
| 196 redraw_win_later(curwin, type); | |
| 197 } | |
| 198 | |
| 199 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
200 redraw_win_later( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
201 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
202 int type) |
| 7 | 203 { |
|
12672
4e846c9d61a8
patch 8.0.1214: accessing freed memory when EXITFREE is set
Christian Brabandt <cb@256bit.org>
parents:
12582
diff
changeset
|
204 if (!exiting && wp->w_redr_type < type) |
| 7 | 205 { |
| 206 wp->w_redr_type = type; | |
| 207 if (type >= NOT_VALID) | |
| 208 wp->w_lines_valid = 0; | |
| 209 if (must_redraw < type) /* must_redraw is the maximum of all windows */ | |
| 210 must_redraw = type; | |
| 211 } | |
| 212 } | |
| 213 | |
| 214 /* | |
| 215 * Force a complete redraw later. Also resets the highlighting. To be used | |
| 216 * after executing a shell command that messes up the screen. | |
| 217 */ | |
| 218 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
219 redraw_later_clear(void) |
| 7 | 220 { |
| 221 redraw_all_later(CLEAR); | |
| 826 | 222 #ifdef FEAT_GUI |
| 223 if (gui.in_use) | |
| 224 /* Use a code that will reset gui.highlight_mask in | |
| 225 * gui_stop_highlight(). */ | |
| 226 screen_attr = HL_ALL + 1; | |
| 227 else | |
| 228 #endif | |
| 229 /* Use attributes that is very unlikely to appear in text. */ | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
230 screen_attr = HL_BOLD | HL_UNDERLINE | HL_INVERSE | HL_STRIKETHROUGH; |
| 7 | 231 } |
| 232 | |
| 233 /* | |
| 234 * Mark all windows to be redrawn later. | |
| 235 */ | |
| 236 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
237 redraw_all_later(int type) |
| 7 | 238 { |
| 239 win_T *wp; | |
| 240 | |
| 241 FOR_ALL_WINDOWS(wp) | |
| 242 redraw_win_later(wp, type); | |
|
15384
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
243 // This may be needed when switching tabs. |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
244 if (must_redraw < type) |
|
a4fb69fd62a6
patch 8.1.0700: using "gt" sometimes does not redraw a tab
Bram Moolenaar <Bram@vim.org>
parents:
15351
diff
changeset
|
245 must_redraw = type; |
| 7 | 246 } |
| 247 | |
| 248 /* | |
| 301 | 249 * Mark all windows that are editing the current buffer to be updated later. |
| 7 | 250 */ |
| 251 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
252 redraw_curbuf_later(int type) |
| 7 | 253 { |
| 254 redraw_buf_later(curbuf, type); | |
| 255 } | |
| 256 | |
| 257 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
258 redraw_buf_later(buf_T *buf, int type) |
| 7 | 259 { |
| 260 win_T *wp; | |
| 261 | |
| 262 FOR_ALL_WINDOWS(wp) | |
| 263 { | |
| 264 if (wp->w_buffer == buf) | |
| 265 redraw_win_later(wp, type); | |
| 266 } | |
| 267 } | |
| 268 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
269 #if defined(FEAT_SIGNS) || defined(PROTO) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
270 void |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
271 redraw_buf_line_later(buf_T *buf, linenr_T lnum) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
272 { |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
273 win_T *wp; |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
274 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
275 FOR_ALL_WINDOWS(wp) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
276 if (wp->w_buffer == buf && lnum >= wp->w_topline |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
277 && lnum < wp->w_botline) |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
278 redrawWinline(wp, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
279 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
280 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
281 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
282 #if defined(FEAT_JOB_CHANNEL) || defined(PROTO) |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
283 void |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
284 redraw_buf_and_status_later(buf_T *buf, int type) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
285 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
286 win_T *wp; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
287 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
288 #ifdef FEAT_WILDMENU |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
289 if (wild_menu_showing != 0) |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
290 /* Don't redraw while the command line completion is displayed, it |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
291 * would disappear. */ |
|
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
292 return; |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
293 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
294 FOR_ALL_WINDOWS(wp) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
295 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
296 if (wp->w_buffer == buf) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
297 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
298 redraw_win_later(wp, type); |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
299 wp->w_redr_status = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
300 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
301 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
302 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
303 #endif |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
304 |
|
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
305 #if defined(FEAT_TERMRESPONSE) || defined(PROTO) |
| 7 | 306 /* |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
307 * Redraw as soon as possible. When the command line is not scrolled redraw |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
308 * right away and restore what was on the command line. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
309 * Return a code indicating what happened. |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
310 */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
311 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
312 redraw_asap(int type) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
313 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
314 int rows; |
| 6959 | 315 int cols = screen_Columns; |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
316 int r; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
317 int ret = 0; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
318 schar_T *screenline; /* copy from ScreenLines[] */ |
|
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
319 sattr_T *screenattr; /* copy from ScreenAttrs[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
320 int i; |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
321 u8char_T *screenlineUC = NULL; /* copy from ScreenLinesUC[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
322 u8char_T *screenlineC[MAX_MCO]; /* copy from ScreenLinesC[][] */ |
|
5096
a6ddcab6a240
updated for version 7.3.1291
Bram Moolenaar <bram@vim.org>
parents:
5090
diff
changeset
|
323 schar_T *screenline2 = NULL; /* copy from ScreenLines2[] */ |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
324 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
325 redraw_later(type); |
| 6959 | 326 if (msg_scrolled || (State != NORMAL && State != NORMAL_BUSY) || exiting) |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
327 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
328 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
329 /* Allocate space to save the text displayed in the command line area. */ |
| 6959 | 330 rows = screen_Rows - cmdline_row; |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
331 screenline = LALLOC_MULT(schar_T, rows * cols); |
|
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
332 screenattr = LALLOC_MULT(sattr_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
333 if (screenline == NULL || screenattr == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
334 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
335 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
336 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
337 screenlineUC = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
338 if (screenlineUC == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
339 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
340 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
341 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
342 screenlineC[i] = LALLOC_MULT(u8char_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
343 if (screenlineC[i] == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
344 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
345 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
346 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
347 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
348 { |
|
16825
ce04ebdf26b8
patch 8.1.1414: alloc() returning "char_u *" causes a lot of type casts
Bram Moolenaar <Bram@vim.org>
parents:
16817
diff
changeset
|
349 screenline2 = LALLOC_MULT(schar_T, rows * cols); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
350 if (screenline2 == NULL) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
351 ret = 2; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
352 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
353 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
354 if (ret != 2) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
355 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
356 /* Save the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
357 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
358 { |
| 6959 | 359 mch_memmove(screenline + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
360 ScreenLines + LineOffset[cmdline_row + r], |
| 6959 | 361 (size_t)cols * sizeof(schar_T)); |
| 362 mch_memmove(screenattr + r * cols, | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
363 ScreenAttrs + LineOffset[cmdline_row + r], |
| 6959 | 364 (size_t)cols * sizeof(sattr_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
365 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
366 { |
| 6959 | 367 mch_memmove(screenlineUC + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
368 ScreenLinesUC + LineOffset[cmdline_row + r], |
| 6959 | 369 (size_t)cols * sizeof(u8char_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
370 for (i = 0; i < p_mco; ++i) |
| 6959 | 371 mch_memmove(screenlineC[i] + r * cols, |
| 372 ScreenLinesC[i] + LineOffset[cmdline_row + r], | |
| 373 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
374 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
375 if (enc_dbcs == DBCS_JPNU) |
| 6959 | 376 mch_memmove(screenline2 + r * cols, |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
377 ScreenLines2 + LineOffset[cmdline_row + r], |
| 6959 | 378 (size_t)cols * sizeof(schar_T)); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
379 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
380 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
381 update_screen(0); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
382 ret = 3; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
383 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
384 if (must_redraw == 0) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
385 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
386 int off = (int)(current_ScreenLine - ScreenLines); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
387 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
388 /* Restore the text displayed in the command line area. */ |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
389 for (r = 0; r < rows; ++r) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
390 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
391 mch_memmove(current_ScreenLine, |
| 6959 | 392 screenline + r * cols, |
| 393 (size_t)cols * sizeof(schar_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
394 mch_memmove(ScreenAttrs + off, |
| 6959 | 395 screenattr + r * cols, |
| 396 (size_t)cols * sizeof(sattr_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
397 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
398 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
399 mch_memmove(ScreenLinesUC + off, |
| 6959 | 400 screenlineUC + r * cols, |
| 401 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
402 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
403 mch_memmove(ScreenLinesC[i] + off, |
| 6959 | 404 screenlineC[i] + r * cols, |
| 405 (size_t)cols * sizeof(u8char_T)); | |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
406 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
407 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
408 mch_memmove(ScreenLines2 + off, |
| 6959 | 409 screenline2 + r * cols, |
| 410 (size_t)cols * sizeof(schar_T)); | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
411 screen_line(cmdline_row + r, 0, cols, cols, 0); |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
412 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
413 ret = 4; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
414 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
415 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
416 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
417 vim_free(screenline); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
418 vim_free(screenattr); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
419 if (enc_utf8) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
420 { |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
421 vim_free(screenlineUC); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
422 for (i = 0; i < p_mco; ++i) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
423 vim_free(screenlineC[i]); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
424 } |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
425 if (enc_dbcs == DBCS_JPNU) |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
426 vim_free(screenline2); |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
427 |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
428 /* Show the intro message when appropriate. */ |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
429 maybe_intro_message(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
430 |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
431 setcursor(); |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
432 |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
433 return ret; |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
434 } |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
435 #endif |
|
5090
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
436 |
|
8b7baf39a345
updated for version 7.3.1288
Bram Moolenaar <bram@vim.org>
parents:
5078
diff
changeset
|
437 /* |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
438 * Invoked after an asynchronous callback is called. |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
439 * If an echo command was used the cursor needs to be put back where |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
440 * it belongs. If highlighting was changed a redraw is needed. |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
441 * If "call_update_screen" is FALSE don't call update_screen() when at the |
|
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
442 * command line. |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
443 */ |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
444 void |
|
12244
d0b039e2ed56
patch 8.0.1002: unnecessarily updating screen after timer callback
Christian Brabandt <cb@256bit.org>
parents:
12152
diff
changeset
|
445 redraw_after_callback(int call_update_screen) |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
446 { |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
447 ++redrawing_for_callback; |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
448 |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
449 if (State == HITRETURN || State == ASKMORE) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
450 ; // do nothing |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
451 else if (State & CMDLINE) |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
452 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
453 // Don't redraw when in prompt_for_number(). |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
454 if (cmdline_row > 0) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
455 { |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
456 // Redrawing only works when the screen didn't scroll. Don't clear |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
457 // wildmenu entries. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
458 if (msg_scrolled == 0 |
|
11657
a7cd2a53590c
patch 8.0.0711: cannot build without the wildmenu feature
Christian Brabandt <cb@256bit.org>
parents:
11655
diff
changeset
|
459 #ifdef FEAT_WILDMENU |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
460 && wild_menu_showing == 0 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
461 #endif |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
462 && call_update_screen) |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
463 update_screen(0); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
464 |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
465 // Redraw in the same position, so that the user can continue |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
466 // editing the command. |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
467 redrawcmdline_ex(FALSE); |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
468 } |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
469 } |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
470 else if (State & (NORMAL | INSERT | TERMINAL)) |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
471 { |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
472 // keep the command line if possible |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
473 update_screen(VALID_NO_UPDATE); |
|
8627
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
474 setcursor(); |
|
7c98c5d0298c
commit https://github.com/vim/vim/commit/bfb96c047b79b2aab5fd57a2472871508819f3ef
Christian Brabandt <cb@256bit.org>
parents:
8577
diff
changeset
|
475 } |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
476 cursor_on(); |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
477 #ifdef FEAT_GUI |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
478 if (gui.in_use && !gui_mch_is_blink_off()) |
|
14629
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
479 // Don't update the cursor when it is blinking and off to avoid |
|
100a44722322
patch 8.1.0328: inputlist() doesn't work with a timer
Christian Brabandt <cb@256bit.org>
parents:
14515
diff
changeset
|
480 // flicker. |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
481 out_flush_cursor(FALSE, FALSE); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
482 else |
|
13204
a8a154cafc60
patch 8.0.1476: screen isn't always updated right away
Christian Brabandt <cb@256bit.org>
parents:
13150
diff
changeset
|
483 #endif |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
484 out_flush(); |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
485 |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
486 --redrawing_for_callback; |
|
8577
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
487 } |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
488 |
|
63dc856bd13d
commit https://github.com/vim/vim/commit/975b5271eed4fa0500c24a8f37be0b1797cb9db7
Christian Brabandt <cb@256bit.org>
parents:
8212
diff
changeset
|
489 /* |
| 7 | 490 * Changed something in the current window, at buffer line "lnum", that |
| 491 * requires that line and possibly other lines to be redrawn. | |
| 492 * Used when entering/leaving Insert mode with the cursor on a folded line. | |
| 493 * Used to remove the "$" from a change command. | |
| 494 * Note that when also inserting/deleting lines w_redraw_top and w_redraw_bot | |
| 495 * may become invalid and the whole window will have to be redrawn. | |
| 496 */ | |
| 497 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
498 redrawWinline( |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
499 win_T *wp, |
|
15400
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
500 linenr_T lnum) |
|
ac5542aadd9c
patch 8.1.0708: third argument for redrawWinline() is always FALSE
Bram Moolenaar <Bram@vim.org>
parents:
15396
diff
changeset
|
501 { |
|
14720
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
502 if (wp->w_redraw_top == 0 || wp->w_redraw_top > lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
503 wp->w_redraw_top = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
504 if (wp->w_redraw_bot == 0 || wp->w_redraw_bot < lnum) |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
505 wp->w_redraw_bot = lnum; |
|
a9665096074b
patch 8.1.0372: screen updating slow when 'cursorline' is set
Christian Brabandt <cb@256bit.org>
parents:
14673
diff
changeset
|
506 redraw_win_later(wp, VALID); |
| 7 | 507 } |
| 508 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
509 /* |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
510 * To be called when "updating_screen" was set before and now the postponed |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
511 * side effects may take place. |
|
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
512 */ |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
513 void |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
514 after_updating_screen(int may_resize_shell UNUSED) |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
515 { |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
516 updating_screen = FALSE; |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
517 #ifdef FEAT_GUI |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
518 if (may_resize_shell) |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
519 gui_may_resize_shell(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
520 #endif |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
521 #ifdef FEAT_TERMINAL |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
522 term_check_channel_closed_recently(); |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
523 #endif |
|
14428
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
524 |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
525 #ifdef HAVE_DROP_FILE |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
526 // If handle_drop() was called while updating_screen was TRUE need to |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
527 // handle the drop now. |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
528 handle_any_postponed_drop(); |
|
aab5947be7c5
patch 8.1.0228: dropping files is ignored while Vim is busy
Christian Brabandt <cb@256bit.org>
parents:
14424
diff
changeset
|
529 #endif |
|
13888
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
530 } |
|
81e8e6181aeb
patch 8.0.1815: crash with terminal window and with 'lazyredraw' set
Christian Brabandt <cb@256bit.org>
parents:
13876
diff
changeset
|
531 |
| 7 | 532 /* |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
533 * Update all windows that are editing the current buffer. |
| 7 | 534 */ |
| 535 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
536 update_curbuf(int type) |
| 7 | 537 { |
| 538 redraw_curbuf_later(type); | |
| 539 update_screen(type); | |
| 540 } | |
| 541 | |
| 542 /* | |
| 543 * Based on the current value of curwin->w_topline, transfer a screenfull | |
| 544 * of stuff from Filemem to ScreenLines[], and update curwin->w_botline. | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
545 * Return OK when the screen was updated, FAIL if it was not done. |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
546 */ |
|
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
547 int |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
548 update_screen(int type_arg) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
549 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
550 int type = type_arg; |
| 7 | 551 win_T *wp; |
| 552 static int did_intro = FALSE; | |
| 553 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 554 int did_one; | |
| 555 #endif | |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
556 #ifdef FEAT_GUI |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
557 int did_undraw = FALSE; |
|
16405
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
558 int gui_cursor_col = 0; |
|
840fa633ad64
patch 8.1.1207: some compilers give warning messages
Bram Moolenaar <Bram@vim.org>
parents:
16374
diff
changeset
|
559 int gui_cursor_row = 0; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
560 #endif |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
561 int no_update = FALSE; |
| 7 | 562 |
| 2008 | 563 /* Don't do anything if the screen structures are (not yet) valid. */ |
| 7 | 564 if (!screen_valid(TRUE)) |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
565 return FAIL; |
| 7 | 566 |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
567 if (type == VALID_NO_UPDATE) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
568 { |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
569 no_update = TRUE; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
570 type = 0; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
571 } |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
572 |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
573 #ifdef FEAT_EVAL |
|
16660
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
574 { |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
575 buf_T *buf; |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
576 |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
577 // Before updating the screen, notify any listeners of changed text. |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
578 FOR_ALL_BUFFERS(buf) |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
579 invoke_listeners(buf); |
|
04c2614af21c
patch 8.1.1332: cannot flush listeners without redrawing, mix of changes
Bram Moolenaar <Bram@vim.org>
parents:
16638
diff
changeset
|
580 } |
|
16638
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
581 #endif |
|
4790302965fc
patch 8.1.1321: no docs or tests for listener functions
Bram Moolenaar <Bram@vim.org>
parents:
16606
diff
changeset
|
582 |
| 7 | 583 if (must_redraw) |
| 584 { | |
| 585 if (type < must_redraw) /* use maximal type */ | |
| 586 type = must_redraw; | |
| 1331 | 587 |
| 588 /* must_redraw is reset here, so that when we run into some weird | |
| 589 * reason to redraw while busy redrawing (e.g., asynchronous | |
| 590 * scrolling), or update_topline() in win_update() will cause a | |
| 591 * scroll, the screen will be redrawn later or in win_update(). */ | |
| 7 | 592 must_redraw = 0; |
| 593 } | |
| 594 | |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
595 /* May need to update w_lines[]. */ |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
596 if (curwin->w_lines_valid == 0 && type < NOT_VALID |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
597 #ifdef FEAT_TERMINAL |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
598 && !term_do_update_window(curwin) |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
599 #endif |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
600 ) |
| 7 | 601 type = NOT_VALID; |
| 602 | |
| 2008 | 603 /* Postpone the redrawing when it's not needed and when being called |
| 604 * recursively. */ | |
| 605 if (!redrawing() || updating_screen) | |
| 7 | 606 { |
| 607 redraw_later(type); /* remember type for next time */ | |
| 608 must_redraw = type; | |
| 609 if (type > INVERTED_ALL) | |
| 610 curwin->w_lines_valid = 0; /* don't use w_lines[].wl_size now */ | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
611 return FAIL; |
| 7 | 612 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
613 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
614 // TODO: avoid redrawing everything when there is a popup window. |
|
16809
5ff14f96f1c9
patch 8.1.1406: popup_hide() and popup_show() not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16796
diff
changeset
|
615 if (popup_any_visible()) |
|
16900
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
616 { |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
617 if (type < NOT_VALID) |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
618 type = NOT_VALID; |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
619 FOR_ALL_WINDOWS(wp) |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
620 wp->w_redr_type = NOT_VALID; |
|
aad59f9fe253
patch 8.1.1451: CTRL-L does not clear screen with a popup window
Bram Moolenaar <Bram@vim.org>
parents:
16894
diff
changeset
|
621 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
622 #endif |
| 7 | 623 |
| 624 updating_screen = TRUE; | |
| 625 #ifdef FEAT_SYN_HL | |
| 626 ++display_tick; /* let syntax code know we're in a next round of | |
| 627 * display updating */ | |
| 628 #endif | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
629 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
630 ++no_win_do_lines_ins; |
| 7 | 631 |
| 632 /* | |
| 633 * if the screen was scrolled up when displaying a message, scroll it down | |
| 634 */ | |
| 635 if (msg_scrolled) | |
| 636 { | |
| 637 clear_cmdline = TRUE; | |
| 638 if (msg_scrolled > Rows - 5) /* clearing is faster */ | |
| 639 type = CLEAR; | |
| 640 else if (type != CLEAR) | |
| 641 { | |
| 642 check_for_delay(FALSE); | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
643 if (screen_ins_lines(0, 0, msg_scrolled, (int)Rows, 0, NULL) |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
644 == FAIL) |
| 7 | 645 type = CLEAR; |
| 646 FOR_ALL_WINDOWS(wp) | |
| 647 { | |
|
16910
6a99709c6ae3
patch 8.1.1456: WinBar not redrawn after scrolling one line
Bram Moolenaar <Bram@vim.org>
parents:
16904
diff
changeset
|
648 if (wp->w_winrow < msg_scrolled) |
| 7 | 649 { |
| 650 if (W_WINROW(wp) + wp->w_height > msg_scrolled | |
| 651 && wp->w_redr_type < REDRAW_TOP | |
| 652 && wp->w_lines_valid > 0 | |
| 653 && wp->w_topline == wp->w_lines[0].wl_lnum) | |
| 654 { | |
| 655 wp->w_upd_rows = msg_scrolled - W_WINROW(wp); | |
| 656 wp->w_redr_type = REDRAW_TOP; | |
| 657 } | |
| 658 else | |
| 659 { | |
| 660 wp->w_redr_type = NOT_VALID; | |
|
12529
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
661 if (W_WINROW(wp) + wp->w_height + wp->w_status_height |
|
158917d728b4
patch 8.0.1143: macros always expand to the same thing
Christian Brabandt <cb@256bit.org>
parents:
12515
diff
changeset
|
662 <= msg_scrolled) |
| 7 | 663 wp->w_redr_status = TRUE; |
| 664 } | |
| 665 } | |
| 666 } | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
667 if (!no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
668 redraw_cmdline = TRUE; |
| 673 | 669 redraw_tabline = TRUE; |
| 7 | 670 } |
| 671 msg_scrolled = 0; | |
| 672 need_wait_return = FALSE; | |
| 673 } | |
| 674 | |
| 675 /* reset cmdline_row now (may have been changed temporarily) */ | |
| 676 compute_cmdrow(); | |
| 677 | |
| 678 /* Check for changed highlighting */ | |
| 679 if (need_highlight_changed) | |
| 680 highlight_changed(); | |
| 681 | |
| 682 if (type == CLEAR) /* first clear screen */ | |
| 683 { | |
| 684 screenclear(); /* will reset clear_cmdline */ | |
| 685 type = NOT_VALID; | |
|
11607
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
686 /* must_redraw may be set indirectly, avoid another redraw later */ |
|
24664144de4e
patch 8.0.0686: extra redraw when using CTRL-L in second window
Christian Brabandt <cb@256bit.org>
parents:
11585
diff
changeset
|
687 must_redraw = 0; |
| 7 | 688 } |
| 689 | |
| 690 if (clear_cmdline) /* going to clear cmdline (done below) */ | |
| 691 check_for_delay(FALSE); | |
| 692 | |
| 13 | 693 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
694 /* Force redraw when width of 'number' or 'relativenumber' column |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
695 * changes. */ |
| 13 | 696 if (curwin->w_redr_type < NOT_VALID |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
697 && curwin->w_nrwidth != ((curwin->w_p_nu || curwin->w_p_rnu) |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
698 ? number_width(curwin) : 0)) |
| 13 | 699 curwin->w_redr_type = NOT_VALID; |
| 700 #endif | |
| 701 | |
| 7 | 702 /* |
| 703 * Only start redrawing if there is really something to do. | |
| 704 */ | |
| 705 if (type == INVERTED) | |
| 706 update_curswant(); | |
| 707 if (curwin->w_redr_type < type | |
| 708 && !((type == VALID | |
| 709 && curwin->w_lines[0].wl_valid | |
| 710 #ifdef FEAT_DIFF | |
| 711 && curwin->w_topfill == curwin->w_old_topfill | |
| 712 && curwin->w_botfill == curwin->w_old_botfill | |
| 713 #endif | |
| 714 && curwin->w_topline == curwin->w_lines[0].wl_lnum) | |
| 715 || (type == INVERTED | |
| 1043 | 716 && VIsual_active |
| 7 | 717 && curwin->w_old_cursor_lnum == curwin->w_cursor.lnum |
| 718 && curwin->w_old_visual_mode == VIsual_mode | |
| 719 && (curwin->w_valid & VALID_VIRTCOL) | |
| 720 && curwin->w_old_curswant == curwin->w_curswant) | |
| 721 )) | |
| 722 curwin->w_redr_type = type; | |
| 723 | |
| 849 | 724 /* Redraw the tab pages line if needed. */ |
| 725 if (redraw_tabline || type >= NOT_VALID) | |
| 726 draw_tabline(); | |
| 727 | |
| 7 | 728 #ifdef FEAT_SYN_HL |
| 729 /* | |
| 730 * Correct stored syntax highlighting info for changes in each displayed | |
| 731 * buffer. Each buffer must only be done once. | |
| 732 */ | |
| 733 FOR_ALL_WINDOWS(wp) | |
| 734 { | |
| 735 if (wp->w_buffer->b_mod_set) | |
| 736 { | |
| 737 win_T *wwp; | |
| 738 | |
| 739 /* Check if we already did this buffer. */ | |
| 740 for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) | |
| 741 if (wwp->w_buffer == wp->w_buffer) | |
| 742 break; | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
743 if (wwp == wp && syntax_present(wp)) |
| 7 | 744 syn_stack_apply_changes(wp->w_buffer); |
| 745 } | |
| 746 } | |
| 747 #endif | |
| 748 | |
| 749 /* | |
| 750 * Go from top to bottom through the windows, redrawing the ones that need | |
| 751 * it. | |
| 752 */ | |
| 753 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 754 did_one = FALSE; | |
| 755 #endif | |
| 756 #ifdef FEAT_SEARCH_EXTRA | |
| 757 search_hl.rm.regprog = NULL; | |
| 758 #endif | |
| 759 FOR_ALL_WINDOWS(wp) | |
| 760 { | |
| 761 if (wp->w_redr_type != 0) | |
| 762 { | |
| 763 cursor_off(); | |
| 764 #if defined(FEAT_SEARCH_EXTRA) || defined(FEAT_CLIPBOARD) | |
| 765 if (!did_one) | |
| 766 { | |
| 767 did_one = TRUE; | |
| 768 # ifdef FEAT_SEARCH_EXTRA | |
| 769 start_search_hl(); | |
| 770 # endif | |
| 771 # ifdef FEAT_CLIPBOARD | |
| 772 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 773 if (clip_star.available && clip_isautosel_star()) |
| 774 clip_update_selection(&clip_star); | |
| 775 if (clip_plus.available && clip_isautosel_plus()) | |
| 776 clip_update_selection(&clip_plus); | |
| 7 | 777 # endif |
| 778 #ifdef FEAT_GUI | |
| 779 /* Remove the cursor before starting to do anything, because | |
| 780 * scrolling may make it difficult to redraw the text under | |
| 781 * it. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
782 if (gui.in_use && wp == curwin) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
783 { |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
784 gui_cursor_col = gui.cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
785 gui_cursor_row = gui.cursor_row; |
| 7 | 786 gui_undraw_cursor(); |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
787 did_undraw = TRUE; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
788 } |
| 7 | 789 #endif |
| 790 } | |
| 791 #endif | |
| 792 win_update(wp); | |
| 793 } | |
| 794 | |
| 795 /* redraw status line after the window to minimize cursor movement */ | |
| 796 if (wp->w_redr_status) | |
| 797 { | |
| 798 cursor_off(); | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
799 win_redr_status(wp, TRUE); // any popup menu will be redrawn below |
| 7 | 800 } |
| 801 } | |
| 802 #if defined(FEAT_SEARCH_EXTRA) | |
| 803 end_search_hl(); | |
| 804 #endif | |
| 4107 | 805 #ifdef FEAT_INS_EXPAND |
| 806 /* May need to redraw the popup menu. */ | |
|
14089
ae53a9274f50
patch 8.1.0062: popup menu broken if a callback changes the window layout
Christian Brabandt <cb@256bit.org>
parents:
14081
diff
changeset
|
807 pum_may_redraw(); |
| 4107 | 808 #endif |
| 7 | 809 |
| 810 /* Reset b_mod_set flags. Going through all windows is probably faster | |
| 811 * than going through all buffers (there could be many buffers). */ | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
812 FOR_ALL_WINDOWS(wp) |
| 7 | 813 wp->w_buffer->b_mod_set = FALSE; |
| 814 | |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
815 after_updating_screen(TRUE); |
| 7 | 816 |
| 817 /* Clear or redraw the command line. Done last, because scrolling may | |
| 818 * mess up the command line. */ | |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
819 if (clear_cmdline || redraw_cmdline || redraw_mode) |
| 7 | 820 showmode(); |
| 821 | |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
822 if (no_update) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
823 --no_win_do_lines_ins; |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
824 |
| 7 | 825 /* May put up an introductory message when not editing a file */ |
|
5126
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
826 if (!did_intro) |
|
71859e71b1f9
updated for version 7.3.1306
Bram Moolenaar <bram@vim.org>
parents:
5096
diff
changeset
|
827 maybe_intro_message(); |
| 7 | 828 did_intro = TRUE; |
| 829 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
830 #ifdef FEAT_TEXT_PROP |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
831 // Display popup windows on top of the windows. |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
832 update_popups(); |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
833 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
834 |
| 7 | 835 #ifdef FEAT_GUI |
| 836 /* Redraw the cursor and update the scrollbars when all screen updating is | |
| 837 * done. */ | |
| 838 if (gui.in_use) | |
| 839 { | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
840 if (did_undraw && !gui_mch_is_blink_off()) |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
841 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
842 mch_disable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
843 out_flush(); /* required before updating the cursor */ |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
844 mch_enable_flush(); |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
845 |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
846 /* Put the GUI position where the cursor was, gui_update_cursor() |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
847 * uses that. */ |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
848 gui.col = gui_cursor_col; |
|
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
849 gui.row = gui_cursor_row; |
|
10247
d54d4a258b96
commit https://github.com/vim/vim/commit/84dbd494dca599ecff05b2c2279d402c12e6d197
Christian Brabandt <cb@256bit.org>
parents:
10042
diff
changeset
|
850 gui.col = mb_fix_col(gui.col, gui.row); |
| 7 | 851 gui_update_cursor(FALSE, FALSE); |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
852 gui_may_flush(); |
|
9446
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
853 screen_cur_col = gui.col; |
|
aaa6639b6f14
commit https://github.com/vim/vim/commit/65549bdef5805ba5a18a3d2d3909998dd7d9ed46
Christian Brabandt <cb@256bit.org>
parents:
9444
diff
changeset
|
854 screen_cur_row = gui.row; |
|
9444
e08c8502d7ce
commit https://github.com/vim/vim/commit/144445d15f2369a58b94b6fee2fe162fc81c8abe
Christian Brabandt <cb@256bit.org>
parents:
9428
diff
changeset
|
855 } |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
856 else |
|
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
857 out_flush(); |
| 7 | 858 gui_update_scrollbars(FALSE); |
| 859 } | |
| 860 #endif | |
|
12441
854f49cf0abe
patch 8.0.1100: stuck in redraw loop when 'lazyredraw' is set
Christian Brabandt <cb@256bit.org>
parents:
12435
diff
changeset
|
861 return OK; |
| 7 | 862 } |
| 863 | |
|
15947
4aaf68cbed32
patch 8.1.0979: compiler warning for unused functions
Bram Moolenaar <Bram@vim.org>
parents:
15939
diff
changeset
|
864 #if defined(FEAT_NETBEANS_INTG) || defined(FEAT_GUI) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
865 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
866 * Prepare for updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
867 * Caller must check for "updating_screen" already set to avoid recursiveness. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
868 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
869 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
870 update_prepare(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
871 { |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
872 cursor_off(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
873 updating_screen = TRUE; |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
874 #ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
875 /* Remove the cursor before starting to do anything, because scrolling may |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
876 * make it difficult to redraw the text under it. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
877 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
878 gui_undraw_cursor(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
879 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
880 #ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
881 start_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
882 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
883 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
884 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
885 /* |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
886 * Finish updating one or more windows. |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
887 */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
888 static void |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
889 update_finish(void) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
890 { |
|
16374
57c37c17ff9d
patch 8.1.1192: mode is not cleared when leaving Insert mode with mapped Esc
Bram Moolenaar <Bram@vim.org>
parents:
16320
diff
changeset
|
891 if (redraw_cmdline || redraw_mode) |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
892 showmode(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
893 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
894 # ifdef FEAT_SEARCH_EXTRA |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
895 end_search_hl(); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
896 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
897 |
|
16835
7cade95272c4
patch 8.1.1419: listener callbacks may be called recursively
Bram Moolenaar <Bram@vim.org>
parents:
16825
diff
changeset
|
898 after_updating_screen(TRUE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
899 |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
900 # ifdef FEAT_GUI |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
901 /* Redraw the cursor and update the scrollbars when all screen updating is |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
902 * done. */ |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
903 if (gui.in_use) |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
904 { |
|
13150
808625d4b71b
patch 8.0.1449: slow redrawing with DirectX
Christian Brabandt <cb@256bit.org>
parents:
13094
diff
changeset
|
905 out_flush_cursor(FALSE, FALSE); |
|
10793
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
906 gui_update_scrollbars(FALSE); |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
907 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
908 # endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
909 } |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
910 #endif |
|
4d34e72fe63d
patch 8.0.0286: not always redrawing after screen resize
Christian Brabandt <cb@256bit.org>
parents:
10769
diff
changeset
|
911 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
912 #if defined(FEAT_CONCEAL) || defined(PROTO) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
913 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
914 * Return TRUE if the cursor line in window "wp" may be concealed, according |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
915 * to the 'concealcursor' option. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
916 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
917 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
918 conceal_cursor_line(win_T *wp) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
919 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
920 int c; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
921 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
922 if (*wp->w_p_cocu == NUL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
923 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
924 if (get_real_state() & VISUAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
925 c = 'v'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
926 else if (State & INSERT) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
927 c = 'i'; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
928 else if (State & NORMAL) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
929 c = 'n'; |
|
2382
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
930 else if (State & CMDLINE) |
|
3a5ededa240a
Add the 'c' flag to 'concealcursor'.
Bram Moolenaar <bram@vim.org>
parents:
2381
diff
changeset
|
931 c = 'c'; |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
932 else |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
933 return FALSE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
934 return vim_strchr(wp->w_p_cocu, c) != NULL; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
935 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
936 |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
937 /* |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
938 * Check if the cursor line needs to be redrawn because of 'concealcursor'. |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
939 */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
940 void |
|
13876
156ebdcb8ef5
patch 8.0.1809: various typos
Christian Brabandt <cb@256bit.org>
parents:
13851
diff
changeset
|
941 conceal_check_cursor_line(void) |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
942 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
943 if (curwin->w_p_cole > 0 && conceal_cursor_line(curwin)) |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
944 { |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
945 need_cursor_line_redraw = TRUE; |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
946 /* Need to recompute cursor column, e.g., when starting Visual mode |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
947 * without concealing. */ |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
948 curs_columns(TRUE); |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
949 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
950 } |
| 7 | 951 #endif |
| 952 | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
953 #if defined(FEAT_NETBEANS_INTG) || defined(PROTO) |
| 7 | 954 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
955 update_debug_sign(buf_T *buf, linenr_T lnum) |
| 7 | 956 { |
| 957 win_T *wp; | |
| 958 int doit = FALSE; | |
| 959 | |
| 960 # ifdef FEAT_FOLDING | |
| 961 win_foldinfo.fi_level = 0; | |
| 962 # endif | |
| 963 | |
|
15402
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
964 // update/delete a specific sign |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
965 redraw_buf_line_later(buf, lnum); |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
966 |
|
c17b5e30a0af
patch 8.1.0709: windows are updated for every added/deleted sign
Bram Moolenaar <Bram@vim.org>
parents:
15400
diff
changeset
|
967 // check if it resulted in the need to redraw a window |
| 7 | 968 FOR_ALL_WINDOWS(wp) |
| 969 if (wp->w_redr_type != 0) | |
| 970 doit = TRUE; | |
| 971 | |
| 3250 | 972 /* Return when there is nothing to do, screen updating is already |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
973 * happening (recursive call), messages on the screen or still starting up. |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
974 */ |
| 3250 | 975 if (!doit || updating_screen |
|
11915
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
976 || State == ASKMORE || State == HITRETURN |
|
594d96ac226b
patch 8.0.0837: signs can be drawn on top of console messages
Christian Brabandt <cb@256bit.org>
parents:
11890
diff
changeset
|
977 || msg_scrolled |
| 3250 | 978 #ifdef FEAT_GUI |
| 979 || gui.starting | |
| 980 #endif | |
| 981 || starting) | |
| 7 | 982 return; |
| 983 | |
| 984 /* update all windows that need updating */ | |
| 985 update_prepare(); | |
| 986 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
987 FOR_ALL_WINDOWS(wp) |
| 7 | 988 { |
| 989 if (wp->w_redr_type != 0) | |
| 990 win_update(wp); | |
| 991 if (wp->w_redr_status) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
992 win_redr_status(wp, FALSE); |
| 7 | 993 } |
| 994 | |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
995 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
996 // Display popup windows on top of the others. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
997 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
998 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
999 |
| 7 | 1000 update_finish(); |
| 1001 } | |
| 1002 #endif | |
| 1003 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1004 /* |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1005 * Get 'wincolor' attribute for window "wp". If not set and "wp" is a popup |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1006 * window then get the "Pmenu" highlight attribute. |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1007 */ |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1008 static int |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1009 get_wcr_attr(win_T *wp) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1010 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1011 int wcr_attr = 0; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1012 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1013 if (*wp->w_p_wcr != NUL) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1014 wcr_attr = syn_name2attr(wp->w_p_wcr); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1015 #ifdef FEAT_TEXT_PROP |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1016 if (bt_popup(wp->w_buffer) && wcr_attr == 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1017 wcr_attr = HL_ATTR(HLF_PNI); |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1018 #endif |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1019 return wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1020 } |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
1021 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1022 #ifdef FEAT_TEXT_PROP |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1023 /* |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1024 * Return a string of "len" spaces in IObuff. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1025 */ |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1026 static char_u * |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1027 get_spaces(int len) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1028 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1029 vim_memset(IObuff, ' ', (size_t)len); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1030 IObuff[len] = NUL; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1031 return IObuff; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1032 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1033 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1034 static void |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1035 update_popups(void) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1036 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1037 win_T *wp; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1038 int top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1039 int left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1040 int total_width; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1041 int total_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1042 int popup_attr; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1043 int border_attr[4]; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1044 int border_char[8] = {'-', '|', '-', '|', '+', '+', '+', '+', }; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1045 char_u buf[MB_MAXBYTES]; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1046 int row; |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1047 int i; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1048 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1049 // Find the window with the lowest zindex that hasn't been updated yet, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1050 // so that the window with a higher zindex is drawn later, thus goes on |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1051 // top. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1052 // TODO: don't redraw every popup every time. |
|
16904
9138e2c60bf1
patch 8.1.1453: popup window "moved" property not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16900
diff
changeset
|
1053 popup_visible = FALSE; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1054 popup_reset_handled(); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1055 while ((wp = find_next_popup(TRUE)) != NULL) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1056 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1057 // Recompute the position if the text changed. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1058 if (wp->w_popup_last_changedtick != CHANGEDTICK(wp->w_buffer)) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1059 popup_adjust_position(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1060 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1061 // adjust w_winrow and w_wincol for border and padding, since |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1062 // win_update() doesn't handle them. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1063 top_off = wp->w_popup_padding[0] + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1064 left_off = wp->w_popup_padding[3] + wp->w_popup_border[3]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1065 wp->w_winrow += top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1066 wp->w_wincol += left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1067 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1068 // Draw the popup text. |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1069 win_update(wp); |
|
16904
9138e2c60bf1
patch 8.1.1453: popup window "moved" property not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16900
diff
changeset
|
1070 popup_visible = TRUE; |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1071 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1072 wp->w_winrow -= top_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1073 wp->w_wincol -= left_off; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1074 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1075 total_width = wp->w_popup_border[3] + wp->w_popup_padding[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1076 + wp->w_width + wp->w_popup_padding[1] + wp->w_popup_border[1]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1077 total_height = wp->w_popup_border[0] + wp->w_popup_padding[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1078 + wp->w_height + wp->w_popup_padding[2] + wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1079 popup_attr = get_wcr_attr(wp); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1080 |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1081 if (enc_utf8) |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1082 { |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1083 border_char[0] = border_char[2] = 0x2550; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1084 border_char[1] = border_char[3] = 0x2551; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1085 border_char[4] = 0x2554; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1086 border_char[5] = 0x2557; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1087 border_char[6] = 0x255d; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1088 border_char[7] = 0x255a; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1089 } |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1090 for (i = 0; i < 8; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1091 if (wp->w_border_char[i] != 0) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1092 border_char[i] = wp->w_border_char[i]; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1093 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1094 for (i = 0; i < 4; ++i) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1095 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1096 border_attr[i] = popup_attr; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1097 if (wp->w_border_highlight[i] != NULL) |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1098 border_attr[i] = syn_name2attr(wp->w_border_highlight[i]); |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1099 } |
|
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1100 |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1101 if (wp->w_popup_border[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1102 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1103 // top border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1104 screen_fill(wp->w_winrow, wp->w_winrow + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1105 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1106 wp->w_wincol + total_width, |
|
16886
2bd51fdcc793
patch 8.1.1444: not using double line characters for popup border
Bram Moolenaar <Bram@vim.org>
parents:
16884
diff
changeset
|
1107 wp->w_popup_border[3] != 0 |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1108 ? border_char[4] : border_char[0], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1109 border_char[0], border_attr[0]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1110 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1111 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1112 buf[mb_char2bytes(border_char[5], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1113 screen_puts(buf, wp->w_winrow, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1114 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1115 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1116 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1117 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1118 if (wp->w_popup_padding[0] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1119 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1120 // top padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1121 row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1122 screen_fill(row, row + wp->w_popup_padding[0], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1123 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1124 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1125 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1126 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1127 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1128 for (row = wp->w_winrow + wp->w_popup_border[0]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1129 row < wp->w_winrow + total_height - wp->w_popup_border[2]; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1130 ++row) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1131 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1132 // left border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1133 if (wp->w_popup_border[3] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1134 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1135 buf[mb_char2bytes(border_char[3], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1136 screen_puts(buf, row, wp->w_wincol, border_attr[3]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1137 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1138 // left padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1139 if (wp->w_popup_padding[3] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1140 screen_puts(get_spaces(wp->w_popup_padding[3]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1141 wp->w_wincol + wp->w_popup_border[3], popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1142 // right border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1143 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1144 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1145 buf[mb_char2bytes(border_char[1], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1146 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1147 wp->w_wincol + total_width - 1, border_attr[1]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1148 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1149 // right padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1150 if (wp->w_popup_padding[1] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1151 screen_puts(get_spaces(wp->w_popup_padding[1]), row, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1152 wp->w_wincol + wp->w_popup_border[3] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1153 + wp->w_popup_padding[3] + wp->w_width, popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1154 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1155 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1156 if (wp->w_popup_padding[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1157 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1158 // bottom padding |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1159 row = wp->w_winrow + wp->w_popup_border[0] |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1160 + wp->w_popup_padding[0] + wp->w_height; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1161 screen_fill(row, row + wp->w_popup_padding[2], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1162 wp->w_wincol + wp->w_popup_border[3], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1163 wp->w_wincol + total_width - wp->w_popup_border[1], |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1164 ' ', ' ', popup_attr); |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1165 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1166 |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1167 if (wp->w_popup_border[2] > 0) |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1168 { |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1169 // bottom border |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1170 row = wp->w_winrow + total_height - 1; |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1171 screen_fill(row , row + 1, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1172 wp->w_wincol, |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1173 wp->w_wincol + total_width, |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1174 wp->w_popup_border[3] != 0 |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1175 ? border_char[7] : border_char[2], |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1176 border_char[2], border_attr[2]); |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1177 if (wp->w_popup_border[1] > 0) |
|
16888
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1178 { |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1179 buf[mb_char2bytes(border_char[6], buf)] = NUL; |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1180 screen_puts(buf, row, |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1181 wp->w_wincol + total_width - 1, border_attr[2]); |
|
ec61b6b79865
patch 8.1.1445: popup window border highlight not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16886
diff
changeset
|
1182 } |
|
16884
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1183 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1184 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1185 } |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1186 #endif |
|
59e4148c0c73
patch 8.1.1443: popup window padding and border not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16882
diff
changeset
|
1187 |
| 7 | 1188 #if defined(FEAT_GUI) || defined(PROTO) |
| 1189 /* | |
| 1190 * Update a single window, its status line and maybe the command line msg. | |
| 1191 * Used for the GUI scrollbar. | |
| 1192 */ | |
| 1193 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1194 updateWindow(win_T *wp) |
| 7 | 1195 { |
| 2008 | 1196 /* return if already busy updating */ |
| 1197 if (updating_screen) | |
| 1198 return; | |
| 1199 | |
| 7 | 1200 update_prepare(); |
| 1201 | |
| 1202 #ifdef FEAT_CLIPBOARD | |
| 1203 /* When Visual area changed, may have to update selection. */ | |
| 3674 | 1204 if (clip_star.available && clip_isautosel_star()) |
| 1205 clip_update_selection(&clip_star); | |
| 1206 if (clip_plus.available && clip_isautosel_plus()) | |
| 1207 clip_update_selection(&clip_plus); | |
| 7 | 1208 #endif |
| 670 | 1209 |
| 7 | 1210 win_update(wp); |
| 670 | 1211 |
| 1212 /* When the screen was cleared redraw the tab pages line. */ | |
| 673 | 1213 if (redraw_tabline) |
| 677 | 1214 draw_tabline(); |
| 670 | 1215 |
| 7 | 1216 if (wp->w_redr_status |
| 1217 # ifdef FEAT_CMDL_INFO | |
| 1218 || p_ru | |
| 1219 # endif | |
| 1220 # ifdef FEAT_STL_OPT | |
| 40 | 1221 || *p_stl != NUL || *wp->w_p_stl != NUL |
| 7 | 1222 # endif |
| 1223 ) | |
|
14079
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
1224 win_redr_status(wp, FALSE); |
| 7 | 1225 |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1226 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1227 // Display popup windows on top of everything. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1228 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1229 #endif |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
1230 |
| 7 | 1231 update_finish(); |
| 1232 } | |
| 1233 #endif | |
| 1234 | |
| 1235 /* | |
| 1236 * Update a single window. | |
| 1237 * | |
| 1238 * This may cause the windows below it also to be redrawn (when clearing the | |
| 1239 * screen or scrolling lines). | |
| 1240 * | |
| 1241 * How the window is redrawn depends on wp->w_redr_type. Each type also | |
| 1242 * implies the one below it. | |
| 1243 * NOT_VALID redraw the whole window | |
| 743 | 1244 * SOME_VALID redraw the whole window but do scroll when possible |
| 7 | 1245 * REDRAW_TOP redraw the top w_upd_rows window lines, otherwise like VALID |
| 1246 * INVERTED redraw the changed part of the Visual area | |
| 1247 * INVERTED_ALL redraw the whole Visual area | |
| 1248 * VALID 1. scroll up/down to adjust for a changed w_topline | |
| 1249 * 2. update lines at the top when scrolled down | |
| 1250 * 3. redraw changed text: | |
| 301 | 1251 * - if wp->w_buffer->b_mod_set set, update lines between |
| 7 | 1252 * b_mod_top and b_mod_bot. |
| 1253 * - if wp->w_redraw_top non-zero, redraw lines between | |
| 1254 * wp->w_redraw_top and wp->w_redr_bot. | |
| 1255 * - continue redrawing when syntax status is invalid. | |
| 1256 * 4. if scrolled up, update lines at the bottom. | |
| 1257 * This results in three areas that may need updating: | |
| 1258 * top: from first row to top_end (when scrolled down) | |
| 1259 * mid: from mid_start to mid_end (update inversion or changed text) | |
| 1260 * bot: from bot_start to last row (when scrolled up) | |
| 1261 */ | |
| 1262 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
1263 win_update(win_T *wp) |
| 7 | 1264 { |
| 1265 buf_T *buf = wp->w_buffer; | |
| 1266 int type; | |
| 1267 int top_end = 0; /* Below last row of the top area that needs | |
| 1268 updating. 0 when no top area updating. */ | |
| 1269 int mid_start = 999;/* first row of the mid area that needs | |
| 1270 updating. 999 when no mid area updating. */ | |
| 1271 int mid_end = 0; /* Below last row of the mid area that needs | |
| 1272 updating. 0 when no mid area updating. */ | |
| 1273 int bot_start = 999;/* first row of the bot area that needs | |
| 1274 updating. 999 when no bot area updating */ | |
| 1275 int scrolled_down = FALSE; /* TRUE when scrolled down when | |
| 1276 w_topline got smaller a bit */ | |
| 1277 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 1278 matchitem_T *cur; /* points to the match list */ |
| 7 | 1279 int top_to_mod = FALSE; /* redraw above mod_top */ |
| 1280 #endif | |
| 1281 | |
| 1282 int row; /* current window row to display */ | |
| 1283 linenr_T lnum; /* current buffer lnum to display */ | |
| 1284 int idx; /* current index in w_lines[] */ | |
| 1285 int srow; /* starting row of the current line */ | |
| 1286 | |
| 1287 int eof = FALSE; /* if TRUE, we hit the end of the file */ | |
| 1288 int didline = FALSE; /* if TRUE, we finished the last line */ | |
| 1289 int i; | |
| 1290 long j; | |
| 1291 static int recursive = FALSE; /* being called recursively */ | |
| 1292 int old_botline = wp->w_botline; | |
| 1293 #ifdef FEAT_FOLDING | |
| 1294 long fold_count; | |
| 1295 #endif | |
| 1296 #ifdef FEAT_SYN_HL | |
| 1297 /* remember what happened to the previous line, to know if | |
| 1298 * check_visual_highlight() can be used */ | |
| 1299 #define DID_NONE 1 /* didn't update a line */ | |
| 1300 #define DID_LINE 2 /* updated a normal line */ | |
| 1301 #define DID_FOLD 3 /* updated a folded line */ | |
| 1302 int did_update = DID_NONE; | |
| 1303 linenr_T syntax_last_parsed = 0; /* last parsed text line */ | |
| 1304 #endif | |
| 1305 linenr_T mod_top = 0; | |
| 1306 linenr_T mod_bot = 0; | |
| 1307 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1308 int save_got_int; | |
| 1309 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1310 #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
|
1311 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
|
1312 #endif |
| 7 | 1313 |
| 1314 type = wp->w_redr_type; | |
| 1315 | |
| 1316 if (type == NOT_VALID) | |
| 1317 { | |
| 1318 wp->w_redr_status = TRUE; | |
| 1319 wp->w_lines_valid = 0; | |
| 1320 } | |
| 1321 | |
| 1322 /* 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
|
1323 if (wp->w_height + WINBAR_HEIGHT(wp) == 0) |
| 7 | 1324 { |
| 1325 wp->w_redr_type = 0; | |
| 1326 return; | |
| 1327 } | |
| 1328 | |
| 1329 /* Window is zero-width: Only need to draw the separator. */ | |
| 1330 if (wp->w_width == 0) | |
| 1331 { | |
| 1332 /* draw the vertical separator right of this window */ | |
| 1333 draw_vsep_win(wp, 0); | |
| 1334 wp->w_redr_type = 0; | |
| 1335 return; | |
| 1336 } | |
| 1337 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1338 #ifdef FEAT_TERMINAL |
|
13851
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1339 // 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
|
1340 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
|
1341 { |
|
3edac4cd1c0a
patch 8.0.1797: terminal window is redrawn too often
Christian Brabandt <cb@256bit.org>
parents:
13792
diff
changeset
|
1342 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
|
1343 # 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
|
1344 /* 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
|
1345 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
|
1346 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
|
1347 # endif |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1348 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
|
1349 return; |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1350 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1351 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
1352 |
| 7 | 1353 #ifdef FEAT_SEARCH_EXTRA |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
1354 init_search_hl(wp); |
| 7 | 1355 #endif |
| 1356 | |
| 13 | 1357 #ifdef FEAT_LINEBREAK |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1358 /* 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
|
1359 * changes. */ |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
1360 i = (wp->w_p_nu || wp->w_p_rnu) ? number_width(wp) : 0; |
| 677 | 1361 if (wp->w_nrwidth != i) |
| 13 | 1362 { |
| 1363 type = NOT_VALID; | |
| 677 | 1364 wp->w_nrwidth = i; |
| 13 | 1365 } |
| 1366 else | |
| 1367 #endif | |
| 1368 | |
| 7 | 1369 if (buf->b_mod_set && buf->b_mod_xlines != 0 && wp->w_redraw_top != 0) |
| 1370 { | |
| 1371 /* | |
| 1372 * When there are both inserted/deleted lines and specific lines to be | |
| 1373 * redrawn, w_redraw_top and w_redraw_bot may be invalid, just redraw | |
| 1374 * everything (only happens when redrawing is off for while). | |
| 1375 */ | |
| 1376 type = NOT_VALID; | |
| 1377 } | |
| 1378 else | |
| 1379 { | |
| 1380 /* | |
| 1381 * Set mod_top to the first line that needs displaying because of | |
| 1382 * changes. Set mod_bot to the first line after the changes. | |
| 1383 */ | |
| 1384 mod_top = wp->w_redraw_top; | |
| 1385 if (wp->w_redraw_bot != 0) | |
| 1386 mod_bot = wp->w_redraw_bot + 1; | |
| 1387 else | |
| 1388 mod_bot = 0; | |
| 1389 if (buf->b_mod_set) | |
| 1390 { | |
| 1391 if (mod_top == 0 || mod_top > buf->b_mod_top) | |
| 1392 { | |
| 1393 mod_top = buf->b_mod_top; | |
| 1394 #ifdef FEAT_SYN_HL | |
| 1395 /* Need to redraw lines above the change that may be included | |
| 1396 * in a pattern match. */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1397 if (syntax_present(wp)) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1398 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1399 mod_top -= buf->b_s.b_syn_sync_linebreaks; |
| 7 | 1400 if (mod_top < 1) |
| 1401 mod_top = 1; | |
| 1402 } | |
| 1403 #endif | |
| 1404 } | |
| 1405 if (mod_bot == 0 || mod_bot < buf->b_mod_bot) | |
| 1406 mod_bot = buf->b_mod_bot; | |
| 1407 | |
| 1408 #ifdef FEAT_SEARCH_EXTRA | |
| 1409 /* When 'hlsearch' is on and using a multi-line search pattern, a | |
| 1410 * change in one line may make the Search highlighting in a | |
| 1411 * previous line invalid. Simple solution: redraw all visible | |
| 1412 * lines above the change. | |
| 1326 | 1413 * Same for a match pattern. |
| 7 | 1414 */ |
| 699 | 1415 if (search_hl.rm.regprog != NULL |
| 1416 && re_multiline(search_hl.rm.regprog)) | |
| 7 | 1417 top_to_mod = TRUE; |
| 699 | 1418 else |
| 1326 | 1419 { |
| 1420 cur = wp->w_match_head; | |
| 1421 while (cur != NULL) | |
| 1422 { | |
| 1423 if (cur->match.regprog != NULL | |
| 1424 && re_multiline(cur->match.regprog)) | |
| 699 | 1425 { |
| 1426 top_to_mod = TRUE; | |
| 1427 break; | |
| 1428 } | |
| 1326 | 1429 cur = cur->next; |
| 1430 } | |
| 1431 } | |
| 7 | 1432 #endif |
| 1433 } | |
| 1434 #ifdef FEAT_FOLDING | |
| 1435 if (mod_top != 0 && hasAnyFolding(wp)) | |
| 1436 { | |
| 1437 linenr_T lnumt, lnumb; | |
| 1438 | |
| 1439 /* | |
| 1440 * A change in a line can cause lines above it to become folded or | |
| 1441 * unfolded. Find the top most buffer line that may be affected. | |
| 1442 * If the line was previously folded and displayed, get the first | |
| 1443 * line of that fold. If the line is folded now, get the first | |
| 1444 * folded line. Use the minimum of these two. | |
| 1445 */ | |
| 1446 | |
| 1447 /* Find last valid w_lines[] entry above mod_top. Set lnumt to | |
| 1448 * the line below it. If there is no valid entry, use w_topline. | |
| 1449 * Find the first valid w_lines[] entry below mod_bot. Set lnumb | |
| 1450 * to this line. If there is no valid entry, use MAXLNUM. */ | |
| 1451 lnumt = wp->w_topline; | |
| 1452 lnumb = MAXLNUM; | |
| 1453 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1454 if (wp->w_lines[i].wl_valid) | |
| 1455 { | |
| 1456 if (wp->w_lines[i].wl_lastlnum < mod_top) | |
| 1457 lnumt = wp->w_lines[i].wl_lastlnum + 1; | |
| 1458 if (lnumb == MAXLNUM && wp->w_lines[i].wl_lnum >= mod_bot) | |
| 1459 { | |
| 1460 lnumb = wp->w_lines[i].wl_lnum; | |
| 1461 /* When there is a fold column it might need updating | |
| 1462 * in the next line ("J" just above an open fold). */ | |
| 6553 | 1463 if (compute_foldcolumn(wp, 0) > 0) |
| 7 | 1464 ++lnumb; |
| 1465 } | |
| 1466 } | |
| 1467 | |
| 1468 (void)hasFoldingWin(wp, mod_top, &mod_top, NULL, TRUE, NULL); | |
| 1469 if (mod_top > lnumt) | |
| 1470 mod_top = lnumt; | |
| 1471 | |
| 1472 /* Now do the same for the bottom line (one above mod_bot). */ | |
| 1473 --mod_bot; | |
| 1474 (void)hasFoldingWin(wp, mod_bot, NULL, &mod_bot, TRUE, NULL); | |
| 1475 ++mod_bot; | |
| 1476 if (mod_bot < lnumb) | |
| 1477 mod_bot = lnumb; | |
| 1478 } | |
| 1479 #endif | |
| 1480 | |
| 1481 /* When a change starts above w_topline and the end is below | |
| 1482 * w_topline, start redrawing at w_topline. | |
| 36 | 1483 * If the end of the change is above w_topline: do like no change was |
| 1484 * made, but redraw the first line to find changes in syntax. */ | |
| 7 | 1485 if (mod_top != 0 && mod_top < wp->w_topline) |
| 1486 { | |
| 1487 if (mod_bot > wp->w_topline) | |
| 1488 mod_top = wp->w_topline; | |
| 1489 #ifdef FEAT_SYN_HL | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
1490 else if (syntax_present(wp)) |
| 7 | 1491 top_end = 1; |
| 1492 #endif | |
| 1493 } | |
| 36 | 1494 |
| 1495 /* When line numbers are displayed need to redraw all lines below | |
| 1496 * inserted/deleted lines. */ | |
| 1497 if (mod_top != 0 && buf->b_mod_xlines != 0 && wp->w_p_nu) | |
| 1498 mod_bot = MAXLNUM; | |
| 7 | 1499 } |
|
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
|
1500 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
|
1501 wp->w_redraw_bot = 0; |
| 7 | 1502 |
| 1503 /* | |
| 1504 * When only displaying the lines at the top, set top_end. Used when | |
| 1505 * window has scrolled down for msg_scrolled. | |
| 1506 */ | |
| 1507 if (type == REDRAW_TOP) | |
| 1508 { | |
| 1509 j = 0; | |
| 1510 for (i = 0; i < wp->w_lines_valid; ++i) | |
| 1511 { | |
| 1512 j += wp->w_lines[i].wl_size; | |
| 1513 if (j >= wp->w_upd_rows) | |
| 1514 { | |
| 1515 top_end = j; | |
| 1516 break; | |
| 1517 } | |
| 1518 } | |
| 1519 if (top_end == 0) | |
| 1520 /* not found (cannot happen?): redraw everything */ | |
| 1521 type = NOT_VALID; | |
| 1522 else | |
| 1523 /* top area defined, the rest is VALID */ | |
| 1524 type = VALID; | |
| 1525 } | |
| 1526 | |
| 1378 | 1527 /* Trick: we want to avoid clearing the screen twice. screenclear() will |
| 1331 | 1528 * set "screen_cleared" to TRUE. The special value MAYBE (which is still |
| 1529 * non-zero and thus not FALSE) will indicate that screenclear() was not | |
| 1530 * called. */ | |
| 1531 if (screen_cleared) | |
| 1532 screen_cleared = MAYBE; | |
| 1533 | |
| 7 | 1534 /* |
| 1535 * If there are no changes on the screen that require a complete redraw, | |
| 1536 * handle three cases: | |
| 1537 * 1: we are off the top of the screen by a few lines: scroll down | |
| 1538 * 2: wp->w_topline is below wp->w_lines[0].wl_lnum: may scroll up | |
| 1539 * 3: wp->w_topline is wp->w_lines[0].wl_lnum: find first entry in | |
| 1540 * w_lines[] that needs updating. | |
| 1541 */ | |
| 743 | 1542 if ((type == VALID || type == SOME_VALID |
| 1543 || type == INVERTED || type == INVERTED_ALL) | |
| 7 | 1544 #ifdef FEAT_DIFF |
| 1545 && !wp->w_botfill && !wp->w_old_botfill | |
| 1546 #endif | |
| 1547 ) | |
| 1548 { | |
| 1549 if (mod_top != 0 && wp->w_topline == mod_top) | |
| 1550 { | |
| 1551 /* | |
| 1552 * w_topline is the first changed line, the scrolling will be done | |
| 1553 * further down. | |
| 1554 */ | |
| 1555 } | |
| 1556 else if (wp->w_lines[0].wl_valid | |
| 1557 && (wp->w_topline < wp->w_lines[0].wl_lnum | |
| 1558 #ifdef FEAT_DIFF | |
| 1559 || (wp->w_topline == wp->w_lines[0].wl_lnum | |
| 1560 && wp->w_topfill > wp->w_old_topfill) | |
| 1561 #endif | |
| 1562 )) | |
| 1563 { | |
| 1564 /* | |
| 1565 * New topline is above old topline: May scroll down. | |
| 1566 */ | |
| 1567 #ifdef FEAT_FOLDING | |
| 1568 if (hasAnyFolding(wp)) | |
| 1569 { | |
| 1570 linenr_T ln; | |
| 1571 | |
| 1572 /* count the number of lines we are off, counting a sequence | |
| 1573 * of folded lines as one */ | |
| 1574 j = 0; | |
| 1575 for (ln = wp->w_topline; ln < wp->w_lines[0].wl_lnum; ++ln) | |
| 1576 { | |
| 1577 ++j; | |
| 1578 if (j >= wp->w_height - 2) | |
| 1579 break; | |
| 1580 (void)hasFoldingWin(wp, ln, NULL, &ln, TRUE, NULL); | |
| 1581 } | |
| 1582 } | |
| 1583 else | |
| 1584 #endif | |
| 1585 j = wp->w_lines[0].wl_lnum - wp->w_topline; | |
| 1586 if (j < wp->w_height - 2) /* not too far off */ | |
| 1587 { | |
| 1588 i = plines_m_win(wp, wp->w_topline, wp->w_lines[0].wl_lnum - 1); | |
| 1589 #ifdef FEAT_DIFF | |
| 1590 /* insert extra lines for previously invisible filler lines */ | |
| 1591 if (wp->w_lines[0].wl_lnum != wp->w_topline) | |
| 1592 i += diff_check_fill(wp, wp->w_lines[0].wl_lnum) | |
| 1593 - wp->w_old_topfill; | |
| 1594 #endif | |
| 1595 if (i < wp->w_height - 2) /* less than a screen off */ | |
| 1596 { | |
| 1597 /* | |
| 1598 * Try to insert the correct number of lines. | |
| 1599 * If not the last window, delete the lines at the bottom. | |
| 1600 * win_ins_lines may fail when the terminal can't do it. | |
| 1601 */ | |
| 1602 if (i > 0) | |
| 1603 check_for_delay(FALSE); | |
| 1604 if (win_ins_lines(wp, 0, i, FALSE, wp == firstwin) == OK) | |
| 1605 { | |
| 1606 if (wp->w_lines_valid != 0) | |
| 1607 { | |
| 1608 /* Need to update rows that are new, stop at the | |
| 1609 * first one that scrolled down. */ | |
| 1610 top_end = i; | |
| 1611 scrolled_down = TRUE; | |
| 1612 | |
| 1613 /* Move the entries that were scrolled, disable | |
| 1614 * the entries for the lines to be redrawn. */ | |
| 1615 if ((wp->w_lines_valid += j) > wp->w_height) | |
| 1616 wp->w_lines_valid = wp->w_height; | |
| 1617 for (idx = wp->w_lines_valid; idx - j >= 0; idx--) | |
| 1618 wp->w_lines[idx] = wp->w_lines[idx - j]; | |
| 1619 while (idx >= 0) | |
| 1620 wp->w_lines[idx--].wl_valid = FALSE; | |
| 1621 } | |
| 1622 } | |
| 1623 else | |
| 1624 mid_start = 0; /* redraw all lines */ | |
| 1625 } | |
| 1626 else | |
| 1627 mid_start = 0; /* redraw all lines */ | |
| 1628 } | |
| 1629 else | |
| 1630 mid_start = 0; /* redraw all lines */ | |
| 1631 } | |
| 1632 else | |
| 1633 { | |
| 1634 /* | |
| 1635 * New topline is at or below old topline: May scroll up. | |
| 1636 * When topline didn't change, find first entry in w_lines[] that | |
| 1637 * needs updating. | |
| 1638 */ | |
| 1639 | |
| 1640 /* try to find wp->w_topline in wp->w_lines[].wl_lnum */ | |
| 1641 j = -1; | |
| 1642 row = 0; | |
| 1643 for (i = 0; i < wp->w_lines_valid; i++) | |
| 1644 { | |
| 1645 if (wp->w_lines[i].wl_valid | |
| 1646 && wp->w_lines[i].wl_lnum == wp->w_topline) | |
| 1647 { | |
| 1648 j = i; | |
| 1649 break; | |
| 1650 } | |
| 1651 row += wp->w_lines[i].wl_size; | |
| 1652 } | |
| 1653 if (j == -1) | |
| 1654 { | |
| 1655 /* if wp->w_topline is not in wp->w_lines[].wl_lnum redraw all | |
| 1656 * lines */ | |
| 1657 mid_start = 0; | |
| 1658 } | |
| 1659 else | |
| 1660 { | |
| 1661 /* | |
| 1662 * Try to delete the correct number of lines. | |
| 1663 * wp->w_topline is at wp->w_lines[i].wl_lnum. | |
| 1664 */ | |
| 1665 #ifdef FEAT_DIFF | |
| 1666 /* If the topline didn't change, delete old filler lines, | |
| 1667 * otherwise delete filler lines of the new topline... */ | |
| 1668 if (wp->w_lines[0].wl_lnum == wp->w_topline) | |
| 1669 row += wp->w_old_topfill; | |
| 1670 else | |
| 1671 row += diff_check_fill(wp, wp->w_topline); | |
| 1672 /* ... but don't delete new filler lines. */ | |
| 1673 row -= wp->w_topfill; | |
| 1674 #endif | |
| 1675 if (row > 0) | |
| 1676 { | |
| 1677 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
|
1678 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
|
1679 == OK) |
| 7 | 1680 bot_start = wp->w_height - row; |
| 1681 else | |
| 1682 mid_start = 0; /* redraw all lines */ | |
| 1683 } | |
| 1684 if ((row == 0 || bot_start < 999) && wp->w_lines_valid != 0) | |
| 1685 { | |
| 1686 /* | |
| 1687 * Skip the lines (below the deleted lines) that are still | |
| 1688 * valid and don't need redrawing. Copy their info | |
| 1689 * upwards, to compensate for the deleted lines. Set | |
| 1690 * bot_start to the first row that needs redrawing. | |
| 1691 */ | |
| 1692 bot_start = 0; | |
| 1693 idx = 0; | |
| 1694 for (;;) | |
| 1695 { | |
| 1696 wp->w_lines[idx] = wp->w_lines[j]; | |
| 1697 /* stop at line that didn't fit, unless it is still | |
| 1698 * valid (no lines deleted) */ | |
| 1699 if (row > 0 && bot_start + row | |
| 1700 + (int)wp->w_lines[j].wl_size > wp->w_height) | |
| 1701 { | |
| 1702 wp->w_lines_valid = idx + 1; | |
| 1703 break; | |
| 1704 } | |
| 1705 bot_start += wp->w_lines[idx++].wl_size; | |
| 1706 | |
| 1707 /* stop at the last valid entry in w_lines[].wl_size */ | |
| 1708 if (++j >= wp->w_lines_valid) | |
| 1709 { | |
| 1710 wp->w_lines_valid = idx; | |
| 1711 break; | |
| 1712 } | |
| 1713 } | |
| 1714 #ifdef FEAT_DIFF | |
| 1715 /* Correct the first entry for filler lines at the top | |
| 1716 * when it won't get updated below. */ | |
| 1717 if (wp->w_p_diff && bot_start > 0) | |
| 1718 wp->w_lines[0].wl_size = | |
| 1719 plines_win_nofill(wp, wp->w_topline, TRUE) | |
| 1720 + wp->w_topfill; | |
| 1721 #endif | |
| 1722 } | |
| 1723 } | |
| 1724 } | |
| 1725 | |
| 1726 /* When starting redraw in the first line, redraw all lines. When | |
| 1727 * there is only one window it's probably faster to clear the screen | |
| 1728 * first. */ | |
| 1729 if (mid_start == 0) | |
| 1730 { | |
| 1731 mid_end = wp->w_height; | |
|
10349
cf988222b150
commit https://github.com/vim/vim/commit/a1f4cb93ba50ea9e40cd4b1f5592b8a6d1398660
Christian Brabandt <cb@256bit.org>
parents:
10307
diff
changeset
|
1732 if (ONE_WINDOW) |
| 981 | 1733 { |
| 1331 | 1734 /* Clear the screen when it was not done by win_del_lines() or |
| 1735 * win_ins_lines() above, "screen_cleared" is FALSE or MAYBE | |
| 1736 * then. */ | |
| 1737 if (screen_cleared != TRUE) | |
| 1738 screenclear(); | |
| 981 | 1739 /* The screen was cleared, redraw the tab pages line. */ |
| 1740 if (redraw_tabline) | |
| 1741 draw_tabline(); | |
| 1742 } | |
| 7 | 1743 } |
| 1331 | 1744 |
| 1745 /* When win_del_lines() or win_ins_lines() caused the screen to be | |
| 1746 * cleared (only happens for the first window) or when screenclear() | |
| 1747 * was called directly above, "must_redraw" will have been set to | |
| 1748 * NOT_VALID, need to reset it here to avoid redrawing twice. */ | |
| 1749 if (screen_cleared == TRUE) | |
| 1750 must_redraw = 0; | |
| 7 | 1751 } |
| 1752 else | |
| 1753 { | |
| 1754 /* Not VALID or INVERTED: redraw all lines. */ | |
| 1755 mid_start = 0; | |
| 1756 mid_end = wp->w_height; | |
| 1757 } | |
| 1758 | |
| 743 | 1759 if (type == SOME_VALID) |
| 1760 { | |
| 1761 /* SOME_VALID: redraw all lines. */ | |
| 1762 mid_start = 0; | |
| 1763 mid_end = wp->w_height; | |
| 1764 type = NOT_VALID; | |
| 1765 } | |
| 1766 | |
| 7 | 1767 /* check if we are updating or removing the inverted part */ |
| 1768 if ((VIsual_active && buf == curwin->w_buffer) | |
| 1769 || (wp->w_old_cursor_lnum != 0 && type != NOT_VALID)) | |
| 1770 { | |
| 1771 linenr_T from, to; | |
| 1772 | |
| 1773 if (VIsual_active) | |
| 1774 { | |
| 1775 if (VIsual_active | |
| 1776 && (VIsual_mode != wp->w_old_visual_mode | |
| 1777 || type == INVERTED_ALL)) | |
| 1778 { | |
| 1779 /* | |
| 1780 * If the type of Visual selection changed, redraw the whole | |
| 1781 * selection. Also when the ownership of the X selection is | |
| 1782 * gained or lost. | |
| 1783 */ | |
| 1784 if (curwin->w_cursor.lnum < VIsual.lnum) | |
| 1785 { | |
| 1786 from = curwin->w_cursor.lnum; | |
| 1787 to = VIsual.lnum; | |
| 1788 } | |
| 1789 else | |
| 1790 { | |
| 1791 from = VIsual.lnum; | |
| 1792 to = curwin->w_cursor.lnum; | |
| 1793 } | |
| 1794 /* redraw more when the cursor moved as well */ | |
| 1795 if (wp->w_old_cursor_lnum < from) | |
| 1796 from = wp->w_old_cursor_lnum; | |
| 1797 if (wp->w_old_cursor_lnum > to) | |
| 1798 to = wp->w_old_cursor_lnum; | |
| 1799 if (wp->w_old_visual_lnum < from) | |
| 1800 from = wp->w_old_visual_lnum; | |
| 1801 if (wp->w_old_visual_lnum > to) | |
| 1802 to = wp->w_old_visual_lnum; | |
| 1803 } | |
| 1804 else | |
| 1805 { | |
| 1806 /* | |
| 1807 * Find the line numbers that need to be updated: The lines | |
| 1808 * between the old cursor position and the current cursor | |
| 1809 * position. Also check if the Visual position changed. | |
| 1810 */ | |
| 1811 if (curwin->w_cursor.lnum < wp->w_old_cursor_lnum) | |
| 1812 { | |
| 1813 from = curwin->w_cursor.lnum; | |
| 1814 to = wp->w_old_cursor_lnum; | |
| 1815 } | |
| 1816 else | |
| 1817 { | |
| 1818 from = wp->w_old_cursor_lnum; | |
| 1819 to = curwin->w_cursor.lnum; | |
| 1820 if (from == 0) /* Visual mode just started */ | |
| 1821 from = to; | |
| 1822 } | |
| 1823 | |
| 422 | 1824 if (VIsual.lnum != wp->w_old_visual_lnum |
| 1825 || VIsual.col != wp->w_old_visual_col) | |
| 7 | 1826 { |
| 1827 if (wp->w_old_visual_lnum < from | |
| 1828 && wp->w_old_visual_lnum != 0) | |
| 1829 from = wp->w_old_visual_lnum; | |
| 1830 if (wp->w_old_visual_lnum > to) | |
| 1831 to = wp->w_old_visual_lnum; | |
| 1832 if (VIsual.lnum < from) | |
| 1833 from = VIsual.lnum; | |
| 1834 if (VIsual.lnum > to) | |
| 1835 to = VIsual.lnum; | |
| 1836 } | |
| 1837 } | |
| 1838 | |
| 1839 /* | |
| 1840 * If in block mode and changed column or curwin->w_curswant: | |
| 1841 * update all lines. | |
| 1842 * First compute the actual start and end column. | |
| 1843 */ | |
| 1844 if (VIsual_mode == Ctrl_V) | |
| 1845 { | |
| 6266 | 1846 colnr_T fromc, toc; |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
1847 #if defined(FEAT_LINEBREAK) |
| 6266 | 1848 int save_ve_flags = ve_flags; |
| 1849 | |
| 1850 if (curwin->w_p_lbr) | |
| 1851 ve_flags = VE_ALL; | |
| 1852 #endif | |
| 7 | 1853 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
|
1854 #if defined(FEAT_LINEBREAK) |
| 6266 | 1855 ve_flags = save_ve_flags; |
| 1856 #endif | |
| 7 | 1857 ++toc; |
| 1858 if (curwin->w_curswant == MAXCOL) | |
| 1859 toc = MAXCOL; | |
| 1860 | |
| 1861 if (fromc != wp->w_old_cursor_fcol | |
| 1862 || toc != wp->w_old_cursor_lcol) | |
| 1863 { | |
| 1864 if (from > VIsual.lnum) | |
| 1865 from = VIsual.lnum; | |
| 1866 if (to < VIsual.lnum) | |
| 1867 to = VIsual.lnum; | |
| 1868 } | |
| 1869 wp->w_old_cursor_fcol = fromc; | |
| 1870 wp->w_old_cursor_lcol = toc; | |
| 1871 } | |
| 1872 } | |
| 1873 else | |
| 1874 { | |
| 1875 /* Use the line numbers of the old Visual area. */ | |
| 1876 if (wp->w_old_cursor_lnum < wp->w_old_visual_lnum) | |
| 1877 { | |
| 1878 from = wp->w_old_cursor_lnum; | |
| 1879 to = wp->w_old_visual_lnum; | |
| 1880 } | |
| 1881 else | |
| 1882 { | |
| 1883 from = wp->w_old_visual_lnum; | |
| 1884 to = wp->w_old_cursor_lnum; | |
| 1885 } | |
| 1886 } | |
| 1887 | |
| 1888 /* | |
| 1889 * There is no need to update lines above the top of the window. | |
| 1890 */ | |
| 1891 if (from < wp->w_topline) | |
| 1892 from = wp->w_topline; | |
| 1893 | |
| 1894 /* | |
| 1895 * If we know the value of w_botline, use it to restrict the update to | |
| 1896 * the lines that are visible in the window. | |
| 1897 */ | |
| 1898 if (wp->w_valid & VALID_BOTLINE) | |
| 1899 { | |
| 1900 if (from >= wp->w_botline) | |
| 1901 from = wp->w_botline - 1; | |
| 1902 if (to >= wp->w_botline) | |
| 1903 to = wp->w_botline - 1; | |
| 1904 } | |
| 1905 | |
| 1906 /* | |
| 1907 * Find the minimal part to be updated. | |
| 1908 * Watch out for scrolling that made entries in w_lines[] invalid. | |
| 1909 * E.g., CTRL-U makes the first half of w_lines[] invalid and sets | |
| 1910 * top_end; need to redraw from top_end to the "to" line. | |
| 1911 * A middle mouse click with a Visual selection may change the text | |
| 1912 * above the Visual area and reset wl_valid, do count these for | |
| 1913 * mid_end (in srow). | |
| 1914 */ | |
| 1915 if (mid_start > 0) | |
| 1916 { | |
| 1917 lnum = wp->w_topline; | |
| 1918 idx = 0; | |
| 1919 srow = 0; | |
| 1920 if (scrolled_down) | |
| 1921 mid_start = top_end; | |
| 1922 else | |
| 1923 mid_start = 0; | |
| 1924 while (lnum < from && idx < wp->w_lines_valid) /* find start */ | |
| 1925 { | |
| 1926 if (wp->w_lines[idx].wl_valid) | |
| 1927 mid_start += wp->w_lines[idx].wl_size; | |
| 1928 else if (!scrolled_down) | |
| 1929 srow += wp->w_lines[idx].wl_size; | |
| 1930 ++idx; | |
| 1931 # ifdef FEAT_FOLDING | |
| 1932 if (idx < wp->w_lines_valid && wp->w_lines[idx].wl_valid) | |
| 1933 lnum = wp->w_lines[idx].wl_lnum; | |
| 1934 else | |
| 1935 # endif | |
| 1936 ++lnum; | |
| 1937 } | |
| 1938 srow += mid_start; | |
| 1939 mid_end = wp->w_height; | |
| 1940 for ( ; idx < wp->w_lines_valid; ++idx) /* find end */ | |
| 1941 { | |
| 1942 if (wp->w_lines[idx].wl_valid | |
| 1943 && wp->w_lines[idx].wl_lnum >= to + 1) | |
| 1944 { | |
| 1945 /* Only update until first row of this line */ | |
| 1946 mid_end = srow; | |
| 1947 break; | |
| 1948 } | |
| 1949 srow += wp->w_lines[idx].wl_size; | |
| 1950 } | |
| 1951 } | |
| 1952 } | |
| 1953 | |
| 1954 if (VIsual_active && buf == curwin->w_buffer) | |
| 1955 { | |
| 1956 wp->w_old_visual_mode = VIsual_mode; | |
| 1957 wp->w_old_cursor_lnum = curwin->w_cursor.lnum; | |
| 1958 wp->w_old_visual_lnum = VIsual.lnum; | |
| 422 | 1959 wp->w_old_visual_col = VIsual.col; |
| 7 | 1960 wp->w_old_curswant = curwin->w_curswant; |
| 1961 } | |
| 1962 else | |
| 1963 { | |
| 1964 wp->w_old_visual_mode = 0; | |
| 1965 wp->w_old_cursor_lnum = 0; | |
| 1966 wp->w_old_visual_lnum = 0; | |
| 422 | 1967 wp->w_old_visual_col = 0; |
| 7 | 1968 } |
| 1969 | |
| 1970 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 1971 /* reset got_int, otherwise regexp won't work */ | |
| 1972 save_got_int = got_int; | |
| 1973 got_int = 0; | |
| 1974 #endif | |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
1975 #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
|
1976 /* 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
|
1977 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
|
1978 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
|
1979 #endif |
| 7 | 1980 #ifdef FEAT_FOLDING |
| 1981 win_foldinfo.fi_level = 0; | |
| 1982 #endif | |
| 1983 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1984 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1985 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1986 * 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
|
1987 * 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
|
1988 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1989 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
|
1990 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
|
1991 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
1992 |
| 7 | 1993 /* |
| 1994 * Update all the window rows. | |
| 1995 */ | |
| 1996 idx = 0; /* first entry in w_lines[].wl_size */ | |
| 1997 row = 0; | |
| 1998 srow = 0; | |
| 1999 lnum = wp->w_topline; /* first line shown in window */ | |
| 2000 for (;;) | |
| 2001 { | |
| 2002 /* stop updating when reached the end of the window (check for _past_ | |
| 2003 * the end of the window is at the end of the loop) */ | |
| 2004 if (row == wp->w_height) | |
| 2005 { | |
| 2006 didline = TRUE; | |
| 2007 break; | |
| 2008 } | |
| 2009 | |
| 2010 /* stop updating when hit the end of the file */ | |
| 2011 if (lnum > buf->b_ml.ml_line_count) | |
| 2012 { | |
| 2013 eof = TRUE; | |
| 2014 break; | |
| 2015 } | |
| 2016 | |
| 2017 /* Remember the starting row of the line that is going to be dealt | |
| 2018 * with. It is used further down when the line doesn't fit. */ | |
| 2019 srow = row; | |
| 2020 | |
| 2021 /* | |
| 2022 * Update a line when it is in an area that needs updating, when it | |
| 2023 * 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
|
2024 * "bot_start" may be halfway a wrapped line after using |
| 7 | 2025 * win_del_lines(), check if the current line includes it. |
| 2026 * When syntax folding is being used, the saved syntax states will | |
| 2027 * already have been updated, we can't see where the syntax state is | |
| 2028 * the same again, just update until the end of the window. | |
| 2029 */ | |
| 2030 if (row < top_end | |
| 2031 || (row >= mid_start && row < mid_end) | |
| 2032 #ifdef FEAT_SEARCH_EXTRA | |
| 2033 || top_to_mod | |
| 2034 #endif | |
| 2035 || idx >= wp->w_lines_valid | |
| 2036 || (row + wp->w_lines[idx].wl_size > bot_start) | |
| 2037 || (mod_top != 0 | |
| 2038 && (lnum == mod_top | |
| 2039 || (lnum >= mod_top | |
| 2040 && (lnum < mod_bot | |
| 2041 #ifdef FEAT_SYN_HL | |
| 2042 || did_update == DID_FOLD | |
| 2043 || (did_update == DID_LINE | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2044 && syntax_present(wp) |
| 7 | 2045 && ( |
| 2046 # ifdef FEAT_FOLDING | |
| 2047 (foldmethodIsSyntax(wp) | |
| 2048 && hasAnyFolding(wp)) || | |
| 2049 # endif | |
| 2050 syntax_check_changed(lnum))) | |
| 2051 #endif | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2052 #ifdef FEAT_SEARCH_EXTRA |
| 6018 | 2053 /* match in fixed position might need redraw |
| 2054 * if lines were inserted or deleted */ | |
| 2055 || (wp->w_match_head != NULL | |
| 2056 && buf->b_mod_xlines != 0) | |
|
4916
ba328b4a990e
updated for version 7.3.1203
Bram Moolenaar <bram@vim.org>
parents:
4805
diff
changeset
|
2057 #endif |
| 7 | 2058 ))))) |
| 2059 { | |
| 2060 #ifdef FEAT_SEARCH_EXTRA | |
| 2061 if (lnum == mod_top) | |
| 2062 top_to_mod = FALSE; | |
| 2063 #endif | |
| 2064 | |
| 2065 /* | |
| 2066 * When at start of changed lines: May scroll following lines | |
| 2067 * up or down to minimize redrawing. | |
| 2068 * Don't do this when the change continues until the end. | |
| 3318 | 2069 * Don't scroll when dollar_vcol >= 0, keep the "$". |
| 7 | 2070 */ |
| 2071 if (lnum == mod_top | |
| 2072 && mod_bot != MAXLNUM | |
| 3318 | 2073 && !(dollar_vcol >= 0 && mod_bot == mod_top + 1)) |
| 7 | 2074 { |
| 2075 int old_rows = 0; | |
| 2076 int new_rows = 0; | |
| 2077 int xtra_rows; | |
| 2078 linenr_T l; | |
| 2079 | |
| 2080 /* Count the old number of window rows, using w_lines[], which | |
| 2081 * should still contain the sizes for the lines as they are | |
| 2082 * currently displayed. */ | |
| 2083 for (i = idx; i < wp->w_lines_valid; ++i) | |
| 2084 { | |
| 2085 /* Only valid lines have a meaningful wl_lnum. Invalid | |
| 2086 * lines are part of the changed area. */ | |
| 2087 if (wp->w_lines[i].wl_valid | |
| 2088 && wp->w_lines[i].wl_lnum == mod_bot) | |
| 2089 break; | |
| 2090 old_rows += wp->w_lines[i].wl_size; | |
| 2091 #ifdef FEAT_FOLDING | |
| 2092 if (wp->w_lines[i].wl_valid | |
| 2093 && wp->w_lines[i].wl_lastlnum + 1 == mod_bot) | |
| 2094 { | |
| 2095 /* Must have found the last valid entry above mod_bot. | |
| 2096 * Add following invalid entries. */ | |
| 2097 ++i; | |
| 2098 while (i < wp->w_lines_valid | |
| 2099 && !wp->w_lines[i].wl_valid) | |
| 2100 old_rows += wp->w_lines[i++].wl_size; | |
| 2101 break; | |
| 2102 } | |
| 2103 #endif | |
| 2104 } | |
| 2105 | |
| 2106 if (i >= wp->w_lines_valid) | |
| 2107 { | |
| 2108 /* We can't find a valid line below the changed lines, | |
| 2109 * need to redraw until the end of the window. | |
| 2110 * Inserting/deleting lines has no use. */ | |
| 2111 bot_start = 0; | |
| 2112 } | |
| 2113 else | |
| 2114 { | |
| 2115 /* Able to count old number of rows: Count new window | |
| 2116 * rows, and may insert/delete lines */ | |
| 2117 j = idx; | |
| 2118 for (l = lnum; l < mod_bot; ++l) | |
| 2119 { | |
| 2120 #ifdef FEAT_FOLDING | |
| 2121 if (hasFoldingWin(wp, l, NULL, &l, TRUE, NULL)) | |
| 2122 ++new_rows; | |
| 2123 else | |
| 2124 #endif | |
| 2125 #ifdef FEAT_DIFF | |
| 2126 if (l == wp->w_topline) | |
| 2127 new_rows += plines_win_nofill(wp, l, TRUE) | |
| 2128 + wp->w_topfill; | |
| 2129 else | |
| 2130 #endif | |
| 2131 new_rows += plines_win(wp, l, TRUE); | |
| 2132 ++j; | |
| 2133 if (new_rows > wp->w_height - row - 2) | |
| 2134 { | |
| 2135 /* it's getting too much, must redraw the rest */ | |
| 2136 new_rows = 9999; | |
| 2137 break; | |
| 2138 } | |
| 2139 } | |
| 2140 xtra_rows = new_rows - old_rows; | |
| 2141 if (xtra_rows < 0) | |
| 2142 { | |
| 2143 /* May scroll text up. If there is not enough | |
| 2144 * remaining text or scrolling fails, must redraw the | |
| 2145 * rest. If scrolling works, must redraw the text | |
| 2146 * below the scrolled text. */ | |
| 2147 if (row - xtra_rows >= wp->w_height - 2) | |
| 2148 mod_bot = MAXLNUM; | |
| 2149 else | |
| 2150 { | |
| 2151 check_for_delay(FALSE); | |
| 2152 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
|
2153 -xtra_rows, FALSE, FALSE, 0) == FAIL) |
| 7 | 2154 mod_bot = MAXLNUM; |
| 2155 else | |
| 2156 bot_start = wp->w_height + xtra_rows; | |
| 2157 } | |
| 2158 } | |
| 2159 else if (xtra_rows > 0) | |
| 2160 { | |
| 2161 /* May scroll text down. If there is not enough | |
| 2162 * remaining text of scrolling fails, must redraw the | |
| 2163 * rest. */ | |
| 2164 if (row + xtra_rows >= wp->w_height - 2) | |
| 2165 mod_bot = MAXLNUM; | |
| 2166 else | |
| 2167 { | |
| 2168 check_for_delay(FALSE); | |
| 2169 if (win_ins_lines(wp, row + old_rows, | |
| 2170 xtra_rows, FALSE, FALSE) == FAIL) | |
| 2171 mod_bot = MAXLNUM; | |
| 2172 else if (top_end > row + old_rows) | |
| 2173 /* Scrolled the part at the top that requires | |
| 2174 * updating down. */ | |
| 2175 top_end += xtra_rows; | |
| 2176 } | |
| 2177 } | |
| 2178 | |
| 2179 /* When not updating the rest, may need to move w_lines[] | |
| 2180 * entries. */ | |
| 2181 if (mod_bot != MAXLNUM && i != j) | |
| 2182 { | |
| 2183 if (j < i) | |
| 2184 { | |
| 2185 int x = row + new_rows; | |
| 2186 | |
| 2187 /* move entries in w_lines[] upwards */ | |
| 2188 for (;;) | |
| 2189 { | |
| 2190 /* stop at last valid entry in w_lines[] */ | |
| 2191 if (i >= wp->w_lines_valid) | |
| 2192 { | |
| 2193 wp->w_lines_valid = j; | |
| 2194 break; | |
| 2195 } | |
| 2196 wp->w_lines[j] = wp->w_lines[i]; | |
| 2197 /* stop at a line that won't fit */ | |
| 2198 if (x + (int)wp->w_lines[j].wl_size | |
| 2199 > wp->w_height) | |
| 2200 { | |
| 2201 wp->w_lines_valid = j + 1; | |
| 2202 break; | |
| 2203 } | |
| 2204 x += wp->w_lines[j++].wl_size; | |
| 2205 ++i; | |
| 2206 } | |
| 2207 if (bot_start > x) | |
| 2208 bot_start = x; | |
| 2209 } | |
| 2210 else /* j > i */ | |
| 2211 { | |
| 2212 /* move entries in w_lines[] downwards */ | |
| 2213 j -= i; | |
| 2214 wp->w_lines_valid += j; | |
| 2215 if (wp->w_lines_valid > wp->w_height) | |
| 2216 wp->w_lines_valid = wp->w_height; | |
| 2217 for (i = wp->w_lines_valid; i - j >= idx; --i) | |
| 2218 wp->w_lines[i] = wp->w_lines[i - j]; | |
| 2219 | |
| 2220 /* The w_lines[] entries for inserted lines are | |
| 2221 * now invalid, but wl_size may be used above. | |
| 2222 * Reset to zero. */ | |
| 2223 while (i >= idx) | |
| 2224 { | |
| 2225 wp->w_lines[i].wl_size = 0; | |
| 2226 wp->w_lines[i--].wl_valid = FALSE; | |
| 2227 } | |
| 2228 } | |
| 2229 } | |
| 2230 } | |
| 2231 } | |
| 2232 | |
| 2233 #ifdef FEAT_FOLDING | |
| 2234 /* | |
| 2235 * When lines are folded, display one line for all of them. | |
| 2236 * Otherwise, display normally (can be several display lines when | |
| 2237 * 'wrap' is on). | |
| 2238 */ | |
| 2239 fold_count = foldedCount(wp, lnum, &win_foldinfo); | |
| 2240 if (fold_count != 0) | |
| 2241 { | |
| 2242 fold_line(wp, fold_count, &win_foldinfo, lnum, row); | |
| 2243 ++row; | |
| 2244 --fold_count; | |
| 2245 wp->w_lines[idx].wl_folded = TRUE; | |
| 2246 wp->w_lines[idx].wl_lastlnum = lnum + fold_count; | |
| 2247 # ifdef FEAT_SYN_HL | |
| 2248 did_update = DID_FOLD; | |
| 2249 # endif | |
| 2250 } | |
| 2251 else | |
| 2252 #endif | |
| 2253 if (idx < wp->w_lines_valid | |
| 2254 && wp->w_lines[idx].wl_valid | |
| 2255 && wp->w_lines[idx].wl_lnum == lnum | |
| 2256 && lnum > wp->w_topline | |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2257 && !(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
|
2258 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2259 && !bt_popup(wp->w_buffer) |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2260 #endif |
| 7 | 2261 && srow + wp->w_lines[idx].wl_size > wp->w_height |
| 2262 #ifdef FEAT_DIFF | |
| 2263 && diff_check_fill(wp, lnum) == 0 | |
| 2264 #endif | |
| 2265 ) | |
| 2266 { | |
| 2267 /* This line is not going to fit. Don't draw anything here, | |
| 2268 * will draw "@ " lines below. */ | |
| 2269 row = wp->w_height + 1; | |
| 2270 } | |
| 2271 else | |
| 2272 { | |
| 2273 #ifdef FEAT_SEARCH_EXTRA | |
| 2274 prepare_search_hl(wp, lnum); | |
| 2275 #endif | |
| 2276 #ifdef FEAT_SYN_HL | |
| 2277 /* Let the syntax stuff know we skipped a few lines. */ | |
| 2278 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
|
2279 && syntax_present(wp)) |
| 7 | 2280 syntax_end_parsing(syntax_last_parsed + 1); |
| 2281 #endif | |
| 2282 | |
| 2283 /* | |
| 2284 * Display one line. | |
| 2285 */ | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2286 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
|
2287 mod_top == 0, FALSE); |
| 7 | 2288 |
| 2289 #ifdef FEAT_FOLDING | |
| 2290 wp->w_lines[idx].wl_folded = FALSE; | |
| 2291 wp->w_lines[idx].wl_lastlnum = lnum; | |
| 2292 #endif | |
| 2293 #ifdef FEAT_SYN_HL | |
| 2294 did_update = DID_LINE; | |
| 2295 syntax_last_parsed = lnum; | |
| 2296 #endif | |
| 2297 } | |
| 2298 | |
| 2299 wp->w_lines[idx].wl_lnum = lnum; | |
| 2300 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
|
2301 |
|
306a7a357c71
patch 8.0.1228: invalid memory access in GUI test
Christian Brabandt <cb@256bit.org>
parents:
12672
diff
changeset
|
2302 /* 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
|
2303 * 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
|
2304 * 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
|
2305 if (row > wp->w_height || row + wp->w_winrow >= Rows) |
| 7 | 2306 { |
| 2307 /* we may need the size of that too long line later on */ | |
| 3318 | 2308 if (dollar_vcol == -1) |
| 7 | 2309 wp->w_lines[idx].wl_size = plines_win(wp, lnum, TRUE); |
| 2310 ++idx; | |
| 2311 break; | |
| 2312 } | |
| 3318 | 2313 if (dollar_vcol == -1) |
| 7 | 2314 wp->w_lines[idx].wl_size = row - srow; |
| 2315 ++idx; | |
| 2316 #ifdef FEAT_FOLDING | |
| 2317 lnum += fold_count + 1; | |
| 2318 #else | |
| 2319 ++lnum; | |
| 2320 #endif | |
| 2321 } | |
| 2322 else | |
| 2323 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2324 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
|
2325 { |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2326 #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
|
2327 // '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
|
2328 // 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
|
2329 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
|
2330 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
|
2331 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
|
2332 else |
|
14877
8b6124732e8f
patch 8.1.0450: build failure without the +fold feature
Christian Brabandt <cb@256bit.org>
parents:
14875
diff
changeset
|
2333 #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
|
2334 (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
|
2335 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2336 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
2337 // This line does not need to be drawn, advance to the next one. |
| 7 | 2338 row += wp->w_lines[idx++].wl_size; |
| 2339 if (row > wp->w_height) /* past end of screen */ | |
| 2340 break; | |
| 2341 #ifdef FEAT_FOLDING | |
| 2342 lnum = wp->w_lines[idx - 1].wl_lastlnum + 1; | |
| 2343 #else | |
| 2344 ++lnum; | |
| 2345 #endif | |
| 2346 #ifdef FEAT_SYN_HL | |
| 2347 did_update = DID_NONE; | |
| 2348 #endif | |
| 2349 } | |
| 2350 | |
| 2351 if (lnum > buf->b_ml.ml_line_count) | |
| 2352 { | |
| 2353 eof = TRUE; | |
| 2354 break; | |
| 2355 } | |
| 2356 } | |
| 2357 /* | |
| 2358 * End of loop over all window lines. | |
| 2359 */ | |
| 2360 | |
|
13314
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2361 #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
|
2362 /* 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
|
2363 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
|
2364 { |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2365 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
|
2366 |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2367 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
|
2368 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
|
2369 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
|
2370 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
|
2371 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
|
2372 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2373 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
|
2374 else |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2375 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
|
2376 } |
|
65c3e8259124
patch 8.0.1531: cannot use 24 bit colors in MS-Windows console
Christian Brabandt <cb@256bit.org>
parents:
13308
diff
changeset
|
2377 #endif |
| 7 | 2378 |
| 2379 if (idx > wp->w_lines_valid) | |
| 2380 wp->w_lines_valid = idx; | |
| 2381 | |
| 2382 #ifdef FEAT_SYN_HL | |
| 2383 /* | |
| 2384 * Let the syntax stuff know we stop parsing here. | |
| 2385 */ | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
2386 if (syntax_last_parsed != 0 && syntax_present(wp)) |
| 7 | 2387 syntax_end_parsing(syntax_last_parsed + 1); |
| 2388 #endif | |
| 2389 | |
| 2390 /* | |
| 2391 * If we didn't hit the end of the file, and we didn't finish the last | |
| 2392 * line we were working on, then the line didn't fit. | |
| 2393 */ | |
| 2394 wp->w_empty_rows = 0; | |
| 2395 #ifdef FEAT_DIFF | |
| 2396 wp->w_filler_rows = 0; | |
| 2397 #endif | |
| 2398 if (!eof && !didline) | |
| 2399 { | |
| 2400 if (lnum == wp->w_topline) | |
| 2401 { | |
| 2402 /* | |
| 2403 * Single line that does not fit! | |
| 2404 * Don't overwrite it, it can be edited. | |
| 2405 */ | |
| 2406 wp->w_botline = lnum + 1; | |
| 2407 } | |
| 2408 #ifdef FEAT_DIFF | |
| 2409 else if (diff_check_fill(wp, lnum) >= wp->w_height - srow) | |
| 2410 { | |
| 2411 /* Window ends in filler lines. */ | |
| 2412 wp->w_botline = lnum; | |
| 2413 wp->w_filler_rows = wp->w_height - srow; | |
| 2414 } | |
| 2415 #endif | |
|
16839
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2416 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2417 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
|
2418 { |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2419 // 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
|
2420 wp->w_botline = lnum; |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2421 } |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2422 #endif |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2423 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
|
2424 { |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2425 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
|
2426 |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2427 /* |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2428 * 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
|
2429 */ |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
2430 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
|
2431 HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2432 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
|
2433 (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
|
2434 '@', ' ', HL_ATTR(HLF_AT)); |
|
9665
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2435 set_empty_rows(wp, srow); |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2436 wp->w_botline = lnum; |
|
b193bdb6ea25
commit https://github.com/vim/vim/commit/ad9c2a08f0509294269a2f11a59a438b944bdd5a
Christian Brabandt <cb@256bit.org>
parents:
9649
diff
changeset
|
2437 } |
| 7 | 2438 else if (dy_flags & DY_LASTLINE) /* 'display' has "lastline" */ |
| 2439 { | |
| 2440 /* | |
| 2441 * Last line isn't finished: Display "@@@" at the end. | |
| 2442 */ | |
| 2443 screen_fill(W_WINROW(wp) + wp->w_height - 1, | |
| 2444 W_WINROW(wp) + wp->w_height, | |
| 2445 (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
|
2446 '@', '@', HL_ATTR(HLF_AT)); |
| 7 | 2447 set_empty_rows(wp, srow); |
| 2448 wp->w_botline = lnum; | |
| 2449 } | |
| 2450 else | |
| 2451 { | |
|
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 win_draw_end(wp, '@', ' ', TRUE, srow, wp->w_height, HLF_AT); |
| 7 | 2453 wp->w_botline = lnum; |
| 2454 } | |
| 2455 } | |
| 2456 else | |
| 2457 { | |
| 2458 draw_vsep_win(wp, row); | |
| 2459 if (eof) /* we hit the end of the file */ | |
| 2460 { | |
| 2461 wp->w_botline = buf->b_ml.ml_line_count + 1; | |
| 2462 #ifdef FEAT_DIFF | |
| 2463 j = diff_check_fill(wp, wp->w_botline); | |
| 2464 if (j > 0 && !wp->w_botfill) | |
| 2465 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2466 // Display filler lines at the end of the file. |
| 7 | 2467 if (char2cells(fill_diff) > 1) |
| 2468 i = '-'; | |
| 2469 else | |
| 2470 i = fill_diff; | |
| 2471 if (row + j > wp->w_height) | |
| 2472 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
|
2473 win_draw_end(wp, i, i, TRUE, row, row + (int)j, HLF_DED); |
| 7 | 2474 row += j; |
| 2475 } | |
| 2476 #endif | |
| 2477 } | |
| 3318 | 2478 else if (dollar_vcol == -1) |
| 7 | 2479 wp->w_botline = lnum; |
| 2480 | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2481 // 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
|
2482 // 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
|
2483 win_draw_end(wp, |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2484 #ifdef FEAT_TEXT_PROP |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2485 bt_popup(wp->w_buffer) ? ' ' : |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2486 #endif |
|
032d5335987e
patch 8.1.1421: drawing "~" line in popup window
Bram Moolenaar <Bram@vim.org>
parents:
16835
diff
changeset
|
2487 '~', ' ', FALSE, row, wp->w_height, HLF_EOB); |
| 7 | 2488 } |
| 2489 | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2490 #ifdef SYN_TIME_LIMIT |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2491 syn_set_timeout(NULL); |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2492 #endif |
|
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
2493 |
| 7 | 2494 /* Reset the type of redrawing required, the window has been updated. */ |
| 2495 wp->w_redr_type = 0; | |
| 2496 #ifdef FEAT_DIFF | |
| 2497 wp->w_old_topfill = wp->w_topfill; | |
| 2498 wp->w_old_botfill = wp->w_botfill; | |
| 2499 #endif | |
| 2500 | |
| 3318 | 2501 if (dollar_vcol == -1) |
| 7 | 2502 { |
| 2503 /* | |
| 2504 * There is a trick with w_botline. If we invalidate it on each | |
| 2505 * change that might modify it, this will cause a lot of expensive | |
| 2506 * calls to plines() in update_topline() each time. Therefore the | |
| 2507 * value of w_botline is often approximated, and this value is used to | |
| 2508 * compute the value of w_topline. If the value of w_botline was | |
| 2509 * wrong, check that the value of w_topline is correct (cursor is on | |
| 2510 * the visible part of the text). If it's not, we need to redraw | |
| 2511 * again. Mostly this just means scrolling up a few lines, so it | |
| 2512 * doesn't look too bad. Only do this for the current window (where | |
| 2513 * changes are relevant). | |
| 2514 */ | |
| 2515 wp->w_valid |= VALID_BOTLINE; | |
| 2516 if (wp == curwin && wp->w_botline != old_botline && !recursive) | |
| 2517 { | |
| 2518 recursive = TRUE; | |
| 2519 curwin->w_valid &= ~VALID_TOPLINE; | |
| 2520 update_topline(); /* may invalidate w_botline again */ | |
| 2521 if (must_redraw != 0) | |
| 2522 { | |
| 2523 /* Don't update for changes in buffer again. */ | |
| 2524 i = curbuf->b_mod_set; | |
| 2525 curbuf->b_mod_set = FALSE; | |
| 2526 win_update(curwin); | |
| 2527 must_redraw = 0; | |
| 2528 curbuf->b_mod_set = i; | |
| 2529 } | |
| 2530 recursive = FALSE; | |
| 2531 } | |
| 2532 } | |
| 2533 | |
| 2534 #if defined(FEAT_SYN_HL) || defined(FEAT_SEARCH_EXTRA) | |
| 2535 /* restore got_int, unless CTRL-C was hit while redrawing */ | |
| 2536 if (!got_int) | |
| 2537 got_int = save_got_int; | |
| 2538 #endif | |
| 2539 } | |
| 2540 | |
| 2541 /* | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2542 * 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
|
2543 * 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
|
2544 */ |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2545 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
|
2546 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
|
2547 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
|
2548 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
|
2549 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
|
2550 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
|
2551 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
|
2552 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
|
2553 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
|
2554 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
|
2555 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2556 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
|
2557 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2558 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
|
2559 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
|
2560 #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
|
2561 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
|
2562 { |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2563 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
|
2564 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
|
2565 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
|
2566 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2567 else |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2568 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2569 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
|
2570 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
|
2571 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
|
2572 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
|
2573 } |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2574 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2575 /* |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2576 * 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
|
2577 * 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
|
2578 * When "draw_margin" is TRUE then draw the sign, fold and number columns. |
| 7 | 2579 */ |
| 2580 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2581 win_draw_end( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2582 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2583 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2584 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
|
2585 int draw_margin, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2586 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2587 int endrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2588 hlf_T hl) |
| 7 | 2589 { |
| 2590 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
|
2591 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
|
2592 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
|
2593 |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
2594 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
|
2595 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2596 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
|
2597 { |
| 6553 | 2598 #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
|
2599 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
|
2600 |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2601 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
|
2602 // 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
|
2603 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
|
2604 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
|
2605 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2606 #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
|
2607 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
|
2608 // 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
|
2609 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
|
2610 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
|
2611 #endif |
|
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2612 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
|
2613 && 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
|
2614 // 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
|
2615 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
|
2616 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
|
2617 } |
| 7 | 2618 |
| 2619 #ifdef FEAT_RIGHTLEFT | |
| 2620 if (wp->w_p_rl) | |
| 2621 { | |
| 2622 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
|
2623 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
|
2624 c2, c2, attr); |
| 7 | 2625 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
|
2626 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
|
2627 c1, c2, attr); |
| 7 | 2628 } |
| 2629 else | |
| 2630 #endif | |
| 2631 { | |
| 2632 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
|
2633 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
|
2634 c1, c2, attr); |
| 7 | 2635 } |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
2636 |
| 7 | 2637 set_empty_rows(wp, row); |
| 2638 } | |
| 2639 | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2640 #ifdef FEAT_SYN_HL |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2641 /* |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2642 * 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
|
2643 */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2644 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2645 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
|
2646 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2647 while (**color_cols >= 0 && vcol > **color_cols) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2648 ++*color_cols; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2649 return (**color_cols >= 0); |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2650 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2651 #endif |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
2652 |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2653 #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
|
2654 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2655 * 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
|
2656 * 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
|
2657 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2658 static int |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2659 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
|
2660 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2661 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
|
2662 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2663 if (has_mbyte) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2664 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2665 int cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2666 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
|
2667 int i; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2668 int idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2669 int c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2670 char_u *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2671 # ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2672 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
|
2673 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
|
2674 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2675 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2676 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2677 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
|
2678 idx = off; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2679 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2680 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2681 idx = off + col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2682 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2683 /* 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
|
2684 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
|
2685 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2686 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
|
2687 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
|
2688 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
|
2689 # ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2690 - (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
|
2691 # endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2692 ) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2693 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2694 ScreenLines[idx] = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2695 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2696 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2697 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
|
2698 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
|
2699 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2700 ScreenLinesUC[idx] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2701 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2702 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2703 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2704 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2705 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2706 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2707 #ifdef FEAT_ARABIC |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2708 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
|
2709 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2710 /* Do Arabic shaping. */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2711 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
|
2712 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
|
2713 int firstbyte = *p; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2714 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2715 /* 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
|
2716 * 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
|
2717 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
|
2718 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2719 pc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2720 pc1 = prev_c1; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2721 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
|
2722 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
|
2723 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2724 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2725 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2726 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
|
2727 nc = prev_c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2728 pc1 = pcc[0]; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2729 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2730 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2731 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2732 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
|
2733 pc, pc1, nc); |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2734 ScreenLines[idx] = firstbyte; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2735 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2736 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2737 prev_c = u8c; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2738 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2739 /* 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
|
2740 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
|
2741 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
|
2742 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2743 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
|
2744 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
|
2745 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2746 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2747 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2748 if (cells > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2749 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
|
2750 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2751 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
|
2752 /* 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
|
2753 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
|
2754 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
|
2755 /* double-width character */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2756 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
|
2757 col += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2758 idx += cells; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2759 p += c_len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2760 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2761 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2762 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2763 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2764 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
|
2765 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2766 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
|
2767 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
|
2768 if (len > 0) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2769 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2770 #ifdef FEAT_RIGHTLEFT |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2771 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
|
2772 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
|
2773 else |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2774 #endif |
|
15939
8013b532a1f7
patch 8.1.0975: using STRNCPY() wrongly. Warning for uninitialized variable
Bram Moolenaar <Bram@vim.org>
parents:
15868
diff
changeset
|
2775 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
|
2776 col += len; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2777 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2778 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2779 return col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2780 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2781 #endif |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2782 |
| 7 | 2783 #ifdef FEAT_FOLDING |
| 2784 /* | |
| 6553 | 2785 * Compute the width of the foldcolumn. Based on 'foldcolumn' and how much |
| 2786 * space is available for window "wp", minus "col". | |
| 2787 */ | |
| 2788 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2789 compute_foldcolumn(win_T *wp, int col) |
| 6553 | 2790 { |
| 2791 int fdc = wp->w_p_fdc; | |
| 2792 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
|
2793 int wwidth = wp->w_width; |
| 6553 | 2794 |
| 2795 if (fdc > wwidth - (col + wmw)) | |
| 2796 fdc = wwidth - (col + wmw); | |
| 2797 return fdc; | |
| 2798 } | |
| 2799 | |
| 2800 /* | |
| 7 | 2801 * Display one folded line. |
| 2802 */ | |
| 2803 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2804 fold_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2805 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2806 long fold_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2807 foldinfo_T *foldinfo, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2808 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
2809 int row) |
| 7 | 2810 { |
|
9754
a990e7ed260b
commit https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
Christian Brabandt <cb@256bit.org>
parents:
9665
diff
changeset
|
2811 char_u buf[FOLD_TEXT_LEN]; |
| 7 | 2812 pos_T *top, *bot; |
| 2813 linenr_T lnume = lnum + fold_count - 1; | |
| 2814 int len; | |
| 29 | 2815 char_u *text; |
| 7 | 2816 int fdc; |
| 2817 int col; | |
| 2818 int txtcol; | |
| 2819 int off = (int)(current_ScreenLine - ScreenLines); | |
| 216 | 2820 int ri; |
| 7 | 2821 |
| 2822 /* Build the fold line: | |
| 2823 * 1. Add the cmdwin_type for the command-line window | |
| 2824 * 2. Add the 'foldcolumn' | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2825 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2826 * 4. Compose the text |
| 2827 * 5. Add the text | |
| 2828 * 6. set highlighting for the Visual area an other text | |
| 2829 */ | |
| 2830 col = 0; | |
| 2831 | |
| 2832 /* | |
| 2833 * 1. Add the cmdwin_type for the command-line window | |
| 2834 * Ignores 'rightleft', this window is never right-left. | |
| 2835 */ | |
| 2836 #ifdef FEAT_CMDWIN | |
| 2837 if (cmdwin_type != 0 && wp == curwin) | |
| 2838 { | |
| 2839 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
|
2840 ScreenAttrs[off] = HL_ATTR(HLF_AT); |
| 7 | 2841 if (enc_utf8) |
| 2842 ScreenLinesUC[off] = 0; | |
| 2843 ++col; | |
| 2844 } | |
| 2845 #endif | |
| 2846 | |
| 2847 /* | |
| 2848 * 2. Add the 'foldcolumn' | |
| 6553 | 2849 * Reduce the width when there is not enough space. |
| 7 | 2850 */ |
| 6553 | 2851 fdc = compute_foldcolumn(wp, col); |
| 7 | 2852 if (fdc > 0) |
| 2853 { | |
| 2854 fill_foldcolumn(buf, wp, TRUE, lnum); | |
| 2855 #ifdef FEAT_RIGHTLEFT | |
| 2856 if (wp->w_p_rl) | |
| 2857 { | |
| 2858 int i; | |
| 2859 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2860 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
|
2861 HL_ATTR(HLF_FC)); |
| 7 | 2862 /* reverse the fold column */ |
| 2863 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
|
2864 ScreenLines[off + wp->w_width - i - 1 - col] = buf[i]; |
| 7 | 2865 } |
| 2866 else | |
| 2867 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2868 copy_text_attr(off + col, buf, fdc, HL_ATTR(HLF_FC)); |
| 7 | 2869 col += fdc; |
| 2870 } | |
| 2871 | |
| 2872 #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
|
2873 # 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
|
2874 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2875 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
|
2876 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
|
2877 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
|
2878 else \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2879 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
|
2880 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
|
2881 } while (0) |
| 7 | 2882 #else |
|
13632
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2883 # 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
|
2884 do { \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2885 for (ri = 0; ri < l; ++ri) \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2886 ScreenAttrs[off + (p) + ri] = v; \ |
|
cec5137d5332
patch 8.0.1688: some macros are used without a semicolon
Christian Brabandt <cb@256bit.org>
parents:
13452
diff
changeset
|
2887 } while (0) |
| 7 | 2888 #endif |
| 2889 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2890 /* 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
|
2891 * text */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2892 RL_MEMSET(col, HL_ATTR(HLF_FL), wp->w_width - col); |
| 7 | 2893 |
| 2894 #ifdef FEAT_SIGNS | |
| 2895 /* 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
|
2896 if (signcolumn_on(wp)) |
| 7 | 2897 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2898 len = wp->w_width - col; |
| 7 | 2899 if (len > 0) |
| 2900 { | |
| 2901 if (len > 2) | |
| 2902 len = 2; | |
| 2903 # ifdef FEAT_RIGHTLEFT | |
| 2904 if (wp->w_p_rl) | |
| 2905 /* 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
|
2906 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
|
2907 (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2908 else |
| 2909 # endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2910 copy_text_attr(off + col, (char_u *)" ", len, HL_ATTR(HLF_FL)); |
| 7 | 2911 col += len; |
| 2912 } | |
| 2913 } | |
| 2914 #endif | |
| 2915 | |
| 2916 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2917 * 3. Add the 'number' or 'relativenumber' column |
| 7 | 2918 */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2919 if (wp->w_p_nu || wp->w_p_rnu) |
| 7 | 2920 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2921 len = wp->w_width - col; |
| 7 | 2922 if (len > 0) |
| 2923 { | |
| 13 | 2924 int w = number_width(wp); |
| 5905 | 2925 long num; |
| 2926 char *fmt = "%*ld "; | |
| 13 | 2927 |
| 2928 if (len > w + 1) | |
| 2929 len = w + 1; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2930 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2931 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
|
2932 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2933 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2934 else |
| 4065 | 2935 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
2936 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 2937 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
|
2938 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
|
2939 { |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2940 /* 'number' + 'relativenumber': cursor line shows absolute |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
2941 * line number */ |
| 4065 | 2942 num = lnum; |
| 2943 fmt = "%-*ld "; | |
| 2944 } | |
| 2945 } | |
| 2946 | |
| 2947 sprintf((char *)buf, fmt, w, num); | |
| 7 | 2948 #ifdef FEAT_RIGHTLEFT |
| 2949 if (wp->w_p_rl) | |
| 2950 /* 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
|
2951 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
|
2952 HL_ATTR(HLF_FL)); |
| 7 | 2953 else |
| 2954 #endif | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
2955 copy_text_attr(off + col, buf, len, HL_ATTR(HLF_FL)); |
| 7 | 2956 col += len; |
| 2957 } | |
| 2958 } | |
| 2959 | |
| 2960 /* | |
| 2961 * 4. Compose the folded-line string with 'foldtext', if set. | |
| 2962 */ | |
| 29 | 2963 text = get_foldtext(wp, lnum, lnume, foldinfo, buf); |
| 7 | 2964 |
| 2965 txtcol = col; /* remember where text starts */ | |
| 2966 | |
| 2967 /* | |
| 2968 * 5. move the text to current_ScreenLine. Fill up with "fill_fold". | |
| 2969 * Right-left text is put in columns 0 - number-col, normal text is put | |
| 2970 * in columns number-col - window-width. | |
| 2971 */ | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
2972 col = text_to_screenline(wp, text, col); |
| 7 | 2973 |
| 2974 /* Fill the rest of the line with the fold filler */ | |
| 2975 #ifdef FEAT_RIGHTLEFT | |
| 2976 if (wp->w_p_rl) | |
| 2977 col -= txtcol; | |
| 2978 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
2979 while (col < wp->w_width |
| 7 | 2980 #ifdef FEAT_RIGHTLEFT |
| 2981 - (wp->w_p_rl ? txtcol : 0) | |
| 2982 #endif | |
| 2983 ) | |
| 2984 { | |
| 2985 if (enc_utf8) | |
| 2986 { | |
| 2987 if (fill_fold >= 0x80) | |
| 2988 { | |
| 2989 ScreenLinesUC[off + col] = fill_fold; | |
| 714 | 2990 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
|
2991 ScreenLines[off + col] = 0x80; /* avoid storing zero */ |
| 7 | 2992 } |
| 2993 else | |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2994 { |
| 7 | 2995 ScreenLinesUC[off + col] = 0; |
|
11277
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2996 ScreenLines[off + col] = fill_fold; |
|
f26a535d9464
patch 8.0.0524: folds messed up
Christian Brabandt <cb@256bit.org>
parents:
11269
diff
changeset
|
2997 } |
|
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
|
2998 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
|
2999 } |
|
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
|
3000 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
|
3001 ScreenLines[off + col++] = fill_fold; |
| 7 | 3002 } |
| 3003 | |
| 3004 if (text != buf) | |
| 3005 vim_free(text); | |
| 3006 | |
| 3007 /* | |
| 3008 * 6. set highlighting for the Visual area an other text. | |
| 3009 * If all folded lines are in the Visual area, highlight the line. | |
| 3010 */ | |
| 3011 if (VIsual_active && wp->w_buffer == curwin->w_buffer) | |
| 3012 { | |
|
11121
778c10516955
patch 8.0.0448: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11105
diff
changeset
|
3013 if (LTOREQ_POS(curwin->w_cursor, VIsual)) |
| 7 | 3014 { |
| 3015 /* Visual is after curwin->w_cursor */ | |
| 3016 top = &curwin->w_cursor; | |
| 3017 bot = &VIsual; | |
| 3018 } | |
| 3019 else | |
| 3020 { | |
| 3021 /* Visual is before curwin->w_cursor */ | |
| 3022 top = &VIsual; | |
| 3023 bot = &curwin->w_cursor; | |
| 3024 } | |
| 3025 if (lnum >= top->lnum | |
| 3026 && lnume <= bot->lnum | |
| 3027 && (VIsual_mode != 'v' | |
| 3028 || ((lnum > top->lnum | |
| 3029 || (lnum == top->lnum | |
| 3030 && top->col == 0)) | |
| 3031 && (lnume < bot->lnum | |
| 3032 || (lnume == bot->lnum | |
| 3033 && (bot->col - (*p_sel == 'e')) | |
| 1883 | 3034 >= (colnr_T)STRLEN(ml_get_buf(wp->w_buffer, lnume, FALSE))))))) |
| 7 | 3035 { |
| 3036 if (VIsual_mode == Ctrl_V) | |
| 3037 { | |
| 3038 /* 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
|
3039 if (wp->w_old_cursor_fcol + txtcol < (colnr_T)wp->w_width) |
| 7 | 3040 { |
| 3040 | 3041 if (wp->w_old_cursor_lcol != MAXCOL |
| 3042 && 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
|
3043 < (colnr_T)wp->w_width) |
| 7 | 3044 len = wp->w_old_cursor_lcol; |
| 3045 else | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3046 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
|
3047 RL_MEMSET(wp->w_old_cursor_fcol + txtcol, HL_ATTR(HLF_V), |
| 230 | 3048 len - (int)wp->w_old_cursor_fcol); |
| 7 | 3049 } |
| 3050 } | |
| 3051 else | |
| 216 | 3052 { |
| 7 | 3053 /* 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
|
3054 RL_MEMSET(txtcol, HL_ATTR(HLF_V), wp->w_width - txtcol); |
| 216 | 3055 } |
| 7 | 3056 } |
| 3057 } | |
| 3058 | |
| 743 | 3059 #ifdef FEAT_SYN_HL |
| 6685 | 3060 /* Show colorcolumn in the fold line, but let cursorcolumn override it. */ |
| 3061 if (wp->w_p_cc_cols) | |
| 3062 { | |
| 3063 int i = 0; | |
| 3064 int j = wp->w_p_cc_cols[i]; | |
| 3065 int old_txtcol = txtcol; | |
| 3066 | |
| 3067 while (j > -1) | |
| 3068 { | |
| 3069 txtcol += j; | |
| 3070 if (wp->w_p_wrap) | |
| 3071 txtcol -= wp->w_skipcol; | |
| 3072 else | |
| 3073 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
|
3074 if (txtcol >= 0 && txtcol < wp->w_width) |
| 6685 | 3075 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
|
3076 ScreenAttrs[off + txtcol], HL_ATTR(HLF_MC)); |
| 6685 | 3077 txtcol = old_txtcol; |
| 3078 j = wp->w_p_cc_cols[++i]; | |
| 3079 } | |
| 3080 } | |
| 3081 | |
| 743 | 3082 /* Show 'cursorcolumn' in the fold line. */ |
| 1725 | 3083 if (wp->w_p_cuc) |
| 3084 { | |
| 3085 txtcol += wp->w_virtcol; | |
| 3086 if (wp->w_p_wrap) | |
| 3087 txtcol -= wp->w_skipcol; | |
| 3088 else | |
| 3089 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
|
3090 if (txtcol >= 0 && txtcol < wp->w_width) |
| 1725 | 3091 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
|
3092 ScreenAttrs[off + txtcol], HL_ATTR(HLF_CUC)); |
| 1725 | 3093 } |
| 743 | 3094 #endif |
| 7 | 3095 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
3096 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
|
3097 (int)wp->w_width, 0); |
| 7 | 3098 |
| 3099 /* | |
| 3100 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 3101 * updated (saves a call to plines() later). | |
| 3102 */ | |
| 3103 if (wp == curwin | |
| 3104 && lnum <= curwin->w_cursor.lnum | |
| 3105 && lnume >= curwin->w_cursor.lnum) | |
| 3106 { | |
| 3107 curwin->w_cline_row = row; | |
| 3108 curwin->w_cline_height = 1; | |
| 3109 curwin->w_cline_folded = TRUE; | |
| 3110 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 3111 } | |
| 3112 } | |
| 3113 | |
| 3114 /* | |
| 3115 * Copy "buf[len]" to ScreenLines["off"] and set attributes to "attr". | |
| 3116 */ | |
| 3117 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3118 copy_text_attr( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3119 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3120 char_u *buf, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3121 int len, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3122 int attr) |
| 7 | 3123 { |
| 216 | 3124 int i; |
| 3125 | |
| 7 | 3126 mch_memmove(ScreenLines + off, buf, (size_t)len); |
| 3127 if (enc_utf8) | |
| 3128 vim_memset(ScreenLinesUC + off, 0, sizeof(u8char_T) * (size_t)len); | |
| 216 | 3129 for (i = 0; i < len; ++i) |
| 3130 ScreenAttrs[off + i] = attr; | |
| 7 | 3131 } |
| 3132 | |
| 3133 /* | |
| 3134 * Fill the foldcolumn at "p" for window "wp". | |
| 548 | 3135 * Only to be called when 'foldcolumn' > 0. |
| 7 | 3136 */ |
| 3137 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3138 fill_foldcolumn( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3139 char_u *p, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3140 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3141 int closed, /* TRUE of FALSE */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3142 linenr_T lnum) /* current line number */ |
| 7 | 3143 { |
| 3144 int i = 0; | |
| 3145 int level; | |
| 3146 int first_level; | |
| 519 | 3147 int empty; |
| 6553 | 3148 int fdc = compute_foldcolumn(wp, 0); |
| 7 | 3149 |
| 3150 /* Init to all spaces. */ | |
| 6929 | 3151 vim_memset(p, ' ', (size_t)fdc); |
| 7 | 3152 |
| 3153 level = win_foldinfo.fi_level; | |
| 3154 if (level > 0) | |
| 3155 { | |
| 519 | 3156 /* If there is only one column put more info in it. */ |
| 6553 | 3157 empty = (fdc == 1) ? 0 : 1; |
| 519 | 3158 |
| 7 | 3159 /* If the column is too narrow, we start at the lowest level that |
| 3160 * fits and use numbers to indicated the depth. */ | |
| 6553 | 3161 first_level = level - fdc - closed + 1 + empty; |
| 7 | 3162 if (first_level < 1) |
| 3163 first_level = 1; | |
| 3164 | |
| 6553 | 3165 for (i = 0; i + empty < fdc; ++i) |
| 7 | 3166 { |
| 3167 if (win_foldinfo.fi_lnum == lnum | |
| 3168 && first_level + i >= win_foldinfo.fi_low_level) | |
| 3169 p[i] = '-'; | |
| 3170 else if (first_level == 1) | |
| 3171 p[i] = '|'; | |
| 3172 else if (first_level + i <= 9) | |
| 3173 p[i] = '0' + first_level + i; | |
| 3174 else | |
| 3175 p[i] = '>'; | |
| 3176 if (first_level + i == level) | |
| 3177 break; | |
| 3178 } | |
| 3179 } | |
| 3180 if (closed) | |
| 6553 | 3181 p[i >= fdc ? i - 1 : i] = '+'; |
| 7 | 3182 } |
| 3183 #endif /* FEAT_FOLDING */ | |
| 3184 | |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3185 #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
|
3186 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
|
3187 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
|
3188 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3189 static int |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3190 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
|
3191 { |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3192 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
|
3193 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
|
3194 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
|
3195 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3196 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
|
3197 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
|
3198 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
|
3199 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
|
3200 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
|
3201 return 0; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3202 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
|
3203 return -1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3204 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
|
3205 return 1; |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3206 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
|
3207 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
|
3208 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
|
3209 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
|
3210 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
|
3211 } |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3212 #endif |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
3213 |
| 7 | 3214 /* |
| 3215 * Display line "lnum" of window 'wp' on the screen. | |
| 3216 * Start at row "startrow", stop when "endrow" is reached. | |
| 3217 * wp->w_virtcol needs to be valid. | |
| 3218 * | |
| 3219 * Return the number of last row the line occupies. | |
| 3220 */ | |
| 3221 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3222 win_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3223 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3224 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3225 int startrow, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
3226 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
|
3227 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
|
3228 int number_only) // only update the number column |
| 7 | 3229 { |
|
10801
e7b8be5ecacd
patch 8.0.0290: cursor positioning wrong if wide character wraps
Christian Brabandt <cb@256bit.org>
parents:
10793
diff
changeset
|
3230 int col = 0; /* visual column on screen */ |
| 7 | 3231 unsigned off; /* offset in ScreenLines/ScreenAttrs */ |
| 3232 int c = 0; /* init for GCC */ | |
| 3233 long vcol = 0; /* virtual column (for tabs) */ | |
| 6503 | 3234 #ifdef FEAT_LINEBREAK |
| 3235 long vcol_sbr = -1; /* virtual column after showbreak */ | |
| 3236 #endif | |
| 7 | 3237 long vcol_prev = -1; /* "vcol" of previous character */ |
| 3238 char_u *line; /* current line */ | |
| 3239 char_u *ptr; /* current position in "line" */ | |
| 3240 int row; /* row in the window, excl w_winrow */ | |
| 3241 int screen_row; /* row on the screen, incl w_winrow */ | |
| 3242 | |
| 3243 char_u extra[18]; /* "%ld" and 'fdc' must fit in here */ | |
| 3244 int n_extra = 0; /* number of extra chars */ | |
| 1340 | 3245 char_u *p_extra = NULL; /* string of extra chars, plus NUL */ |
| 6026 | 3246 char_u *p_extra_free = NULL; /* p_extra needs to be freed */ |
| 7 | 3247 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
|
3248 int c_final = NUL; /* final char, mandatory if set */ |
| 7 | 3249 int extra_attr = 0; /* attributes when n_extra != 0 */ |
| 3250 static char_u *at_end_str = (char_u *)""; /* used for p_extra when | |
| 3251 displaying lcs_eol at end-of-line */ | |
| 3252 int lcs_eol_one = lcs_eol; /* lcs_eol until it's been used */ | |
| 3253 int lcs_prec_todo = lcs_prec; /* lcs_prec until it's been used */ | |
| 3254 | |
| 3255 /* saved "extra" items for when draw_state becomes WL_LINE (again) */ | |
| 3256 int saved_n_extra = 0; | |
| 3257 char_u *saved_p_extra = NULL; | |
| 3258 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
|
3259 int saved_c_final = 0; |
| 7 | 3260 int saved_char_attr = 0; |
| 3261 | |
| 3262 int n_attr = 0; /* chars with special attr */ | |
| 3263 int saved_attr2 = 0; /* char_attr saved for n_attr */ | |
| 3264 int n_attr3 = 0; /* chars with overruling special attr */ | |
| 3265 int saved_attr3 = 0; /* char_attr saved for n_attr3 */ | |
| 3266 | |
| 3267 int n_skip = 0; /* nr of chars to skip for 'nowrap' */ | |
| 3268 | |
| 3269 int fromcol, tocol; /* start/end of inverting */ | |
| 3270 int fromcol_prev = -2; /* start of inverting after cursor */ | |
| 3271 int noinvcur = FALSE; /* don't invert the cursor */ | |
| 3272 pos_T *top, *bot; | |
| 1813 | 3273 int lnum_in_visual_area = FALSE; |
| 7 | 3274 pos_T pos; |
| 3275 long v; | |
| 3276 | |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3277 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
|
3278 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
|
3279 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
|
3280 // 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
|
3281 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
|
3282 // highlighting |
|
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
3283 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
|
3284 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
|
3285 // 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
|
3286 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
|
3287 int search_attr = 0; // attributes desired by 'hlsearch' |
| 7 | 3288 #ifdef FEAT_SYN_HL |
| 743 | 3289 int vcol_save_attr = 0; /* saved attr for 'cursorcolumn' */ |
| 7 | 3290 int syntax_attr = 0; /* attributes desired by syntax */ |
| 3291 int has_syntax = FALSE; /* this buffer has syntax highl. */ | |
| 3292 int save_did_emsg; | |
| 1437 | 3293 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
|
3294 int draw_color_col = FALSE; /* highlight colorcolumn */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3295 int *color_cols = NULL; /* pointer to according columns array */ |
| 743 | 3296 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3297 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3298 int text_prop_count; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3299 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
|
3300 textprop_T *text_props = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3301 int *text_prop_idxs = NULL; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3302 int text_props_active = 0; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3303 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
|
3304 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
|
3305 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
|
3306 #endif |
| 743 | 3307 #ifdef FEAT_SPELL |
| 221 | 3308 int has_spell = FALSE; /* this buffer has spell checking */ |
| 348 | 3309 # define SPWORDLEN 150 |
| 3310 char_u nextline[SPWORDLEN * 2];/* text with start of the next line */ | |
| 353 | 3311 int nextlinecol = 0; /* column where nextline[] starts */ |
| 3312 int nextline_idx = 0; /* index in nextline[] where next line | |
| 348 | 3313 starts */ |
| 221 | 3314 int spell_attr = 0; /* attributes desired by spelling */ |
| 3315 int word_end = 0; /* last byte with same spell_attr */ | |
| 378 | 3316 static linenr_T checked_lnum = 0; /* line number for "checked_col" */ |
| 3317 static int checked_col = 0; /* column in "checked_lnum" up to which | |
| 348 | 3318 * there are no spell errors */ |
| 386 | 3319 static int cap_col = -1; /* column to check for Cap word */ |
| 3320 static linenr_T capcol_lnum = 0; /* line number where "cap_col" used */ | |
| 348 | 3321 int cur_checked_col = 0; /* checked column for current line */ |
| 7 | 3322 #endif |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3323 int extra_check = 0; // has extra highlighting |
| 7 | 3324 int multi_attr = 0; /* attributes desired by multibyte */ |
| 3325 int mb_l = 1; /* multi-byte byte length */ | |
| 3326 int mb_c = 0; /* decoded multi-byte character */ | |
| 3327 int mb_utf8 = FALSE; /* screen char is UTF-8 char */ | |
| 714 | 3328 int u8cc[MAX_MCO]; /* composing UTF-8 chars */ |
| 7 | 3329 #ifdef FEAT_DIFF |
| 3330 int filler_lines; /* nr of filler lines to be drawn */ | |
| 3331 int filler_todo; /* nr of filler lines still to do + 1 */ | |
| 534 | 3332 hlf_T diff_hlf = (hlf_T)0; /* type of diff highlighting */ |
| 7 | 3333 int change_start = MAXCOL; /* first col of changed area */ |
| 3334 int change_end = -1; /* last col of changed area */ | |
| 3335 #endif | |
| 3336 colnr_T trailcol = MAXCOL; /* start of trailing spaces */ | |
| 3337 #ifdef FEAT_LINEBREAK | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
3338 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
|
3339 chars */ |
| 7 | 3340 #endif |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3341 #if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ |
| 910 | 3342 || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) |
| 7 | 3343 # define LINE_ATTR |
| 1536 | 3344 int line_attr = 0; /* attribute for the whole line */ |
| 7 | 3345 #endif |
| 3346 #ifdef FEAT_SEARCH_EXTRA | |
| 1326 | 3347 matchitem_T *cur; /* points to the match list */ |
| 3348 match_T *shl; /* points to search_hl or a match */ | |
| 3349 int shl_flag; /* flag to indicate whether search_hl | |
| 3350 has been processed or not */ | |
| 5979 | 3351 int pos_inprogress; /* marks that position match search is |
| 3352 in progress */ | |
| 1326 | 3353 int prevcol_hl_flag; /* flag to indicate whether prevcol |
| 3354 equals startcol of search_hl or one | |
| 3355 of the matches */ | |
| 7 | 3356 #endif |
| 3357 #ifdef FEAT_ARABIC | |
| 3358 int prev_c = 0; /* previous Arabic character */ | |
| 3359 int prev_c1 = 0; /* first composing char for prev_c */ | |
| 3360 #endif | |
| 910 | 3361 #if defined(LINE_ATTR) |
| 867 | 3362 int did_line_attr = 0; |
| 3363 #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
|
3364 #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
|
3365 int get_term_attr = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3366 #endif |
| 7 | 3367 |
| 3368 /* draw_state: items that are drawn in sequence: */ | |
| 3369 #define WL_START 0 /* nothing done yet */ | |
| 3370 #ifdef FEAT_CMDWIN | |
| 3371 # define WL_CMDLINE WL_START + 1 /* cmdline window column */ | |
| 3372 #else | |
| 3373 # define WL_CMDLINE WL_START | |
| 3374 #endif | |
| 3375 #ifdef FEAT_FOLDING | |
| 3376 # define WL_FOLD WL_CMDLINE + 1 /* 'foldcolumn' */ | |
| 3377 #else | |
| 3378 # define WL_FOLD WL_CMDLINE | |
| 3379 #endif | |
| 3380 #ifdef FEAT_SIGNS | |
| 3381 # define WL_SIGN WL_FOLD + 1 /* column for signs */ | |
| 3382 #else | |
| 3383 # define WL_SIGN WL_FOLD /* column for signs */ | |
| 3384 #endif | |
| 3385 #define WL_NR WL_SIGN + 1 /* line number */ | |
| 5995 | 3386 #ifdef FEAT_LINEBREAK |
| 3387 # define WL_BRI WL_NR + 1 /* 'breakindent' */ | |
| 3388 #else | |
| 3389 # define WL_BRI WL_NR | |
| 3390 #endif | |
| 7 | 3391 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 5995 | 3392 # define WL_SBR WL_BRI + 1 /* 'showbreak' or 'diff' */ |
| 7 | 3393 #else |
| 5995 | 3394 # define WL_SBR WL_BRI |
| 7 | 3395 #endif |
| 3396 #define WL_LINE WL_SBR + 1 /* text in the line */ | |
| 3397 int draw_state = WL_START; /* what to draw next */ | |
| 574 | 3398 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 3399 int feedback_col = 0; |
| 3400 int feedback_old_attr = -1; | |
| 3401 #endif | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3402 int screen_line_flags = 0; |
| 7 | 3403 |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3404 #ifdef FEAT_CONCEAL |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3405 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
|
3406 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
|
3407 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
|
3408 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
|
3409 int is_concealing = FALSE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3410 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
|
3411 wrapping */ |
|
2409
0ca06a92adfb
Add support for horizontal scroll wheel. (Bjorn Winckler)
Bram Moolenaar <bram@vim.org>
parents:
2400
diff
changeset
|
3412 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
|
3413 int did_wcol = FALSE; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
3414 int match_conc = 0; /* cchar for match functions */ |
| 6520 | 3415 int old_boguscols = 0; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3416 # define VCOL_HLC (vcol - vcol_off) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3417 # define FIX_FOR_BOGUSCOLS \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3418 { \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3419 n_extra += vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3420 vcol -= vcol_off; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3421 vcol_off = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3422 col -= boguscols; \ |
| 6520 | 3423 old_boguscols = boguscols; \ |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3424 boguscols = 0; \ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
3425 } |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3426 #else |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
3427 # define VCOL_HLC (vcol) |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
3428 #endif |
| 7 | 3429 |
| 3430 if (startrow > endrow) /* past the end already! */ | |
| 3431 return startrow; | |
| 3432 | |
| 3433 row = startrow; | |
| 3434 screen_row = row + W_WINROW(wp); | |
| 3435 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3436 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
|
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 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3439 * 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
|
3440 * 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
|
3441 */ |
| 7 | 3442 #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
|
3443 extra_check = wp->w_p_lbr; |
| 7 | 3444 #endif |
| 3445 #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
|
3446 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
|
3447 # 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
|
3448 && !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
|
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 /* 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
|
3453 * 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
|
3454 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
|
3455 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
|
3456 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
|
3457 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
|
3458 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
|
3459 else |
|
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 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
|
3462 #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
|
3463 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
|
3464 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3465 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3466 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
|
3467 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
|
3468 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3469 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3470 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3471 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3472 /* 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
|
3473 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
|
3474 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
|
3475 draw_color_col = advance_color_col(VCOL_HLC, &color_cols); |
| 743 | 3476 #endif |
| 3477 | |
|
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
|
3478 #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
|
3479 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
|
3480 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3481 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
|
3482 get_term_attr = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3483 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
|
3484 } |
|
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
|
3485 #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
|
3486 |
| 743 | 3487 #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
|
3488 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
|
3489 && *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
|
3490 && 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
|
3491 && *(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
|
3492 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3493 /* 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
|
3494 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
|
3495 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
|
3496 |
|
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
|
3497 /* 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
|
3498 * 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
|
3499 * 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
|
3500 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
|
3501 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
|
3502 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3503 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
|
3504 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
|
3505 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3506 |
|
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
|
3507 /* 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
|
3508 * 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
|
3509 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
|
3510 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
|
3511 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
|
3512 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3513 /* 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
|
3514 * 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
|
3515 * 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
|
3516 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
|
3517 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
|
3518 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
|
3519 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
|
3520 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
|
3521 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3522 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3523 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3524 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3525 * 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
|
3526 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3527 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
|
3528 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
|
3529 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
|
3530 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3531 /* 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
|
3532 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
|
3533 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3534 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
|
3535 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
|
3536 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3537 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
|
3538 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3539 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
|
3540 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
|
3541 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3542 lnum_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
|
3543 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
|
3544 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3545 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
|
3546 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3547 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
|
3548 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
|
3549 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3550 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3551 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
|
3552 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3553 if (lnum > top->lnum && lnum <= bot->lnum) |
| 7 | 3554 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
|
3555 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
|
3556 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3557 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
|
3558 fromcol = 0; |
| 7 | 3559 else |
| 3560 { | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3561 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
|
3562 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
|
3563 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
|
3564 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3565 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3566 if (VIsual_mode != 'V' && 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
|
3567 { |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
3568 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
|
3569 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3570 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
|
3571 tocol = MAXCOL; |
| 7 | 3572 } |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3573 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
|
3574 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
|
3575 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3576 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3577 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
|
3578 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
|
3579 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
|
3580 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3581 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3582 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
|
3583 ++tocol; |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3584 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3585 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3586 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3587 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3588 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3589 /* 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
|
3590 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
|
3591 #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
|
3592 && !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
|
3593 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3594 ) |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3595 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
|
3596 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3597 /* 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
|
3598 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
|
3599 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3600 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3601 vi_attr = HL_ATTR(HLF_V); |
| 7 | 3602 #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
|
3603 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
|
3604 && 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
|
3605 || (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
|
3606 && clip_isautosel_plus())) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3607 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
|
3608 #endif |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3609 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3610 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3611 |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3612 /* |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3613 * 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
|
3614 */ |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3615 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
|
3616 && 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
|
3617 && 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
|
3618 && 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
|
3619 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3620 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
|
3621 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
|
3622 (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
|
3623 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3624 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
|
3625 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
|
3626 { |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3627 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
|
3628 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
|
3629 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
|
3630 } |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3631 else |
|
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
3632 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
|
3633 /* 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
|
3634 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
|
3635 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
|
3636 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3637 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
|
3638 } |
| 7 | 3639 } |
| 3640 | |
| 3641 #ifdef FEAT_DIFF | |
| 3642 filler_lines = diff_check(wp, lnum); | |
| 3643 if (filler_lines < 0) | |
| 3644 { | |
| 3645 if (filler_lines == -1) | |
| 3646 { | |
| 3647 if (diff_find_change(wp, lnum, &change_start, &change_end)) | |
| 3648 diff_hlf = HLF_ADD; /* added line */ | |
| 3649 else if (change_start == 0) | |
| 3650 diff_hlf = HLF_TXD; /* changed text */ | |
| 3651 else | |
| 3652 diff_hlf = HLF_CHD; /* changed line */ | |
| 3653 } | |
| 3654 else | |
| 3655 diff_hlf = HLF_ADD; /* added line */ | |
| 3656 filler_lines = 0; | |
| 3657 area_highlighting = TRUE; | |
| 3658 } | |
| 3659 if (lnum == wp->w_topline) | |
| 3660 filler_lines = wp->w_topfill; | |
| 3661 filler_todo = filler_lines; | |
| 3662 #endif | |
| 3663 | |
| 3664 #ifdef LINE_ATTR | |
| 3665 # ifdef FEAT_SIGNS | |
| 3666 /* If this line has a sign with line highlighting set line_attr. */ | |
| 3667 v = buf_getsigntype(wp->w_buffer, lnum, SIGN_LINEHL); | |
| 3668 if (v != 0) | |
| 3669 line_attr = sign_get_attr((int)v, TRUE); | |
| 3670 # endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
3671 # if defined(FEAT_QUICKFIX) |
| 7 | 3672 /* Highlight the current line in the quickfix window. */ |
| 644 | 3673 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
|
3674 line_attr = HL_ATTR(HLF_QFL); |
| 7 | 3675 # endif |
| 3676 if (line_attr != 0) | |
| 3677 area_highlighting = TRUE; | |
| 3678 #endif | |
| 3679 | |
| 3680 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3681 ptr = line; | |
| 3682 | |
| 743 | 3683 #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
|
3684 if (has_spell && !number_only) |
| 348 | 3685 { |
| 386 | 3686 /* For checking first word with a capital skip white space. */ |
| 3687 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
|
3688 cap_col = getwhitecols(line); |
| 386 | 3689 |
| 348 | 3690 /* To be able to spell-check over line boundaries copy the end of the |
| 3691 * current line into nextline[]. Above the start of the next line was | |
| 3692 * copied to nextline[SPWORDLEN]. */ | |
| 3693 if (nextline[SPWORDLEN] == NUL) | |
| 3694 { | |
| 3695 /* No next line or it is empty. */ | |
| 3696 nextlinecol = MAXCOL; | |
| 3697 nextline_idx = 0; | |
| 3698 } | |
| 3699 else | |
| 3700 { | |
| 835 | 3701 v = (long)STRLEN(line); |
| 348 | 3702 if (v < SPWORDLEN) |
| 3703 { | |
| 3704 /* Short line, use it completely and append the start of the | |
| 3705 * next line. */ | |
| 3706 nextlinecol = 0; | |
| 3707 mch_memmove(nextline, line, (size_t)v); | |
| 1621 | 3708 STRMOVE(nextline + v, nextline + SPWORDLEN); |
| 348 | 3709 nextline_idx = v + 1; |
| 3710 } | |
| 3711 else | |
| 3712 { | |
| 3713 /* Long line, use only the last SPWORDLEN bytes. */ | |
| 3714 nextlinecol = v - SPWORDLEN; | |
| 3715 mch_memmove(nextline, line + nextlinecol, SPWORDLEN); | |
| 3716 nextline_idx = SPWORDLEN + 1; | |
| 3717 } | |
| 3718 } | |
| 3719 } | |
| 3720 #endif | |
| 3721 | |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3722 if (wp->w_p_list) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3723 { |
|
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
|
3724 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
|
3725 extra_check = TRUE; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3726 /* find start of trailing whitespace */ |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3727 if (lcs_trail) |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3728 { |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3729 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
|
3730 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
|
3731 --trailcol; |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3732 trailcol += (colnr_T) (ptr - line); |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
3733 } |
| 7 | 3734 } |
| 3735 | |
|
16817
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3736 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
|
3737 if (wcr_attr != 0) |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3738 { |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3739 win_attr = wcr_attr; |
|
069ee8dc8c8d
patch 8.1.1410: popup_move() is not implemented yet
Bram Moolenaar <Bram@vim.org>
parents:
16813
diff
changeset
|
3740 area_highlighting = TRUE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3741 } |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3742 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3743 if (bt_popup(wp->w_buffer)) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3744 screen_line_flags |= SLF_POPUP; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3745 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3746 |
| 7 | 3747 /* |
| 3748 * 'nowrap' or 'wrap' and a single line that doesn't fit: Advance to the | |
| 3749 * first character to be displayed. | |
| 3750 */ | |
| 3751 if (wp->w_p_wrap) | |
| 3752 v = wp->w_skipcol; | |
| 3753 else | |
| 3754 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
|
3755 if (v > 0 && !number_only) |
| 7 | 3756 { |
| 3757 char_u *prev_ptr = ptr; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3758 |
| 7 | 3759 while (vcol < v && *ptr != NUL) |
| 3760 { | |
| 5995 | 3761 c = win_lbr_chartabsize(wp, line, ptr, (colnr_T)vcol, NULL); |
| 7 | 3762 vcol += c; |
| 3763 prev_ptr = ptr; | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
3764 MB_PTR_ADV(ptr); |
| 7 | 3765 } |
| 3766 | |
| 1984 | 3767 /* When: |
| 3768 * - 'cuc' is set, or | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
3769 * - 'colorcolumn' is set, or |
| 1984 | 3770 * - 'virtualedit' is set, or |
| 3771 * - the visual mode is active, | |
| 3772 * the end of the line may be before the start of the displayed part. | |
| 3773 */ | |
| 3774 if (vcol < v && ( | |
| 5735 | 3775 #ifdef FEAT_SYN_HL |
| 3776 wp->w_p_cuc || draw_color_col || | |
| 3777 #endif | |
| 3778 virtual_active() || | |
| 3779 (VIsual_active && wp->w_buffer == curwin->w_buffer))) | |
| 7 | 3780 vcol = v; |
| 3781 | |
| 3782 /* Handle a character that's not completely on the screen: Put ptr at | |
| 3783 * that character but skip the first few screen characters. */ | |
| 3784 if (vcol > v) | |
| 3785 { | |
| 3786 vcol -= c; | |
| 3787 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
|
3788 /* 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
|
3789 * Except for a TAB. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
3790 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
|
3791 n_skip = v - vcol; |
| 7 | 3792 } |
| 3793 | |
| 3794 /* | |
| 3795 * Adjust for when the inverted text is before the screen, | |
| 3796 * and when the start of the inverted text is before the screen. | |
| 3797 */ | |
| 3798 if (tocol <= vcol) | |
| 3799 fromcol = 0; | |
| 3800 else if (fromcol >= 0 && fromcol < vcol) | |
| 3801 fromcol = vcol; | |
| 3802 | |
| 3803 #ifdef FEAT_LINEBREAK | |
| 3804 /* When w_skipcol is non-zero, first line needs 'showbreak' */ | |
| 3805 if (wp->w_p_wrap) | |
| 3806 need_showbreak = TRUE; | |
| 3807 #endif | |
| 743 | 3808 #ifdef FEAT_SPELL |
| 499 | 3809 /* When spell checking a word we need to figure out the start of the |
| 3810 * word and if it's badly spelled or not. */ | |
| 3811 if (has_spell) | |
| 3812 { | |
| 3813 int len; | |
| 1536 | 3814 colnr_T linecol = (colnr_T)(ptr - line); |
| 534 | 3815 hlf_T spell_hlf = HLF_COUNT; |
| 499 | 3816 |
| 3817 pos = wp->w_cursor; | |
| 3818 wp->w_cursor.lnum = lnum; | |
| 1536 | 3819 wp->w_cursor.col = linecol; |
| 534 | 3820 len = spell_move_to(wp, FORWARD, TRUE, TRUE, &spell_hlf); |
| 1536 | 3821 |
| 3822 /* spell_move_to() may call ml_get() and make "line" invalid */ | |
| 3823 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3824 ptr = line + linecol; | |
| 3825 | |
| 530 | 3826 if (len == 0 || (int)wp->w_cursor.col > ptr - line) |
| 499 | 3827 { |
| 3828 /* no bad word found at line start, don't check until end of a | |
| 3829 * word */ | |
| 534 | 3830 spell_hlf = HLF_COUNT; |
| 3572 | 3831 word_end = (int)(spell_to_word_end(ptr, wp) - line + 1); |
| 499 | 3832 } |
| 3833 else | |
| 534 | 3834 { |
| 499 | 3835 /* bad word found, use attributes until end of word */ |
| 3836 word_end = wp->w_cursor.col + len + 1; | |
| 3837 | |
| 534 | 3838 /* Turn index into actual attributes. */ |
| 3839 if (spell_hlf != HLF_COUNT) | |
| 3840 spell_attr = highlight_attr[spell_hlf]; | |
| 3841 } | |
| 499 | 3842 wp->w_cursor = pos; |
| 501 | 3843 |
| 743 | 3844 # ifdef FEAT_SYN_HL |
| 501 | 3845 /* Need to restart syntax highlighting for this line. */ |
| 3846 if (has_syntax) | |
|
12510
7a887dccd13a
patch 8.0.1133: syntax timeout not used correctly
Christian Brabandt <cb@256bit.org>
parents:
12487
diff
changeset
|
3847 syntax_start(wp, lnum); |
| 743 | 3848 # endif |
| 499 | 3849 } |
| 3850 #endif | |
| 7 | 3851 } |
| 3852 | |
| 3853 /* | |
| 3854 * Correct highlighting for cursor that can't be disabled. | |
| 3855 * Avoids having to check this for each character. | |
| 3856 */ | |
| 3857 if (fromcol >= 0) | |
| 3858 { | |
| 3859 if (noinvcur) | |
| 3860 { | |
| 3861 if ((colnr_T)fromcol == wp->w_virtcol) | |
| 3862 { | |
| 3863 /* highlighting starts at cursor, let it start just after the | |
| 3864 * cursor */ | |
| 3865 fromcol_prev = fromcol; | |
| 3866 fromcol = -1; | |
| 3867 } | |
| 3868 else if ((colnr_T)fromcol < wp->w_virtcol) | |
| 3869 /* restart highlighting after the cursor */ | |
| 3870 fromcol_prev = wp->w_virtcol; | |
| 3871 } | |
| 3872 if (fromcol >= tocol) | |
| 3873 fromcol = -1; | |
| 3874 } | |
| 3875 | |
| 3876 #ifdef FEAT_SEARCH_EXTRA | |
| 3877 /* | |
| 1326 | 3878 * Handle highlighting the last used search pattern and matches. |
| 3879 * 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
|
3880 * Not in a popup window. |
| 7 | 3881 */ |
| 1326 | 3882 cur = wp->w_match_head; |
| 3883 shl_flag = FALSE; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3884 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
|
3885 && !(screen_line_flags & SLF_POPUP)) |
| 1326 | 3886 { |
| 3887 if (shl_flag == FALSE) | |
| 3888 { | |
| 3889 shl = &search_hl; | |
| 3890 shl_flag = TRUE; | |
| 3891 } | |
| 3892 else | |
| 3893 shl = &cur->hl; | |
| 36 | 3894 shl->startcol = MAXCOL; |
| 3895 shl->endcol = MAXCOL; | |
| 7 | 3896 shl->attr_cur = 0; |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
3897 shl->is_addpos = FALSE; |
| 5979 | 3898 v = (long)(ptr - line); |
| 3899 if (cur != NULL) | |
| 3900 cur->pos.cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
3901 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
|
3902 shl == &search_hl ? NULL : cur); |
| 5979 | 3903 |
| 3904 /* Need to get the line again, a multi-line regexp may have made it | |
| 3905 * invalid. */ | |
| 3906 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 3907 ptr = line + v; | |
| 3908 | |
| 3909 if (shl->lnum != 0 && shl->lnum <= lnum) | |
| 3910 { | |
| 3911 if (shl->lnum == lnum) | |
| 3912 shl->startcol = shl->rm.startpos[0].col; | |
| 3913 else | |
| 3914 shl->startcol = 0; | |
| 3915 if (lnum == shl->lnum + shl->rm.endpos[0].lnum | |
| 3916 - shl->rm.startpos[0].lnum) | |
| 3917 shl->endcol = shl->rm.endpos[0].col; | |
| 3918 else | |
| 3919 shl->endcol = MAXCOL; | |
| 3920 /* Highlight one character for an empty match. */ | |
| 3921 if (shl->startcol == shl->endcol) | |
| 3922 { | |
| 3923 if (has_mbyte && line[shl->endcol] != NUL) | |
| 3924 shl->endcol += (*mb_ptr2len)(line + shl->endcol); | |
| 7 | 3925 else |
| 5979 | 3926 ++shl->endcol; |
| 3927 } | |
| 3928 if ((long)shl->startcol < v) /* match at leftcol */ | |
| 3929 { | |
| 3930 shl->attr_cur = shl->attr; | |
| 3931 search_attr = shl->attr; | |
| 3932 } | |
| 3933 area_highlighting = TRUE; | |
| 7 | 3934 } |
| 1326 | 3935 if (shl != &search_hl && cur != NULL) |
| 3936 cur = cur->next; | |
| 7 | 3937 } |
| 3938 #endif | |
| 3939 | |
| 743 | 3940 #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
|
3941 // 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
|
3942 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
|
3943 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3944 // 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
|
3945 // 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
|
3946 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
|
3947 { |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3948 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
|
3949 area_highlighting = TRUE; |
|
f362d695bcf9
patch 8.1.1001: Visual area not correct when using 'cursorline'
Bram Moolenaar <Bram@vim.org>
parents:
15947
diff
changeset
|
3950 } |
|
15683
adc6442118b8
patch 8.1.0849: cursorline highlight is not always updated
Bram Moolenaar <Bram@vim.org>
parents:
15636
diff
changeset
|
3951 wp->w_last_cursorline = wp->w_cursor.lnum; |
| 743 | 3952 } |
| 3953 #endif | |
| 3954 | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3955 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3956 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3957 char_u *prop_start; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3958 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3959 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
|
3960 &prop_start, FALSE); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3961 if (text_prop_count > 0) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3962 { |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3963 // 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
|
3964 // 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
|
3965 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
|
3966 if (text_props != NULL) |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3967 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
|
3968 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
|
3969 |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3970 // 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
|
3971 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
|
3972 area_highlighting = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3973 extra_check = TRUE; |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3974 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3975 } |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3976 #endif |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
3977 |
| 504 | 3978 off = (unsigned)(current_ScreenLine - ScreenLines); |
| 7 | 3979 col = 0; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3980 |
| 7 | 3981 #ifdef FEAT_RIGHTLEFT |
| 3982 if (wp->w_p_rl) | |
| 3983 { | |
| 3984 /* Rightleft window: process the text in the normal direction, but put | |
| 3985 * it in current_ScreenLine[] from right to left. Start at the | |
| 3986 * 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
|
3987 col = wp->w_width - 1; |
| 7 | 3988 off += col; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
3989 screen_line_flags |= SLF_RIGHTLEFT; |
| 7 | 3990 } |
| 3991 #endif | |
| 3992 | |
| 3993 /* | |
| 3994 * Repeat for the whole displayed line. | |
| 3995 */ | |
| 3996 for (;;) | |
| 3997 { | |
| 6947 | 3998 #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
|
3999 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
|
4000 int did_decrement_ptr = FALSE; |
| 6947 | 4001 #endif |
| 7 | 4002 /* Skip this quickly when working on the text. */ |
| 4003 if (draw_state != WL_LINE) | |
| 4004 { | |
| 4005 #ifdef FEAT_CMDWIN | |
| 4006 if (draw_state == WL_CMDLINE - 1 && n_extra == 0) | |
| 4007 { | |
| 4008 draw_state = WL_CMDLINE; | |
| 4009 if (cmdwin_type != 0 && wp == curwin) | |
| 4010 { | |
| 4011 /* Draw the cmdline character. */ | |
| 4012 n_extra = 1; | |
| 1340 | 4013 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
|
4014 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
|
4015 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_AT)); |
| 7 | 4016 } |
| 4017 } | |
| 4018 #endif | |
| 4019 | |
| 4020 #ifdef FEAT_FOLDING | |
| 4021 if (draw_state == WL_FOLD - 1 && n_extra == 0) | |
| 4022 { | |
| 6553 | 4023 int fdc = compute_foldcolumn(wp, 0); |
| 4024 | |
| 7 | 4025 draw_state = WL_FOLD; |
| 6553 | 4026 if (fdc > 0) |
| 7 | 4027 { |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4028 /* 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
|
4029 * already be in use. */ |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
4030 vim_free(p_extra_free); |
|
10466
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4031 p_extra_free = alloc(12 + 1); |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4032 |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4033 if (p_extra_free != NULL) |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4034 { |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4035 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
|
4036 n_extra = fdc; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4037 p_extra_free[n_extra] = NUL; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4038 p_extra = p_extra_free; |
|
34b50194f82d
commit https://github.com/vim/vim/commit/6270660611a151c5d0f614a5f0248ccdc80ed971
Christian Brabandt <cb@256bit.org>
parents:
10392
diff
changeset
|
4039 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
|
4040 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
|
4041 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
|
4042 } |
| 7 | 4043 } |
| 4044 } | |
| 4045 #endif | |
| 4046 | |
| 4047 #ifdef FEAT_SIGNS | |
| 4048 if (draw_state == WL_SIGN - 1 && n_extra == 0) | |
| 4049 { | |
| 4050 draw_state = WL_SIGN; | |
| 4051 /* Show the sign column when there are any signs in this | |
| 4052 * buffer or when using Netbeans. */ | |
|
9852
4eea48b76d03
commit https://github.com/vim/vim/commit/95ec9d6a6ab3117d60ff638670a803d43974ba51
Christian Brabandt <cb@256bit.org>
parents:
9848
diff
changeset
|
4053 if (signcolumn_on(wp)) |
| 7 | 4054 { |
| 2661 | 4055 int text_sign; |
| 7 | 4056 # ifdef FEAT_SIGN_ICONS |
| 2661 | 4057 int icon_sign; |
| 7 | 4058 # endif |
| 4059 | |
| 4060 /* Draw two cells with the sign value or blank. */ | |
| 4061 c_extra = ' '; | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4062 c_final = NUL; |
|
16788
f7268ec2c889
patch 8.1.1396: 'wincolor' does not apply to lines below the buffer
Bram Moolenaar <Bram@vim.org>
parents:
16782
diff
changeset
|
4063 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_SC)); |
| 7 | 4064 n_extra = 2; |
| 4065 | |
| 5921 | 4066 if (row == startrow |
| 4067 #ifdef FEAT_DIFF | |
| 4068 + filler_lines && filler_todo <= 0 | |
| 4069 #endif | |
| 4070 ) | |
| 7 | 4071 { |
| 4072 text_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4073 SIGN_TEXT); | |
| 4074 # ifdef FEAT_SIGN_ICONS | |
| 4075 icon_sign = buf_getsigntype(wp->w_buffer, lnum, | |
| 4076 SIGN_ICON); | |
| 4077 if (gui.in_use && icon_sign != 0) | |
| 4078 { | |
| 4079 /* Use the image in this position. */ | |
| 4080 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
|
4081 c_final = NUL; |
| 7 | 4082 # ifdef FEAT_NETBEANS_INTG |
| 4083 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
|
4084 { |
| 7 | 4085 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
|
4086 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4087 } |
| 7 | 4088 # endif |
| 4089 char_attr = icon_sign; | |
| 4090 } | |
| 4091 else | |
| 4092 # endif | |
| 4093 if (text_sign != 0) | |
| 4094 { | |
| 4095 p_extra = sign_get_text(text_sign); | |
| 4096 if (p_extra != NULL) | |
| 4097 { | |
| 4098 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
|
4099 c_final = NUL; |
| 835 | 4100 n_extra = (int)STRLEN(p_extra); |
| 7 | 4101 } |
| 4102 char_attr = sign_get_attr(text_sign, FALSE); | |
| 4103 } | |
| 4104 } | |
| 4105 } | |
| 4106 } | |
| 4107 #endif | |
| 4108 | |
| 4109 if (draw_state == WL_NR - 1 && n_extra == 0) | |
| 4110 { | |
| 4111 draw_state = WL_NR; | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4112 /* 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
|
4113 * 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
|
4114 if ((wp->w_p_nu || wp->w_p_rnu) |
| 7 | 4115 && (row == startrow |
| 4116 #ifdef FEAT_DIFF | |
| 4117 + filler_lines | |
| 4118 #endif | |
| 4119 || vim_strchr(p_cpo, CPO_NUMCOL) == NULL)) | |
| 4120 { | |
| 4121 /* Draw the line number (empty space after wrapping). */ | |
| 4122 if (row == startrow | |
| 4123 #ifdef FEAT_DIFF | |
| 4124 + filler_lines | |
| 4125 #endif | |
| 4126 ) | |
| 4127 { | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4128 long num; |
| 4065 | 4129 char *fmt = "%*ld "; |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4130 |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4131 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
|
4132 /* 'number' + 'norelativenumber' */ |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4133 num = (long)lnum; |
|
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4134 else |
| 4065 | 4135 { |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4136 /* 'relativenumber', don't use negative numbers */ |
| 2675 | 4137 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
|
4138 if (num == 0 && wp->w_p_nu && wp->w_p_rnu) |
| 4065 | 4139 { |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
4140 /* 'number' + 'relativenumber' */ |
| 4065 | 4141 num = lnum; |
| 4142 fmt = "%-*ld "; | |
| 4143 } | |
| 4144 } | |
| 4145 | |
| 4146 sprintf((char *)extra, fmt, | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
4147 number_width(wp), num); |
| 7 | 4148 if (wp->w_skipcol > 0) |
| 4149 for (p_extra = extra; *p_extra == ' '; ++p_extra) | |
| 4150 *p_extra = '-'; | |
| 4151 #ifdef FEAT_RIGHTLEFT | |
| 4152 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
|
4153 { |
|
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
|
4154 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
|
4155 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
|
4156 |
|
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
|
4157 // 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
|
4158 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
|
4159 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
|
4160 { |
|
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
|
4161 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
|
4162 *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
|
4163 *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
|
4164 } |
|
5a2033905f19
patch 8.1.1073: space in number column is on wrong side with 'rightleft' set
Bram Moolenaar <Bram@vim.org>
parents:
16135
diff
changeset
|
4165 } |
| 7 | 4166 #endif |
| 4167 p_extra = extra; | |
| 4168 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
|
4169 c_final = NUL; |
| 7 | 4170 } |
| 4171 else | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4172 { |
| 7 | 4173 c_extra = ' '; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4174 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4175 } |
| 13 | 4176 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
|
4177 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_N)); |
| 743 | 4178 #ifdef FEAT_SYN_HL |
| 4179 /* When 'cursorline' is set highlight the line number of | |
| 3427 | 4180 * the current line differently. |
| 4181 * TODO: Can we use CursorLine instead of CursorLineNr | |
| 4182 * when CursorLineNr isn't set? */ | |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4183 if ((wp->w_p_cul || wp->w_p_rnu) |
| 4065 | 4184 && 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
|
4185 char_attr = hl_combine_attr(wcr_attr, HL_ATTR(HLF_CLN)); |
| 743 | 4186 #endif |
| 7 | 4187 } |
| 4188 } | |
| 4189 | |
| 5995 | 4190 #ifdef FEAT_LINEBREAK |
| 4191 if (wp->w_p_brisbr && draw_state == WL_BRI - 1 | |
| 4192 && n_extra == 0 && *p_sbr != NUL) | |
| 4193 /* draw indent after showbreak value */ | |
| 4194 draw_state = WL_BRI; | |
| 4195 else if (wp->w_p_brisbr && draw_state == WL_SBR && n_extra == 0) | |
| 4196 /* After the showbreak, draw the breakindent */ | |
| 4197 draw_state = WL_BRI - 1; | |
| 4198 | |
| 4199 /* draw 'breakindent': indent wrapped text accordingly */ | |
| 4200 if (draw_state == WL_BRI - 1 && n_extra == 0) | |
| 4201 { | |
| 4202 draw_state = WL_BRI; | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4203 /* 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
|
4204 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
|
4205 && (row != startrow || need_showbreak) |
| 5995 | 4206 # ifdef FEAT_DIFF |
| 4207 && filler_lines == 0 | |
| 6834 | 4208 # endif |
| 5995 | 4209 ) |
| 4210 { | |
|
10392
957a1d560bda
commit https://github.com/vim/vim/commit/6c896867c4f5d759616028ef7cbfce2a9ed32600
Christian Brabandt <cb@256bit.org>
parents:
10349
diff
changeset
|
4211 char_attr = 0; |
| 6834 | 4212 # ifdef FEAT_DIFF |
| 5995 | 4213 if (diff_hlf != (hlf_T)0) |
| 6106 | 4214 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
4215 char_attr = HL_ATTR(diff_hlf); |
| 6834 | 4216 # ifdef FEAT_SYN_HL |
| 6106 | 4217 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 4218 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
|
4219 HL_ATTR(HLF_CUL)); |
| 6834 | 4220 # endif |
| 6106 | 4221 } |
| 6834 | 4222 # endif |
| 6028 | 4223 p_extra = NULL; |
| 5995 | 4224 c_extra = ' '; |
| 4225 n_extra = get_breakindent_win(wp, | |
| 4226 ml_get_buf(wp->w_buffer, lnum, FALSE)); | |
| 4227 /* Correct end of highlighted area for 'breakindent', | |
| 4228 * required when 'linebreak' is also set. */ | |
| 4229 if (tocol == vcol) | |
| 4230 tocol += n_extra; | |
| 4231 } | |
| 4232 } | |
| 4233 #endif | |
| 4234 | |
| 7 | 4235 #if defined(FEAT_LINEBREAK) || defined(FEAT_DIFF) |
| 4236 if (draw_state == WL_SBR - 1 && n_extra == 0) | |
| 4237 { | |
| 4238 draw_state = WL_SBR; | |
| 4239 # ifdef FEAT_DIFF | |
| 4240 if (filler_todo > 0) | |
| 4241 { | |
| 4242 /* Draw "deleted" diff line(s). */ | |
| 4243 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
|
4244 { |
| 7 | 4245 c_extra = '-'; |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4246 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4247 } |
| 7 | 4248 else |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4249 { |
| 7 | 4250 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
|
4251 c_final = NUL; |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4252 } |
| 7 | 4253 # ifdef FEAT_RIGHTLEFT |
| 4254 if (wp->w_p_rl) | |
| 4255 n_extra = col + 1; | |
| 4256 else | |
| 4257 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4258 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
|
4259 char_attr = HL_ATTR(HLF_DED); |
| 7 | 4260 } |
| 4261 # endif | |
| 4262 # ifdef FEAT_LINEBREAK | |
| 4263 if (*p_sbr != NUL && need_showbreak) | |
| 4264 { | |
| 4265 /* Draw 'showbreak' at the start of each broken line. */ | |
| 4266 p_extra = p_sbr; | |
| 4267 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
|
4268 c_final = NUL; |
| 7 | 4269 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
|
4270 char_attr = HL_ATTR(HLF_AT); |
| 7 | 4271 need_showbreak = FALSE; |
| 6503 | 4272 vcol_sbr = vcol + MB_CHARLEN(p_sbr); |
| 7 | 4273 /* Correct end of highlighted area for 'showbreak', |
| 4274 * required when 'linebreak' is also set. */ | |
| 4275 if (tocol == vcol) | |
| 4276 tocol += n_extra; | |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4277 #ifdef FEAT_SYN_HL |
|
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4278 /* combine 'showbreak' with 'cursorline' */ |
|
5078
22ac43fb6d30
updated for version 7.3.1282
Bram Moolenaar <bram@vim.org>
parents:
5068
diff
changeset
|
4279 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 6106 | 4280 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
|
4281 HL_ATTR(HLF_CUL)); |
|
5068
6a7ae677d6a1
updated for version 7.3.1277
Bram Moolenaar <bram@vim.org>
parents:
4916
diff
changeset
|
4282 #endif |
| 7 | 4283 } |
| 4284 # endif | |
| 4285 } | |
| 4286 #endif | |
| 4287 | |
| 4288 if (draw_state == WL_LINE - 1 && n_extra == 0) | |
| 4289 { | |
| 4290 draw_state = WL_LINE; | |
| 4291 if (saved_n_extra) | |
| 4292 { | |
| 4293 /* Continue item from end of wrapped line. */ | |
| 4294 n_extra = saved_n_extra; | |
| 4295 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
|
4296 c_final = saved_c_final; |
| 7 | 4297 p_extra = saved_p_extra; |
| 4298 char_attr = saved_char_attr; | |
| 4299 } | |
| 4300 else | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4301 char_attr = win_attr; |
| 7 | 4302 } |
| 4303 } | |
| 4304 | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4305 // 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
|
4306 // 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
|
4307 // 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
|
4308 if ((dollar_vcol >= 0 && wp == curwin |
| 819 | 4309 && lnum == wp->w_cursor.lnum && vcol >= (long)wp->w_virtcol |
| 7 | 4310 #ifdef FEAT_DIFF |
| 4311 && filler_todo <= 0 | |
| 4312 #endif | |
| 4313 ) | |
|
14724
90de24a1e9b7
patch 8.1.0374: moving the cursor is slow when 'relativenumber' is set
Christian Brabandt <cb@256bit.org>
parents:
14720
diff
changeset
|
4314 || (number_only && draw_state > WL_NR)) |
| 7 | 4315 { |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4316 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
|
4317 screen_line_flags); |
| 819 | 4318 /* Pretend we have finished updating the window. Except when |
| 4319 * 'cursorcolumn' is set. */ | |
| 4320 #ifdef FEAT_SYN_HL | |
| 4321 if (wp->w_p_cuc) | |
| 4322 row = wp->w_cline_row + wp->w_cline_height; | |
| 4323 else | |
| 4324 #endif | |
| 4325 row = wp->w_height; | |
| 7 | 4326 break; |
| 4327 } | |
| 4328 | |
|
15351
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4329 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
|
4330 #ifdef FEAT_SPELL |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4331 || has_spell |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4332 #endif |
|
be92862a0cb4
patch 8.1.0683: spell highlighting does not always end
Bram Moolenaar <Bram@vim.org>
parents:
15337
diff
changeset
|
4333 )) |
| 7 | 4334 { |
| 4335 /* handle Visual or match highlighting in this line */ | |
| 4336 if (vcol == fromcol | |
| 4337 || (has_mbyte && vcol + 1 == fromcol && n_extra == 0 | |
| 4338 && (*mb_ptr2cells)(ptr) > 1) | |
| 4339 || ((int)vcol_prev == fromcol_prev | |
| 1814 | 4340 && vcol_prev < vcol /* not at margin */ |
| 7 | 4341 && vcol < tocol)) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4342 area_attr = vi_attr; /* start highlighting */ |
| 7 | 4343 else if (area_attr != 0 |
| 4344 && (vcol == tocol | |
| 4345 || (noinvcur && (colnr_T)vcol == wp->w_virtcol))) | |
| 4346 area_attr = 0; /* stop highlighting */ | |
| 4347 | |
| 4348 #ifdef FEAT_SEARCH_EXTRA | |
| 4349 if (!n_extra) | |
| 4350 { | |
| 4351 /* | |
| 4352 * Check for start/end of search pattern match. | |
| 4353 * After end, check for start/end of next match. | |
| 4354 * When another match, have to check for start again. | |
| 4355 * Watch out for matching an empty string! | |
| 1326 | 4356 * Do this for 'search_hl' and the match list (ordered by |
| 4357 * priority). | |
| 7 | 4358 */ |
| 36 | 4359 v = (long)(ptr - line); |
| 1326 | 4360 cur = wp->w_match_head; |
| 4361 shl_flag = FALSE; | |
| 4362 while (cur != NULL || shl_flag == FALSE) | |
| 4363 { | |
| 4364 if (shl_flag == FALSE | |
| 4365 && ((cur != NULL | |
| 4366 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4367 || cur == NULL)) | |
| 4368 { | |
| 4369 shl = &search_hl; | |
| 4370 shl_flag = TRUE; | |
| 4371 } | |
| 4372 else | |
| 4373 shl = &cur->hl; | |
| 5979 | 4374 if (cur != NULL) |
| 4375 cur->pos.cur = 0; | |
| 4376 pos_inprogress = TRUE; | |
| 4377 while (shl->rm.regprog != NULL | |
| 4378 || (cur != NULL && pos_inprogress)) | |
| 7 | 4379 { |
| 36 | 4380 if (shl->startcol != MAXCOL |
| 4381 && v >= (long)shl->startcol | |
| 4382 && v < (long)shl->endcol) | |
| 7 | 4383 { |
| 6430 | 4384 int tmp_col = v + MB_PTR2LEN(ptr); |
| 4385 | |
| 4386 if (shl->endcol < tmp_col) | |
| 4387 shl->endcol = tmp_col; | |
| 7 | 4388 shl->attr_cur = shl->attr; |
| 6947 | 4389 #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
|
4390 // 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
|
4391 // the match. |
|
f344647acbbc
patch 8.1.1082: "Conceal" match is mixed up with 'hlsearch' match.
Bram Moolenaar <Bram@vim.org>
parents:
16146
diff
changeset
|
4392 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
|
4393 && 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
|
4394 && 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
|
4395 == cur->hlg_id) |
| 6947 | 4396 { |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4397 has_match_conc = |
|
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4398 v == (long)shl->startcol ? 2 : 1; |
| 6947 | 4399 match_conc = cur->conceal_char; |
| 4400 } | |
| 4401 else | |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
4402 has_match_conc = match_conc = 0; |
| 6947 | 4403 #endif |
| 7 | 4404 } |
| 6430 | 4405 else if (v == (long)shl->endcol) |
| 7 | 4406 { |
| 4407 shl->attr_cur = 0; | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
4408 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
|
4409 shl == &search_hl ? NULL : cur); |
| 5979 | 4410 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 6947 | 4411 ? FALSE : TRUE; |
| 7 | 4412 |
| 4413 /* Need to get the line again, a multi-line regexp | |
| 4414 * may have made it invalid. */ | |
| 4415 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4416 ptr = line + v; | |
| 4417 | |
| 4418 if (shl->lnum == lnum) | |
| 4419 { | |
| 36 | 4420 shl->startcol = shl->rm.startpos[0].col; |
| 7 | 4421 if (shl->rm.endpos[0].lnum == 0) |
| 36 | 4422 shl->endcol = shl->rm.endpos[0].col; |
| 7 | 4423 else |
| 36 | 4424 shl->endcol = MAXCOL; |
| 4425 | |
| 4426 if (shl->startcol == shl->endcol) | |
| 7 | 4427 { |
| 4428 /* highlight empty match, try again after | |
| 4429 * it */ | |
| 4430 if (has_mbyte) | |
| 474 | 4431 shl->endcol += (*mb_ptr2len)(line |
| 36 | 4432 + shl->endcol); |
| 7 | 4433 else |
| 36 | 4434 ++shl->endcol; |
| 7 | 4435 } |
| 4436 | |
| 4437 /* Loop to check if the match starts at the | |
| 4438 * current position */ | |
| 4439 continue; | |
| 4440 } | |
| 4441 } | |
| 4442 break; | |
| 4443 } | |
| 1326 | 4444 if (shl != &search_hl && cur != NULL) |
| 4445 cur = cur->next; | |
| 4446 } | |
| 4447 | |
| 4448 /* Use attributes from match with highest priority among | |
| 4449 * 'search_hl' and the match list. */ | |
| 4450 search_attr = search_hl.attr_cur; | |
| 4451 cur = wp->w_match_head; | |
| 4452 shl_flag = FALSE; | |
| 4453 while (cur != NULL || shl_flag == FALSE) | |
| 4454 { | |
| 4455 if (shl_flag == FALSE | |
| 4456 && ((cur != NULL | |
| 4457 && cur->priority > SEARCH_HL_PRIORITY) | |
| 4458 || cur == NULL)) | |
| 699 | 4459 { |
| 1326 | 4460 shl = &search_hl; |
| 4461 shl_flag = TRUE; | |
| 699 | 4462 } |
| 1326 | 4463 else |
| 4464 shl = &cur->hl; | |
| 4465 if (shl->attr_cur != 0) | |
| 4466 search_attr = shl->attr_cur; | |
| 4467 if (shl != &search_hl && cur != NULL) | |
| 4468 cur = cur->next; | |
| 4469 } | |
|
12580
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
4470 /* 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
|
4471 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
|
4472 || (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
|
4473 search_attr = 0; |
| 7 | 4474 } |
| 4475 #endif | |
| 4476 | |
| 4477 #ifdef FEAT_DIFF | |
| 674 | 4478 if (diff_hlf != (hlf_T)0) |
| 7 | 4479 { |
| 1295 | 4480 if (diff_hlf == HLF_CHD && ptr - line >= change_start |
| 4481 && n_extra == 0) | |
| 7 | 4482 diff_hlf = HLF_TXD; /* changed text */ |
| 1295 | 4483 if (diff_hlf == HLF_TXD && ptr - line > change_end |
| 4484 && n_extra == 0) | |
| 7 | 4485 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
|
4486 line_attr = HL_ATTR(diff_hlf); |
| 6106 | 4487 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
|
4488 line_attr = hl_combine_attr(line_attr, HL_ATTR(HLF_CUL)); |
| 674 | 4489 } |
| 4490 #endif | |
| 4491 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4492 #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
|
4493 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
|
4494 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4495 int pi; |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4496 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
|
4497 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4498 // 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
|
4499 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
|
4500 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4501 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
|
4502 |
|
15337
5fa7af143f7f
patch 8.1.0676: textprop screendump test fails
Bram Moolenaar <Bram@vim.org>
parents:
15332
diff
changeset
|
4503 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
|
4504 + 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
|
4505 { |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4506 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
|
4507 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
|
4508 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
|
4509 sizeof(int) |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4510 * (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
|
4511 --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
|
4512 --pi; |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4513 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4514 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4515 |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4516 // 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
|
4517 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
|
4518 && 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
|
4519 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
|
4520 |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4521 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
|
4522 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
|
4523 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
|
4524 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4525 // 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
|
4526 // 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
|
4527 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
|
4528 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
|
4529 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
|
4530 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
|
4531 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4532 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
|
4533 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4534 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
|
4535 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
|
4536 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
|
4537 |
|
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4538 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
|
4539 { |
|
15314
c4d62945d96f
patch 8.1.0665: text property display wrong when 'spell' is set
Bram Moolenaar <Bram@vim.org>
parents:
15310
diff
changeset
|
4540 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
|
4541 |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4542 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
|
4543 text_prop_attr = |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4544 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
|
4545 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
|
4546 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4547 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4548 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4549 } |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4550 #endif |
|
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4551 |
| 674 | 4552 /* Decide which of the highlight attributes to use. */ |
| 4553 attr_pri = TRUE; | |
| 6717 | 4554 #ifdef LINE_ATTR |
| 674 | 4555 if (area_attr != 0) |
| 6717 | 4556 char_attr = hl_combine_attr(line_attr, area_attr); |
| 674 | 4557 else if (search_attr != 0) |
| 6717 | 4558 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
|
4559 # ifdef FEAT_TEXT_PROP |
|
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4560 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
|
4561 { |
|
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4562 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
|
4563 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
|
4564 } |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4565 # endif |
| 674 | 4566 else if (line_attr != 0 && ((fromcol == -10 && tocol == MAXCOL) |
| 1842 | 4567 || vcol < fromcol || vcol_prev < fromcol_prev |
| 4568 || vcol >= tocol)) | |
|
16676
79c5f723bb5d
patch 8.1.1340: attributes from 'cursorline' overwrite textprop
Bram Moolenaar <Bram@vim.org>
parents:
16672
diff
changeset
|
4569 // 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
|
4570 // (area_attr may be 0 when "noinvcur" is set). |
| 674 | 4571 char_attr = line_attr; |
| 6717 | 4572 #else |
| 4573 if (area_attr != 0) | |
| 4574 char_attr = area_attr; | |
| 4575 else if (search_attr != 0) | |
| 4576 char_attr = search_attr; | |
| 674 | 4577 #endif |
| 4578 else | |
| 4579 { | |
| 4580 attr_pri = FALSE; | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4581 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4582 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
|
4583 { |
|
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4584 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
|
4585 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
|
4586 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
|
4587 else |
|
16811
0457d49eb2d9
patch 8.1.1407: popup_create() does not support text properties
Bram Moolenaar <Bram@vim.org>
parents:
16809
diff
changeset
|
4588 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
|
4589 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
|
4590 } |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4591 else |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
4592 #endif |
| 674 | 4593 #ifdef FEAT_SYN_HL |
| 4594 if (has_syntax) | |
| 4595 char_attr = syntax_attr; | |
| 4596 else | |
| 4597 #endif | |
| 4598 char_attr = 0; | |
| 4599 } | |
| 7 | 4600 } |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4601 if (char_attr == 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4602 char_attr = win_attr; |
| 7 | 4603 |
| 4604 /* | |
| 4605 * Get the next character to put on the screen. | |
| 4606 */ | |
| 4607 /* | |
| 1340 | 4608 * The "p_extra" points to the extra stuff that is inserted to |
| 4609 * represent special characters (non-printable stuff) and other | |
| 4610 * 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
|
4611 * If c_final is set, it will compulsorily be used at the end. |
| 1340 | 4612 * "p_extra" must end in a NUL to avoid mb_ptr2len() reads past |
| 4613 * "p_extra[n_extra]". | |
| 7 | 4614 * For the '$' of the 'list' option, n_extra == 1, p_extra == "". |
| 4615 */ | |
| 4616 if (n_extra > 0) | |
| 4617 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4618 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
|
4619 { |
|
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
4620 c = (n_extra == 1 && c_final != NUL) ? c_final : c_extra; |
| 7 | 4621 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
|
4622 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 4623 { |
| 4624 mb_utf8 = TRUE; | |
| 714 | 4625 u8cc[0] = 0; |
| 819 | 4626 c = 0xc0; |
| 7 | 4627 } |
| 4628 else | |
| 4629 mb_utf8 = FALSE; | |
| 4630 } | |
| 4631 else | |
| 4632 { | |
| 4633 c = *p_extra; | |
| 4634 if (has_mbyte) | |
| 4635 { | |
| 4636 mb_c = c; | |
| 4637 if (enc_utf8) | |
| 4638 { | |
| 4639 /* If the UTF-8 character is more than one byte: | |
| 4640 * 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
|
4641 mb_l = utfc_ptr2len(p_extra); |
| 7 | 4642 mb_utf8 = FALSE; |
| 4643 if (mb_l > n_extra) | |
| 4644 mb_l = 1; | |
| 4645 else if (mb_l > 1) | |
| 4646 { | |
| 714 | 4647 mb_c = utfc_ptr2char(p_extra, u8cc); |
| 7 | 4648 mb_utf8 = TRUE; |
| 819 | 4649 c = 0xc0; |
| 7 | 4650 } |
| 4651 } | |
| 4652 else | |
| 4653 { | |
| 4654 /* if this is a DBCS character, put it in "mb_c" */ | |
| 4655 mb_l = MB_BYTE2LEN(c); | |
| 4656 if (mb_l >= n_extra) | |
| 4657 mb_l = 1; | |
| 4658 else if (mb_l > 1) | |
| 4659 mb_c = (c << 8) + p_extra[1]; | |
| 4660 } | |
| 504 | 4661 if (mb_l == 0) /* at the NUL at end-of-line */ |
| 4662 mb_l = 1; | |
| 4663 | |
| 7 | 4664 /* If a double-width char doesn't fit display a '>' in the |
| 4665 * last column. */ | |
| 504 | 4666 if (( |
| 7 | 4667 # ifdef FEAT_RIGHTLEFT |
| 4668 wp->w_p_rl ? (col <= 0) : | |
| 4669 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4670 (col >= wp->w_width - 1)) |
| 7 | 4671 && (*mb_char2cells)(mb_c) == 2) |
| 4672 { | |
| 4673 c = '>'; | |
| 4674 mb_c = c; | |
| 4675 mb_l = 1; | |
| 4676 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
|
4677 multi_attr = HL_ATTR(HLF_AT); |
| 7 | 4678 /* put the pointer back to output the double-width |
| 4679 * character at the start of the next line. */ | |
| 4680 ++n_extra; | |
| 4681 --p_extra; | |
| 4682 } | |
| 4683 else | |
| 4684 { | |
| 4685 n_extra -= mb_l - 1; | |
| 4686 p_extra += mb_l - 1; | |
| 4687 } | |
| 4688 } | |
| 4689 ++p_extra; | |
| 4690 } | |
| 4691 --n_extra; | |
| 4692 } | |
| 4693 else | |
| 4694 { | |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4695 #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
|
4696 int c0; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4697 #endif |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
4698 |
| 6026 | 4699 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
|
4700 VIM_CLEAR(p_extra_free); |
| 7 | 4701 /* |
| 4702 * Get a character from the line itself. | |
| 4703 */ | |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4704 c = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4705 #ifdef FEAT_LINEBREAK |
|
10988
b5de553d6062
patch 8.0.0383: misplaced #ifdef
Christian Brabandt <cb@256bit.org>
parents:
10986
diff
changeset
|
4706 c0 = *ptr; |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4707 #endif |
| 7 | 4708 if (has_mbyte) |
| 4709 { | |
| 4710 mb_c = c; | |
| 4711 if (enc_utf8) | |
| 4712 { | |
| 4713 /* If the UTF-8 character is more than one byte: Decode it | |
| 4714 * 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
|
4715 mb_l = utfc_ptr2len(ptr); |
| 7 | 4716 mb_utf8 = FALSE; |
| 4717 if (mb_l > 1) | |
| 4718 { | |
| 714 | 4719 mb_c = utfc_ptr2char(ptr, u8cc); |
| 7 | 4720 /* Overlong encoded ASCII or ASCII with composing char |
| 4721 * is displayed normally, except a NUL. */ | |
| 4722 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
|
4723 { |
|
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4724 c = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4725 #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
|
4726 c0 = mb_c; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
4727 #endif |
|
10986
62bcadce6c82
patch 8.0.0382: warning in tiny build for unused variable
Christian Brabandt <cb@256bit.org>
parents:
10982
diff
changeset
|
4728 } |
| 7 | 4729 mb_utf8 = TRUE; |
| 507 | 4730 |
| 4731 /* At start of the line we can have a composing char. | |
| 4732 * Draw it as a space with a composing char. */ | |
| 4733 if (utf_iscomposing(mb_c)) | |
| 4734 { | |
| 1326 | 4735 int i; |
| 4736 | |
| 714 | 4737 for (i = Screen_mco - 1; i > 0; --i) |
| 4738 u8cc[i] = u8cc[i - 1]; | |
| 4739 u8cc[0] = mb_c; | |
| 507 | 4740 mb_c = ' '; |
| 4741 } | |
| 7 | 4742 } |
| 4743 | |
| 4744 if ((mb_l == 1 && c >= 0x80) | |
| 4745 || (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
|
4746 || (mb_l > 1 && (!vim_isprintc(mb_c)))) |
| 7 | 4747 { |
| 4748 /* | |
| 4749 * Illegal UTF-8 byte: display as <xx>. | |
| 4750 * Non-BMP character : display as ? or fullwidth ?. | |
| 4751 */ | |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4752 transchar_hex(extra, mb_c); |
| 714 | 4753 # ifdef FEAT_RIGHTLEFT |
|
15609
b440c7becbca
patch 8.1.0812: Unicode 16 feature is not useful
Bram Moolenaar <Bram@vim.org>
parents:
15603
diff
changeset
|
4754 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
|
4755 rl_mirror(extra); |
| 714 | 4756 # endif |
| 7 | 4757 p_extra = extra; |
| 4758 c = *p_extra; | |
| 4759 mb_c = mb_ptr2char_adv(&p_extra); | |
| 4760 mb_utf8 = (c >= 0x80); | |
| 4761 n_extra = (int)STRLEN(p_extra); | |
| 4762 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
|
4763 c_final = NUL; |
| 7 | 4764 if (area_attr == 0 && search_attr == 0) |
| 4765 { | |
| 4766 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
|
4767 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4768 saved_attr2 = char_attr; /* save current attr */ |
| 4769 } | |
| 4770 } | |
| 4771 else if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4772 mb_l = 1; | |
| 4773 #ifdef FEAT_ARABIC | |
| 4774 else if (p_arshape && !p_tbidi && ARABIC_CHAR(mb_c)) | |
| 4775 { | |
| 4776 /* Do Arabic shaping. */ | |
| 714 | 4777 int pc, pc1, nc; |
| 4778 int pcc[MAX_MCO]; | |
| 7 | 4779 |
| 4780 /* The idea of what is the previous and next | |
| 4781 * character depends on 'rightleft'. */ | |
| 4782 if (wp->w_p_rl) | |
| 4783 { | |
| 4784 pc = prev_c; | |
| 4785 pc1 = prev_c1; | |
| 4786 nc = utf_ptr2char(ptr + mb_l); | |
| 714 | 4787 prev_c1 = u8cc[0]; |
| 7 | 4788 } |
| 4789 else | |
| 4790 { | |
| 714 | 4791 pc = utfc_ptr2char(ptr + mb_l, pcc); |
| 7 | 4792 nc = prev_c; |
| 714 | 4793 pc1 = pcc[0]; |
| 7 | 4794 } |
| 4795 prev_c = mb_c; | |
| 4796 | |
| 714 | 4797 mb_c = arabic_shape(mb_c, &c, &u8cc[0], pc, pc1, nc); |
| 7 | 4798 } |
| 4799 else | |
| 4800 prev_c = mb_c; | |
| 4801 #endif | |
| 4802 } | |
| 4803 else /* enc_dbcs */ | |
| 4804 { | |
| 4805 mb_l = MB_BYTE2LEN(c); | |
| 4806 if (mb_l == 0) /* at the NUL at end-of-line */ | |
| 4807 mb_l = 1; | |
| 4808 else if (mb_l > 1) | |
| 4809 { | |
| 4810 /* We assume a second byte below 32 is illegal. | |
| 4811 * Hopefully this is OK for all double-byte encodings! | |
| 4812 */ | |
| 4813 if (ptr[1] >= 32) | |
| 4814 mb_c = (c << 8) + ptr[1]; | |
| 4815 else | |
| 4816 { | |
| 4817 if (ptr[1] == NUL) | |
| 4818 { | |
| 4819 /* head byte at end of line */ | |
| 4820 mb_l = 1; | |
| 4821 transchar_nonprint(extra, c); | |
| 4822 } | |
| 4823 else | |
| 4824 { | |
| 4825 /* illegal tail byte */ | |
| 4826 mb_l = 2; | |
| 4827 STRCPY(extra, "XX"); | |
| 4828 } | |
| 4829 p_extra = extra; | |
| 4830 n_extra = (int)STRLEN(extra) - 1; | |
| 4831 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
|
4832 c_final = NUL; |
| 7 | 4833 c = *p_extra++; |
| 4834 if (area_attr == 0 && search_attr == 0) | |
| 4835 { | |
| 4836 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
|
4837 extra_attr = HL_ATTR(HLF_8); |
| 7 | 4838 saved_attr2 = char_attr; /* save current attr */ |
| 4839 } | |
| 4840 mb_c = c; | |
| 4841 } | |
| 4842 } | |
| 4843 } | |
| 4844 /* If a double-width char doesn't fit display a '>' in the | |
| 4845 * last column; the character is displayed at the start of the | |
| 4846 * next line. */ | |
| 4847 if (( | |
| 4848 # ifdef FEAT_RIGHTLEFT | |
| 4849 wp->w_p_rl ? (col <= 0) : | |
| 4850 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
4851 (col >= wp->w_width - 1)) |
| 7 | 4852 && (*mb_char2cells)(mb_c) == 2) |
| 4853 { | |
| 4854 c = '>'; | |
| 4855 mb_c = c; | |
| 4856 mb_utf8 = FALSE; | |
| 4857 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
|
4858 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
|
4859 // 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
|
4860 // displayed at the start of the next line. |
| 7 | 4861 --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
|
4862 #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
|
4863 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
|
4864 #endif |
| 7 | 4865 } |
| 4866 else if (*ptr != NUL) | |
| 4867 ptr += mb_l - 1; | |
| 4868 | |
| 4869 /* 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
|
4870 * a '<' in the first column. Don't do this for unprintable |
| 4352 | 4871 * 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
|
4872 if (n_skip > 0 && mb_l > 1 && n_extra == 0) |
| 7 | 4873 { |
| 4874 n_extra = 1; | |
| 3586 | 4875 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
|
4876 c_final = NUL; |
| 7 | 4877 c = ' '; |
| 4878 if (area_attr == 0 && search_attr == 0) | |
| 4879 { | |
| 4880 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
|
4881 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 4882 saved_attr2 = char_attr; /* save current attr */ |
| 4883 } | |
| 4884 mb_c = c; | |
| 4885 mb_utf8 = FALSE; | |
| 4886 mb_l = 1; | |
| 4887 } | |
| 4888 | |
| 4889 } | |
| 4890 ++ptr; | |
| 4891 | |
| 4892 if (extra_check) | |
| 4893 { | |
| 743 | 4894 #ifdef FEAT_SPELL |
| 221 | 4895 int can_spell = TRUE; |
| 743 | 4896 #endif |
| 4897 | |
|
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
|
4898 #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
|
4899 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
|
4900 { |
|
11864
97eb443fee5d
patch 8.0.0812: terminal window colors shift when 'number' is set
Christian Brabandt <cb@256bit.org>
parents:
11836
diff
changeset
|
4901 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
|
4902 |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4903 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
|
4904 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
|
4905 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
|
4906 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
|
4907 } |
|
f080b225a2a4
patch 8.0.0798: no highlighting in a terminal window with a finished job
Christian Brabandt <cb@256bit.org>
parents:
11834
diff
changeset
|
4908 #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
|
4909 |
| 743 | 4910 #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
|
4911 // 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
|
4912 // (double-wide char that doesn't fit). |
| 221 | 4913 v = (long)(ptr - line); |
| 4914 if (has_syntax && v > 0) | |
| 7 | 4915 { |
| 4916 /* Get the syntax attribute for the character. If there | |
| 4917 * is an error, disable syntax highlighting. */ | |
| 4918 save_did_emsg = did_emsg; | |
| 4919 did_emsg = FALSE; | |
| 4920 | |
| 221 | 4921 syntax_attr = get_syntax_attr((colnr_T)v - 1, |
| 743 | 4922 # ifdef FEAT_SPELL |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4923 has_spell ? &can_spell : |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4924 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4925 NULL, FALSE); |
| 7 | 4926 |
| 4927 if (did_emsg) | |
| 482 | 4928 { |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
4929 wp->w_s->b_syn_error = TRUE; |
| 482 | 4930 has_syntax = FALSE; |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4931 syntax_attr = 0; |
| 482 | 4932 } |
| 7 | 4933 else |
| 4934 did_emsg = save_did_emsg; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4935 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4936 // combine syntax attribute with 'wincolor' |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4937 if (win_attr != 0) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
4938 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
|
4939 |
|
11529
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4940 #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
|
4941 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
|
4942 has_syntax = FALSE; |
|
998d2cf59caa
patch 8.0.0647: syntax highlighting can make cause a freeze
Christian Brabandt <cb@256bit.org>
parents:
11521
diff
changeset
|
4943 #endif |
| 7 | 4944 |
| 4945 /* Need to get the line again, a multi-line regexp may | |
| 4946 * have made it invalid. */ | |
| 4947 line = ml_get_buf(wp->w_buffer, lnum, FALSE); | |
| 4948 ptr = line + v; | |
| 4949 | |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4950 # 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
|
4951 // 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
|
4952 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
|
4953 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4954 { |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4955 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
|
4956 # 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
|
4957 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
|
4958 # endif |
|
15259
b42b47c0bb80
patch 8.1.0638: text property highlighting is off by one column
Bram Moolenaar <Bram@vim.org>
parents:
15227
diff
changeset
|
4959 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
|
4960 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
|
4961 else |
|
16545
7a563ee902b6
patch 8.1.1276: cannot combine text properties with syntax highlighting
Bram Moolenaar <Bram@vim.org>
parents:
16405
diff
changeset
|
4962 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
|
4963 } |
|
2364
151b037b7e74
Fix hang when resizing in diff mode and there are concealed items.
Bram Moolenaar <bram@vim.org>
parents:
2359
diff
changeset
|
4964 # 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
|
4965 /* 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
|
4966 * 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
|
4967 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
|
4968 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
|
4969 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
|
4970 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
|
4971 # endif |
| 7 | 4972 } |
| 743 | 4973 #endif |
| 4974 | |
| 4975 #ifdef FEAT_SPELL | |
| 301 | 4976 /* Check spelling (unless at the end of the line). |
| 319 | 4977 * Only do this when there is no syntax highlighting, the |
| 4978 * @Spell cluster is not used or the current syntax item | |
| 4979 * contains the @Spell cluster. */ | |
| 348 | 4980 if (has_spell && v >= word_end && v > cur_checked_col) |
| 221 | 4981 { |
| 230 | 4982 spell_attr = 0; |
| 743 | 4983 if (c != 0 && ( |
| 4984 # ifdef FEAT_SYN_HL | |
| 4985 !has_syntax || | |
| 4986 # endif | |
| 4987 can_spell)) | |
| 221 | 4988 { |
| 348 | 4989 char_u *prev_ptr, *p; |
| 4990 int len; | |
| 534 | 4991 hlf_T spell_hlf = HLF_COUNT; |
| 336 | 4992 if (has_mbyte) |
| 4993 { | |
| 4994 prev_ptr = ptr - mb_l; | |
| 4995 v -= mb_l - 1; | |
| 4996 } | |
| 4997 else | |
| 4998 prev_ptr = ptr - 1; | |
| 348 | 4999 |
| 5000 /* Use nextline[] if possible, it has the start of the | |
| 5001 * next line concatenated. */ | |
| 5002 if ((prev_ptr - line) - nextlinecol >= 0) | |
| 5003 p = nextline + (prev_ptr - line) - nextlinecol; | |
| 5004 else | |
| 5005 p = prev_ptr; | |
| 835 | 5006 cap_col -= (int)(prev_ptr - line); |
| 625 | 5007 len = spell_check(wp, p, &spell_hlf, &cap_col, |
| 5008 nochange); | |
| 348 | 5009 word_end = v + len; |
| 301 | 5010 |
| 5011 /* In Insert mode only highlight a word that | |
| 5012 * doesn't touch the cursor. */ | |
| 534 | 5013 if (spell_hlf != HLF_COUNT |
| 301 | 5014 && (State & INSERT) != 0 |
| 5015 && wp->w_cursor.lnum == lnum | |
| 5016 && wp->w_cursor.col >= | |
| 5017 (colnr_T)(prev_ptr - line) | |
| 5018 && wp->w_cursor.col < (colnr_T)word_end) | |
| 221 | 5019 { |
| 534 | 5020 spell_hlf = HLF_COUNT; |
| 301 | 5021 spell_redraw_lnum = lnum; |
| 221 | 5022 } |
| 348 | 5023 |
| 534 | 5024 if (spell_hlf == HLF_COUNT && p != prev_ptr |
| 348 | 5025 && (p - nextline) + len > nextline_idx) |
| 5026 { | |
| 5027 /* Remember that the good word continues at the | |
| 5028 * start of the next line. */ | |
| 5029 checked_lnum = lnum + 1; | |
| 835 | 5030 checked_col = (int)((p - nextline) + len - nextline_idx); |
| 348 | 5031 } |
| 386 | 5032 |
| 534 | 5033 /* Turn index into actual attributes. */ |
| 5034 if (spell_hlf != HLF_COUNT) | |
| 5035 spell_attr = highlight_attr[spell_hlf]; | |
| 5036 | |
| 386 | 5037 if (cap_col > 0) |
| 5038 { | |
| 5039 if (p != prev_ptr | |
| 5040 && (p - nextline) + cap_col >= nextline_idx) | |
| 5041 { | |
| 5042 /* Remember that the word in the next line | |
| 5043 * must start with a capital. */ | |
| 5044 capcol_lnum = lnum + 1; | |
| 835 | 5045 cap_col = (int)((p - nextline) + cap_col |
| 5046 - nextline_idx); | |
| 386 | 5047 } |
| 5048 else | |
| 5049 /* Compute the actual column. */ | |
| 835 | 5050 cap_col += (int)(prev_ptr - line); |
| 386 | 5051 } |
| 221 | 5052 } |
| 5053 } | |
| 5054 if (spell_attr != 0) | |
| 348 | 5055 { |
| 674 | 5056 if (!attr_pri) |
| 348 | 5057 char_attr = hl_combine_attr(char_attr, spell_attr); |
| 5058 else | |
| 5059 char_attr = hl_combine_attr(spell_attr, char_attr); | |
| 5060 } | |
| 7 | 5061 #endif |
| 5062 #ifdef FEAT_LINEBREAK | |
| 5063 /* | |
| 221 | 5064 * Found last space before word: check for line break. |
| 7 | 5065 */ |
|
10982
5e20c9f96cd5
patch 8.0.0380: with 'linebreak' double wide char wraps badly
Christian Brabandt <cb@256bit.org>
parents:
10928
diff
changeset
|
5066 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
|
5067 && VIM_ISBREAK(c) && !VIM_ISBREAK((int)*ptr)) |
| 7 | 5068 { |
| 6693 | 5069 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
|
5070 char_u *p = ptr - (mb_off + 1); |
| 6681 | 5071 |
| 5995 | 5072 /* TODO: is passing p for start of the line OK? */ |
| 6026 | 5073 n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, |
| 5995 | 5074 NULL) - 1; |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5075 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
|
5076 # ifdef FEAT_VARTABS |
|
14198
9ca8c36869ce
patch 8.1.0116: display problem with 'vartabstop' and 'linebreak'
Christian Brabandt <cb@256bit.org>
parents:
14191
diff
changeset
|
5077 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
|
5078 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
|
5079 # else |
| 6371 | 5080 n_extra = (int)wp->w_buffer->b_p_ts |
| 5081 - 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
|
5082 # endif |
| 6371 | 5083 |
| 6693 | 5084 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
|
5085 c_final = NUL; |
|
11129
f4ea50924c6d
patch 8.0.0452: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11127
diff
changeset
|
5086 if (VIM_ISWHITE(c)) |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5087 { |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5088 #ifdef FEAT_CONCEAL |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5089 if (c == TAB) |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5090 /* See "Tab alignment" below. */ |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5091 FIX_FOR_BOGUSCOLS; |
|
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5092 #endif |
| 6026 | 5093 if (!wp->w_p_list) |
| 5094 c = ' '; | |
|
5174
42d592dbbec3
updated for version 7.4a.013
Bram Moolenaar <bram@vim.org>
parents:
5126
diff
changeset
|
5095 } |
| 7 | 5096 } |
| 5097 #endif | |
| 5098 | |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5099 // '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
|
5100 // 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
|
5101 // 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
|
5102 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
|
5103 && ((((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
|
5104 || (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
|
5105 && ((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
|
5106 || (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
|
5107 && 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
|
5108 || (c == ' ' |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5109 && 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
|
5110 && 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
|
5111 && 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
|
5112 { |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5113 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
|
5114 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
|
5115 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5116 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
|
5117 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
|
5118 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
|
5119 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5120 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
|
5121 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
|
5122 { |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5123 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
|
5124 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
|
5125 c = 0xc0; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5126 } |
|
16211
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5127 else |
|
5fb0f15fafea
patch 8.1.1110: composing chars on space wrong when 'listchars' is set
Bram Moolenaar <Bram@vim.org>
parents:
16162
diff
changeset
|
5128 mb_utf8 = FALSE; |
|
7344
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5129 } |
|
68f2cac6b0db
commit https://github.com/vim/vim/commit/9bc01ebb957d2b30d57bd30d7aee6f1df2a336b0
Christian Brabandt <cb@256bit.org>
parents:
7287
diff
changeset
|
5130 |
| 7 | 5131 if (trailcol != MAXCOL && ptr > line + trailcol && c == ' ') |
| 5132 { | |
| 5133 c = lcs_trail; | |
| 674 | 5134 if (!attr_pri) |
| 7 | 5135 { |
| 5136 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
|
5137 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5138 saved_attr2 = char_attr; /* save current attr */ |
| 5139 } | |
| 5140 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
|
5141 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5142 { |
| 5143 mb_utf8 = TRUE; | |
| 714 | 5144 u8cc[0] = 0; |
| 819 | 5145 c = 0xc0; |
| 7 | 5146 } |
| 5147 else | |
| 5148 mb_utf8 = FALSE; | |
| 5149 } | |
| 5150 } | |
| 5151 | |
| 5152 /* | |
| 5153 * Handling of non-printable characters. | |
| 5154 */ | |
|
7697
f04e2b6feea2
commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Christian Brabandt <cb@256bit.org>
parents:
7603
diff
changeset
|
5155 if (!vim_isprintc(c)) |
| 7 | 5156 { |
| 5157 /* | |
| 5158 * when getting a character from the file, we may have to | |
| 5159 * turn it into something else on the way to putting it | |
| 5160 * into "ScreenLines". | |
| 5161 */ | |
| 5162 if (c == TAB && (!wp->w_p_list || lcs_tab1)) | |
| 5163 { | |
| 6026 | 5164 int tab_len = 0; |
| 6503 | 5165 long vcol_adjusted = vcol; /* removed showbreak length */ |
| 5166 #ifdef FEAT_LINEBREAK | |
| 5167 /* only adjust the tab_len, when at the first column | |
| 5168 * after the showbreak value was drawn */ | |
| 5169 if (*p_sbr != NUL && vcol == vcol_sbr && wp->w_p_wrap) | |
| 5170 vcol_adjusted = vcol - MB_CHARLEN(p_sbr); | |
| 5171 #endif | |
| 7 | 5172 /* 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
|
5173 #ifdef FEAT_VARTABS |
|
2ad722003b36
patch 8.1.0105: all tab stops are the same
Christian Brabandt <cb@256bit.org>
parents:
14161
diff
changeset
|
5174 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
|
5175 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
|
5176 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
|
5177 #else |
| 6026 | 5178 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
|
5179 - 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
|
5180 #endif |
| 6503 | 5181 |
| 6026 | 5182 #ifdef FEAT_LINEBREAK |
| 6100 | 5183 if (!wp->w_p_lbr || !wp->w_p_list) |
| 6026 | 5184 #endif |
| 5185 /* tab amount depends on current column */ | |
| 5186 n_extra = tab_len; | |
| 5187 #ifdef FEAT_LINEBREAK | |
| 5188 else | |
| 5189 { | |
| 5190 char_u *p; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5191 int len; |
| 6026 | 5192 int i; |
| 5193 int saved_nextra = n_extra; | |
| 5194 | |
| 6172 | 5195 #ifdef FEAT_CONCEAL |
| 6627 | 5196 if (vcol_off > 0) |
| 6172 | 5197 /* there are characters to conceal */ |
| 5198 tab_len += vcol_off; | |
| 6520 | 5199 /* boguscols before FIX_FOR_BOGUSCOLS macro from above |
| 5200 */ | |
| 5201 if (wp->w_p_list && lcs_tab1 && old_boguscols > 0 | |
| 5202 && n_extra > tab_len) | |
| 5203 tab_len += n_extra - tab_len; | |
| 5204 #endif | |
| 5205 | |
| 6026 | 5206 /* if n_extra > 0, it gives the number of chars, to |
| 5207 * use for a tab, else we need to calculate the width | |
| 5208 * for a tab */ | |
| 5209 len = (tab_len * mb_char2len(lcs_tab2)); | |
| 5210 if (n_extra > 0) | |
| 5211 len += n_extra - tab_len; | |
| 5212 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
|
5213 p = alloc(len + 1); |
| 6026 | 5214 vim_memset(p, ' ', len); |
| 5215 p[len] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5216 vim_free(p_extra_free); |
| 6026 | 5217 p_extra_free = p; |
| 5218 for (i = 0; i < tab_len; i++) | |
| 5219 { | |
|
14218
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5220 if (*p == NUL) |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5221 { |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5222 tab_len = i; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5223 break; |
|
539b070778b0
patch 8.1.0126: various problems with 'vartabstop'
Christian Brabandt <cb@256bit.org>
parents:
14198
diff
changeset
|
5224 } |
| 6026 | 5225 mb_char2bytes(lcs_tab2, p); |
| 5226 p += mb_char2len(lcs_tab2); | |
| 5227 n_extra += mb_char2len(lcs_tab2) | |
| 5228 - (saved_nextra > 0 ? 1 : 0); | |
| 5229 } | |
| 5230 p_extra = p_extra_free; | |
| 6172 | 5231 #ifdef FEAT_CONCEAL |
| 5232 /* n_extra will be increased by FIX_FOX_BOGUSCOLS | |
| 5233 * macro below, so need to adjust for that here */ | |
| 6627 | 5234 if (vcol_off > 0) |
| 6172 | 5235 n_extra -= vcol_off; |
| 5236 #endif | |
| 6026 | 5237 } |
| 5238 #endif | |
| 3984 | 5239 #ifdef FEAT_CONCEAL |
| 6627 | 5240 { |
| 5241 int vc_saved = vcol_off; | |
| 5242 | |
| 5243 /* Tab alignment should be identical regardless of | |
| 5244 * 'conceallevel' value. So tab compensates of all | |
| 5245 * previous concealed characters, and thus resets | |
| 5246 * vcol_off and boguscols accumulated so far in the | |
| 5247 * line. Note that the tab can be longer than | |
| 5248 * 'tabstop' when there are concealed characters. */ | |
| 5249 FIX_FOR_BOGUSCOLS; | |
| 5250 | |
| 5251 /* Make sure, the highlighting for the tab char will be | |
| 5252 * correctly set further below (effectively reverts the | |
| 5253 * FIX_FOR_BOGSUCOLS macro */ | |
| 5254 if (n_extra == tab_len + vc_saved && wp->w_p_list | |
| 6520 | 5255 && lcs_tab1) |
| 6627 | 5256 tab_len += vc_saved; |
| 5257 } | |
| 3984 | 5258 #endif |
| 7 | 5259 mb_utf8 = FALSE; /* don't draw as UTF-8 */ |
| 5260 if (wp->w_p_list) | |
| 5261 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5262 c = (n_extra == 0 && lcs_tab3) ? lcs_tab3 : lcs_tab1; |
| 6026 | 5263 #ifdef FEAT_LINEBREAK |
| 5264 if (wp->w_p_lbr) | |
| 5265 c_extra = NUL; /* using p_extra from above */ | |
| 5266 else | |
| 5267 #endif | |
| 5268 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
|
5269 c_final = lcs_tab3; |
| 6026 | 5270 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
|
5271 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5272 saved_attr2 = char_attr; /* save current attr */ |
| 5273 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
|
5274 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5275 { |
| 5276 mb_utf8 = TRUE; | |
| 714 | 5277 u8cc[0] = 0; |
| 819 | 5278 c = 0xc0; |
| 7 | 5279 } |
| 5280 } | |
| 5281 else | |
| 5282 { | |
|
15502
bc17a9d37810
patch 8.1.0759: showing two characters for tab is limited
Bram Moolenaar <Bram@vim.org>
parents:
15436
diff
changeset
|
5283 c_final = NUL; |
| 7 | 5284 c_extra = ' '; |
| 5285 c = ' '; | |
| 5286 } | |
| 5287 } | |
| 36 | 5288 else if (c == NUL |
| 6799 | 5289 && (wp->w_p_list |
| 36 | 5290 || ((fromcol >= 0 || fromcol_prev >= 0) |
| 5291 && tocol > vcol | |
| 5292 && VIsual_mode != Ctrl_V | |
| 5293 && ( | |
| 5294 # ifdef FEAT_RIGHTLEFT | |
| 5295 wp->w_p_rl ? (col >= 0) : | |
| 5296 # endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5297 (col < wp->w_width)) |
| 36 | 5298 && !(noinvcur |
| 1850 | 5299 && lnum == wp->w_cursor.lnum |
| 36 | 5300 && (colnr_T)vcol == wp->w_virtcol))) |
| 6815 | 5301 && lcs_eol_one > 0) |
| 7 | 5302 { |
| 36 | 5303 /* Display a '$' after the line or highlight an extra |
| 5304 * character if the line break is included. */ | |
| 7 | 5305 #if defined(FEAT_DIFF) || defined(LINE_ATTR) |
| 5306 /* For a diff line the highlighting continues after the | |
| 5307 * "$". */ | |
| 5308 if ( | |
| 5309 # ifdef FEAT_DIFF | |
| 534 | 5310 diff_hlf == (hlf_T)0 |
| 7 | 5311 # ifdef LINE_ATTR |
| 5312 && | |
| 5313 # endif | |
| 5314 # endif | |
| 5315 # ifdef LINE_ATTR | |
| 5316 line_attr == 0 | |
| 5317 # endif | |
| 5318 ) | |
| 5319 #endif | |
| 5320 { | |
| 5321 /* In virtualedit, visual selections may extend | |
| 5322 * beyond end of line. */ | |
| 5323 if (area_highlighting && virtual_active() | |
| 5324 && tocol != MAXCOL && vcol < tocol) | |
| 5325 n_extra = 0; | |
| 5326 else | |
| 5327 { | |
| 5328 p_extra = at_end_str; | |
| 5329 n_extra = 1; | |
| 5330 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
|
5331 c_final = NUL; |
| 7 | 5332 } |
| 5333 } | |
| 6799 | 5334 if (wp->w_p_list && lcs_eol > 0) |
| 36 | 5335 c = lcs_eol; |
| 5336 else | |
| 5337 c = ' '; | |
| 7 | 5338 lcs_eol_one = -1; |
| 5339 --ptr; /* put it back at the NUL */ | |
| 674 | 5340 if (!attr_pri) |
| 7 | 5341 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5342 extra_attr = HL_ATTR(HLF_AT); |
| 7 | 5343 n_attr = 1; |
| 5344 } | |
| 5345 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
|
5346 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5347 { |
| 5348 mb_utf8 = TRUE; | |
| 714 | 5349 u8cc[0] = 0; |
| 819 | 5350 c = 0xc0; |
| 7 | 5351 } |
| 5352 else | |
| 5353 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5354 } | |
| 5355 else if (c != NUL) | |
| 5356 { | |
| 5357 p_extra = transchar(c); | |
| 6064 | 5358 if (n_extra == 0) |
| 5359 n_extra = byte2cells(c) - 1; | |
| 7 | 5360 #ifdef FEAT_RIGHTLEFT |
| 5361 if ((dy_flags & DY_UHEX) && wp->w_p_rl) | |
| 5362 rl_mirror(p_extra); /* reverse "<12>" */ | |
| 5363 #endif | |
| 5364 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
|
5365 c_final = NUL; |
| 6026 | 5366 #ifdef FEAT_LINEBREAK |
| 5367 if (wp->w_p_lbr) | |
| 5368 { | |
| 5369 char_u *p; | |
| 5370 | |
| 5371 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
|
5372 p = alloc(n_extra + 1); |
| 6026 | 5373 vim_memset(p, ' ', n_extra); |
| 5374 STRNCPY(p, p_extra + 1, STRLEN(p_extra) - 1); | |
| 5375 p[n_extra] = NUL; | |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
5376 vim_free(p_extra_free); |
| 6026 | 5377 p_extra_free = p_extra = p; |
| 5378 } | |
| 5379 else | |
| 5380 #endif | |
| 5381 { | |
| 5382 n_extra = byte2cells(c) - 1; | |
| 5383 c = *p_extra++; | |
| 5384 } | |
| 674 | 5385 if (!attr_pri) |
| 7 | 5386 { |
| 5387 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
|
5388 extra_attr = HL_ATTR(HLF_8); |
| 7 | 5389 saved_attr2 = char_attr; /* save current attr */ |
| 5390 } | |
| 5391 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 5392 } | |
| 5393 else if (VIsual_active | |
| 5394 && (VIsual_mode == Ctrl_V | |
| 5395 || VIsual_mode == 'v') | |
| 5396 && virtual_active() | |
| 5397 && tocol != MAXCOL | |
| 5398 && vcol < tocol | |
| 5399 && ( | |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5400 #ifdef FEAT_RIGHTLEFT |
| 7 | 5401 wp->w_p_rl ? (col >= 0) : |
|
15636
6f1c7e9a6393
patch 8.1.0826: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15629
diff
changeset
|
5402 #endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5403 (col < wp->w_width))) |
| 7 | 5404 { |
| 5405 c = ' '; | |
| 5406 --ptr; /* put it back at the NUL */ | |
| 5407 } | |
| 910 | 5408 #if defined(LINE_ATTR) |
| 7 | 5409 else if (( |
| 5410 # ifdef FEAT_DIFF | |
| 910 | 5411 diff_hlf != (hlf_T)0 || |
| 7 | 5412 # endif |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5413 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5414 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
|
5415 # endif |
| 7 | 5416 line_attr != 0 |
| 5417 ) && ( | |
| 5418 # ifdef FEAT_RIGHTLEFT | |
| 5419 wp->w_p_rl ? (col >= 0) : | |
| 5420 # endif | |
|
2553
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5421 (col |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5422 # ifdef FEAT_CONCEAL |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5423 - boguscols |
|
37d3f90f5203
Conceal feature caused the 'cursorline' highlighting to stop early.
Bram Moolenaar <bram@vim.org>
parents:
2520
diff
changeset
|
5424 # endif |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5425 < wp->w_width))) |
| 7 | 5426 { |
| 5427 /* Highlight until the right side of the window */ | |
| 5428 c = ' '; | |
| 5429 --ptr; /* put it back at the NUL */ | |
| 867 | 5430 |
| 5431 /* Remember we do the char for line highlighting. */ | |
| 5432 ++did_line_attr; | |
| 5433 | |
| 5434 /* 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
|
5435 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
|
5436 && (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
|
5437 || (wp->w_p_list && lcs_eol > 0))) |
| 867 | 5438 char_attr = line_attr; |
| 7 | 5439 # ifdef FEAT_DIFF |
| 5440 if (diff_hlf == HLF_TXD) | |
| 5441 { | |
| 5442 diff_hlf = HLF_CHD; | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5443 if (vi_attr == 0 || char_attr != vi_attr) |
| 6106 | 5444 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
5445 char_attr = HL_ATTR(diff_hlf); |
| 6106 | 5446 if (wp->w_p_cul && lnum == wp->w_cursor.lnum) |
| 5447 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
|
5448 HL_ATTR(HLF_CUL)); |
| 6106 | 5449 } |
| 7 | 5450 } |
| 5451 # endif | |
|
12433
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5452 # ifdef FEAT_TERMINAL |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5453 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
|
5454 { |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5455 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
|
5456 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
|
5457 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
|
5458 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
|
5459 } |
|
735b49ff8fbb
patch 8.0.1096: terminal window in Normal mode has wrong background
Christian Brabandt <cb@256bit.org>
parents:
12323
diff
changeset
|
5460 # endif |
| 7 | 5461 } |
| 5462 #endif | |
| 5463 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5464 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5465 #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
|
5466 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
|
5467 && (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
|
5468 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
|
5469 && ((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
|
5470 && !(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
|
5471 && 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
|
5472 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5473 char_attr = conceal_attr; |
|
8907
5deb9e8f4292
commit https://github.com/vim/vim/commit/4d585022023b96f6507e8cae5ed8fc8d926f5140
Christian Brabandt <cb@256bit.org>
parents:
8872
diff
changeset
|
5474 if ((prev_syntax_id != syntax_seqnr || has_match_conc > 1) |
| 6947 | 5475 && (syn_get_sub_char() != NUL || match_conc |
| 5476 || 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
|
5477 && 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
|
5478 { |
|
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5479 /* 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
|
5480 * character. */ |
| 6947 | 5481 if (match_conc) |
| 5482 c = match_conc; | |
| 5483 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
|
5484 c = syn_get_sub_char(); |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5485 else if (lcs_conceal != NUL) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5486 c = lcs_conceal; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5487 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5488 c = ' '; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5489 |
|
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
|
5490 prev_syntax_id = syntax_seqnr; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5491 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5492 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5493 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5494 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5495 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
|
5496 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5497 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5498 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5499 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5500 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5501 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5502 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5503 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5504 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5505 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5506 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5507 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5508 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5509 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5510 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5511 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5512 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5513 else if (n_skip == 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5514 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5515 is_concealing = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5516 n_skip = 1; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5517 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5518 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
|
5519 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
|
5520 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5521 mb_utf8 = TRUE; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5522 u8cc[0] = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5523 c = 0xc0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5524 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5525 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5526 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
|
5527 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5528 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5529 { |
|
2375
a96dd77ce213
For conceal mode: when two different syntax items follow each other, show the
Bram Moolenaar <bram@vim.org>
parents:
2364
diff
changeset
|
5530 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
|
5531 is_concealing = FALSE; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
5532 } |
|
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
|
5533 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5534 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
|
5535 // 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
|
5536 ++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
|
5537 |
|
8abd2cb8441c
patch 8.1.1338: hang when concealing the '>' shown for half of wide char
Bram Moolenaar <Bram@vim.org>
parents:
16660
diff
changeset
|
5538 #endif // FEAT_CONCEAL |
| 7 | 5539 } |
| 5540 | |
|
2378
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5541 #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
|
5542 /* 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
|
5543 * 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
|
5544 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
|
5545 && 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
|
5546 && 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
|
5547 && (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
|
5548 { |
|
7603
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5549 # ifdef FEAT_RIGHTLEFT |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5550 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
|
5551 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
|
5552 else |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5553 # endif |
|
d3892f6c917e
commit https://github.com/vim/vim/commit/e39b3d9fb4e4006684c33847d1ef6a0d742699dd
Christian Brabandt <cb@256bit.org>
parents:
7344
diff
changeset
|
5554 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
|
5555 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
|
5556 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
|
5557 } |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5558 #endif |
|
85b7dc8da5eb
Add the 'concealcursor' option to decide when the cursor line is to be
Bram Moolenaar <bram@vim.org>
parents:
2375
diff
changeset
|
5559 |
| 7 | 5560 /* Don't override visual selection highlighting. */ |
| 5561 if (n_attr > 0 | |
| 5562 && draw_state == WL_LINE | |
| 674 | 5563 && !attr_pri) |
| 7 | 5564 char_attr = extra_attr; |
| 5565 | |
| 42 | 5566 #if defined(FEAT_XIM) && defined(FEAT_GUI_GTK) |
| 7 | 5567 /* XIM don't send preedit_start and preedit_end, but they send |
| 5568 * preedit_changed and commit. Thus Vim can't set "im_is_active", use | |
| 5569 * 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
|
5570 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
|
5571 && xic != NULL |
| 1850 | 5572 && lnum == wp->w_cursor.lnum |
| 7 | 5573 && (State & INSERT) |
| 5574 && !p_imdisable | |
| 5575 && im_is_preediting() | |
| 5576 && draw_state == WL_LINE) | |
| 5577 { | |
| 5578 colnr_T tcol; | |
| 5579 | |
| 5580 if (preedit_end_col == MAXCOL) | |
| 1850 | 5581 getvcol(curwin, &(wp->w_cursor), &tcol, NULL, NULL); |
| 7 | 5582 else |
| 5583 tcol = preedit_end_col; | |
| 5584 if ((long)preedit_start_col <= vcol && vcol < (long)tcol) | |
| 5585 { | |
| 5586 if (feedback_old_attr < 0) | |
| 5587 { | |
| 5588 feedback_col = 0; | |
| 5589 feedback_old_attr = char_attr; | |
| 5590 } | |
| 5591 char_attr = im_get_feedback_attr(feedback_col); | |
| 5592 if (char_attr < 0) | |
| 5593 char_attr = feedback_old_attr; | |
| 5594 feedback_col++; | |
| 5595 } | |
| 5596 else if (feedback_old_attr >= 0) | |
| 5597 { | |
| 5598 char_attr = feedback_old_attr; | |
| 5599 feedback_old_attr = -1; | |
| 5600 feedback_col = 0; | |
| 5601 } | |
| 5602 } | |
| 5603 #endif | |
| 5604 /* | |
| 5605 * Handle the case where we are in column 0 but not on the first | |
| 5606 * character of the line and the user wants us to show us a | |
| 5607 * special character (via 'listchars' option "precedes:<char>". | |
| 5608 */ | |
| 5609 if (lcs_prec_todo != NUL | |
| 6276 | 5610 && wp->w_p_list |
| 7 | 5611 && (wp->w_p_wrap ? wp->w_skipcol > 0 : wp->w_leftcol > 0) |
| 5612 #ifdef FEAT_DIFF | |
| 5613 && filler_todo <= 0 | |
| 5614 #endif | |
| 5615 && draw_state > WL_NR | |
| 5616 && c != NUL) | |
| 5617 { | |
| 5618 c = lcs_prec; | |
| 5619 lcs_prec_todo = NUL; | |
| 3586 | 5620 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) |
| 5621 { | |
| 5622 /* Double-width character being overwritten by the "precedes" | |
| 5623 * character, need to fill up half the character. */ | |
| 5624 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
|
5625 c_final = NUL; |
| 3586 | 5626 n_extra = 1; |
| 5627 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
|
5628 extra_attr = HL_ATTR(HLF_AT); |
| 3586 | 5629 } |
| 7 | 5630 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
|
5631 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5632 { |
| 5633 mb_utf8 = TRUE; | |
| 714 | 5634 u8cc[0] = 0; |
| 819 | 5635 c = 0xc0; |
| 7 | 5636 } |
| 5637 else | |
| 5638 mb_utf8 = FALSE; /* don't draw as UTF-8 */ | |
| 674 | 5639 if (!attr_pri) |
| 7 | 5640 { |
| 5641 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
|
5642 char_attr = HL_ATTR(HLF_AT); /* later copied to char_attr */ |
| 7 | 5643 n_attr3 = 1; |
| 5644 } | |
| 5645 } | |
| 5646 | |
| 5647 /* | |
| 867 | 5648 * At end of the text line or just after the last character. |
| 7 | 5649 */ |
| 867 | 5650 if (c == NUL |
| 910 | 5651 #if defined(LINE_ATTR) |
| 867 | 5652 || did_line_attr == 1 |
| 5653 #endif | |
| 5654 ) | |
| 5655 { | |
| 5656 #ifdef FEAT_SEARCH_EXTRA | |
| 5657 long prevcol = (long)(ptr - line) - (c == NUL); | |
| 1437 | 5658 |
| 5659 /* we're not really at that column when skipping some text */ | |
| 1439 | 5660 if ((long)(wp->w_p_wrap ? wp->w_skipcol : wp->w_leftcol) > prevcol) |
| 1437 | 5661 ++prevcol; |
| 867 | 5662 #endif |
| 5663 | |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5664 /* Invert at least one char, used for Visual and empty line or |
| 7 | 5665 * highlight match at end of line. If it's beyond the last |
| 5666 * char on the screen, just overwrite that one (tricky!) Not | |
| 5667 * needed when a '$' was displayed for 'list'. */ | |
| 1326 | 5668 #ifdef FEAT_SEARCH_EXTRA |
| 5669 prevcol_hl_flag = FALSE; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5670 if (!search_hl.is_addpos && prevcol == (long)search_hl.startcol) |
| 1326 | 5671 prevcol_hl_flag = TRUE; |
| 5672 else | |
| 5673 { | |
| 5674 cur = wp->w_match_head; | |
| 5675 while (cur != NULL) | |
| 5676 { | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5677 if (!cur->hl.is_addpos && prevcol == (long)cur->hl.startcol) |
| 1326 | 5678 { |
| 5679 prevcol_hl_flag = TRUE; | |
| 5680 break; | |
| 5681 } | |
| 5682 cur = cur->next; | |
| 5683 } | |
| 5684 } | |
| 5685 #endif | |
| 7 | 5686 if (lcs_eol == lcs_eol_one |
| 1850 | 5687 && ((area_attr != 0 && vcol == fromcol |
| 5688 && (VIsual_mode != Ctrl_V | |
| 5689 || lnum == VIsual.lnum | |
| 5690 || lnum == curwin->w_cursor.lnum) | |
| 5691 && c == NUL) | |
| 7 | 5692 #ifdef FEAT_SEARCH_EXTRA |
| 5693 /* highlight 'hlsearch' match at end of line */ | |
| 1326 | 5694 || (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
|
5695 # 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
|
5696 && !(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
|
5697 && !(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
|
5698 # endif |
|
ba55861aa52c
patch 8.0.1168: wrong highlighting with combination of match and 'cursorline'
Christian Brabandt <cb@256bit.org>
parents:
12529
diff
changeset
|
5699 # 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
|
5700 && 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
|
5701 # endif |
| 910 | 5702 # if defined(LINE_ATTR) |
| 867 | 5703 && did_line_attr <= 1 |
| 5704 # endif | |
| 5705 ) | |
| 7 | 5706 #endif |
| 5707 )) | |
| 5708 { | |
| 5709 int n = 0; | |
| 5710 | |
| 5711 #ifdef FEAT_RIGHTLEFT | |
| 5712 if (wp->w_p_rl) | |
| 5713 { | |
| 5714 if (col < 0) | |
| 5715 n = 1; | |
| 5716 } | |
| 5717 else | |
| 5718 #endif | |
| 5719 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5720 if (col >= wp->w_width) |
| 7 | 5721 n = -1; |
| 5722 } | |
| 5723 if (n != 0) | |
| 5724 { | |
| 5725 /* At the window boundary, highlight the last character | |
| 5726 * instead (better than nothing). */ | |
| 5727 off += n; | |
| 5728 col += n; | |
| 5729 } | |
| 5730 else | |
| 5731 { | |
| 5732 /* Add a blank character to highlight. */ | |
| 5733 ScreenLines[off] = ' '; | |
| 5734 if (enc_utf8) | |
| 5735 ScreenLinesUC[off] = 0; | |
| 5736 } | |
| 5737 #ifdef FEAT_SEARCH_EXTRA | |
| 5738 if (area_attr == 0) | |
| 5739 { | |
| 1326 | 5740 /* Use attributes from match with highest priority among |
| 5741 * 'search_hl' and the match list. */ | |
| 5742 char_attr = search_hl.attr; | |
| 5743 cur = wp->w_match_head; | |
| 5744 shl_flag = FALSE; | |
| 5745 while (cur != NULL || shl_flag == FALSE) | |
| 699 | 5746 { |
| 1326 | 5747 if (shl_flag == FALSE |
| 5748 && ((cur != NULL | |
| 5749 && cur->priority > SEARCH_HL_PRIORITY) | |
| 5750 || cur == NULL)) | |
| 699 | 5751 { |
| 1326 | 5752 shl = &search_hl; |
| 5753 shl_flag = TRUE; | |
| 699 | 5754 } |
| 1326 | 5755 else |
| 5756 shl = &cur->hl; | |
|
9885
4e8b05fa12c6
commit https://github.com/vim/vim/commit/4f416e41243ca151b95d39d81ce23d00b1484755
Christian Brabandt <cb@256bit.org>
parents:
9877
diff
changeset
|
5757 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
|
5758 && (shl == &search_hl || !shl->is_addpos)) |
| 1326 | 5759 char_attr = shl->attr; |
| 5760 if (shl != &search_hl && cur != NULL) | |
| 5761 cur = cur->next; | |
| 699 | 5762 } |
| 7 | 5763 } |
| 5764 #endif | |
| 5765 ScreenAttrs[off] = char_attr; | |
| 5766 #ifdef FEAT_RIGHTLEFT | |
| 5767 if (wp->w_p_rl) | |
| 1437 | 5768 { |
| 7 | 5769 --col; |
| 1437 | 5770 --off; |
| 5771 } | |
| 7 | 5772 else |
| 5773 #endif | |
| 1437 | 5774 { |
| 7 | 5775 ++col; |
| 1437 | 5776 ++off; |
| 5777 } | |
| 743 | 5778 ++vcol; |
| 1437 | 5779 #ifdef FEAT_SYN_HL |
| 5780 eol_hl_off = 1; | |
| 5781 #endif | |
| 743 | 5782 } |
| 867 | 5783 } |
| 5784 | |
| 5785 /* | |
| 5786 * At end of the text line. | |
| 5787 */ | |
| 5788 if (c == NUL) | |
| 5789 { | |
| 743 | 5790 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5791 /* Highlight 'cursorcolumn' & 'colorcolumn' past end of the line. */ |
| 758 | 5792 if (wp->w_p_wrap) |
| 5793 v = wp->w_skipcol; | |
| 5794 else | |
| 5795 v = wp->w_leftcol; | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5796 |
| 820 | 5797 /* check if line ends before left margin */ |
| 5798 if (vcol < v + col - win_col_off(wp)) | |
| 5799 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
|
5800 #ifdef FEAT_CONCEAL |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
5801 // 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
|
5802 // edge for 'cursorcolumn'. |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5803 col -= boguscols; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5804 boguscols = 0; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5805 #endif |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5806 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5807 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5808 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
|
5809 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5810 if (((wp->w_p_cuc |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5811 && (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
|
5812 && (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
|
5813 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
|
5814 && lnum != wp->w_cursor.lnum) |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5815 || draw_color_col |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5816 || win_attr != 0) |
| 743 | 5817 # ifdef FEAT_RIGHTLEFT |
| 5818 && !wp->w_p_rl | |
| 5819 # endif | |
| 5820 ) | |
| 5821 { | |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5822 int rightmost_vcol = 0; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5823 int i; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5824 |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5825 if (wp->w_p_cuc) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5826 rightmost_vcol = wp->w_virtcol; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5827 if (draw_color_col) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5828 /* determine rightmost colorcolumn to possibly draw */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5829 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
|
5830 if (rightmost_vcol < color_cols[i]) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5831 rightmost_vcol = color_cols[i]; |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5832 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5833 while (col < wp->w_width) |
| 743 | 5834 { |
| 5835 ScreenLines[off] = ' '; | |
| 5836 if (enc_utf8) | |
| 5837 ScreenLinesUC[off] = 0; | |
| 5838 ++col; | |
|
2356
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5839 if (draw_color_col) |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5840 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
|
5841 &color_cols); |
|
eb1f2554cac5
Fix 'colorcolumn' adjecent columns not highlighted after end of line.
Bram Moolenaar <bram@vim.org>
parents:
2349
diff
changeset
|
5842 |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5843 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
|
5844 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
|
5845 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
|
5846 ScreenAttrs[off++] = HL_ATTR(HLF_MC); |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5847 else |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5848 ScreenAttrs[off++] = win_attr; |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5849 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
5850 if (VCOL_HLC >= rightmost_vcol && win_attr == 0) |
| 743 | 5851 break; |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5852 |
| 743 | 5853 ++vcol; |
| 5854 } | |
| 5855 } | |
| 5856 #endif | |
| 7 | 5857 |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
5858 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
|
5859 (int)wp->w_width, screen_line_flags); |
| 7 | 5860 row++; |
| 5861 | |
| 5862 /* | |
| 5863 * Update w_cline_height and w_cline_folded if the cursor line was | |
| 5864 * updated (saves a call to plines() later). | |
| 5865 */ | |
| 5866 if (wp == curwin && lnum == curwin->w_cursor.lnum) | |
| 5867 { | |
| 5868 curwin->w_cline_row = startrow; | |
| 5869 curwin->w_cline_height = row - startrow; | |
| 5870 #ifdef FEAT_FOLDING | |
| 5871 curwin->w_cline_folded = FALSE; | |
| 5872 #endif | |
| 5873 curwin->w_valid |= (VALID_CHEIGHT|VALID_CROW); | |
| 5874 } | |
| 5875 | |
| 5876 break; | |
| 5877 } | |
| 5878 | |
|
16592
80bb4ce2a281
patch 8.1.1299: "extends" from 'listchars' is used when 'list' is off
Bram Moolenaar <Bram@vim.org>
parents:
16545
diff
changeset
|
5879 // 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
|
5880 // '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
|
5881 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
|
5882 && wp->w_p_list |
| 7 | 5883 && !wp->w_p_wrap |
| 5884 #ifdef FEAT_DIFF | |
| 5885 && filler_todo <= 0 | |
| 5886 #endif | |
| 5887 && ( | |
| 5888 #ifdef FEAT_RIGHTLEFT | |
| 5889 wp->w_p_rl ? col == 0 : | |
| 5890 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
5891 col == wp->w_width - 1) |
| 7 | 5892 && (*ptr != NUL |
| 1555 | 5893 || (wp->w_p_list && lcs_eol_one > 0) |
| 7 | 5894 || (n_extra && (c_extra != NUL || *p_extra != NUL)))) |
| 5895 { | |
| 5896 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
|
5897 char_attr = HL_ATTR(HLF_AT); |
| 7 | 5898 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
|
5899 if (enc_utf8 && utf_char2len(c) > 1) |
| 7 | 5900 { |
| 5901 mb_utf8 = TRUE; | |
| 714 | 5902 u8cc[0] = 0; |
| 819 | 5903 c = 0xc0; |
| 7 | 5904 } |
| 5905 else | |
| 5906 mb_utf8 = FALSE; | |
| 5907 } | |
| 5908 | |
| 743 | 5909 #ifdef FEAT_SYN_HL |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5910 /* advance to the next 'colorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5911 if (draw_color_col) |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5912 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
|
5913 |
| 743 | 5914 /* 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
|
5915 * highlight the cursor position itself. |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5916 * 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
|
5917 * 'cursorcolumn' */ |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5918 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
|
5919 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
|
5920 && search_attr == 0 && area_attr == 0) |
|
2314
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5921 { |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
5922 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
|
5923 && lnum != wp->w_cursor.lnum) |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5924 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5925 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
|
5926 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
|
5927 } |
|
2346
b38c324bdc36
Fix: 'colorcolumn' interfered with concealed text.
Bram Moolenaar <bram@vim.org>
parents:
2338
diff
changeset
|
5928 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
|
5929 { |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5930 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
|
5931 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
|
5932 } |
|
233eb4412f5d
Added 'colorcolumn' option. Partly by Gregor Uhlenheuer.
Bram Moolenaar <bram@vim.org>
parents:
2285
diff
changeset
|
5933 } |
| 743 | 5934 #endif |
| 5935 | |
| 7 | 5936 /* |
| 5937 * Store character to be displayed. | |
| 5938 * Skip characters that are left of the screen for 'nowrap'. | |
| 5939 */ | |
| 5940 vcol_prev = vcol; | |
| 5941 if (draw_state < WL_LINE || n_skip <= 0) | |
| 5942 { | |
| 5943 /* | |
| 5944 * Store the character. | |
| 5945 */ | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
5946 #if defined(FEAT_RIGHTLEFT) |
| 7 | 5947 if (has_mbyte && wp->w_p_rl && (*mb_char2cells)(mb_c) > 1) |
| 5948 { | |
| 5949 /* A double-wide character is: put first halve in left cell. */ | |
| 5950 --off; | |
| 5951 --col; | |
| 5952 } | |
| 5953 #endif | |
| 5954 ScreenLines[off] = c; | |
| 5955 if (enc_dbcs == DBCS_JPNU) | |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5956 { |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5957 if ((mb_c & 0xff00) == 0x8e00) |
|
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5958 ScreenLines[off] = 0x8e; |
| 7 | 5959 ScreenLines2[off] = mb_c & 0xff; |
|
2069
63613d8d7e4d
updated for version 7.2.354
Bram Moolenaar <bram@zimbu.org>
parents:
2055
diff
changeset
|
5960 } |
| 7 | 5961 else if (enc_utf8) |
| 5962 { | |
| 5963 if (mb_utf8) | |
| 5964 { | |
| 1326 | 5965 int i; |
| 5966 | |
| 7 | 5967 ScreenLinesUC[off] = mb_c; |
| 819 | 5968 if ((c & 0xff) == 0) |
| 5969 ScreenLines[off] = 0x80; /* avoid storing zero */ | |
| 714 | 5970 for (i = 0; i < Screen_mco; ++i) |
| 5971 { | |
| 5972 ScreenLinesC[i][off] = u8cc[i]; | |
| 5973 if (u8cc[i] == 0) | |
| 5974 break; | |
| 5975 } | |
| 7 | 5976 } |
| 5977 else | |
| 5978 ScreenLinesUC[off] = 0; | |
| 5979 } | |
| 5980 if (multi_attr) | |
| 5981 { | |
| 5982 ScreenAttrs[off] = multi_attr; | |
| 5983 multi_attr = 0; | |
| 5984 } | |
| 5985 else | |
| 5986 ScreenAttrs[off] = char_attr; | |
| 5987 | |
| 5988 if (has_mbyte && (*mb_char2cells)(mb_c) > 1) | |
| 5989 { | |
| 5990 /* Need to fill two screen columns. */ | |
| 5991 ++off; | |
| 5992 ++col; | |
| 5993 if (enc_utf8) | |
| 5994 /* UTF-8: Put a 0 in the second screen char. */ | |
| 5995 ScreenLines[off] = 0; | |
| 5996 else | |
| 5997 /* DBCS: Put second byte in the second screen char. */ | |
| 5998 ScreenLines[off] = mb_c & 0xff; | |
|
7287
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
5999 if (draw_state > WL_NR |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6000 #ifdef FEAT_DIFF |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6001 && filler_todo <= 0 |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6002 #endif |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6003 ) |
|
6fcadba9ec7a
commit https://github.com/vim/vim/commit/32a214e78df0120f92fe049eab1385c60f0cdb0b
Christian Brabandt <cb@256bit.org>
parents:
7233
diff
changeset
|
6004 ++vcol; |
| 7 | 6005 /* When "tocol" is halfway a character, set it to the end of |
| 6006 * the character, otherwise highlighting won't stop. */ | |
| 6007 if (tocol == vcol) | |
| 6008 ++tocol; | |
| 6009 #ifdef FEAT_RIGHTLEFT | |
| 6010 if (wp->w_p_rl) | |
| 6011 { | |
| 6012 /* now it's time to backup one cell */ | |
| 6013 --off; | |
| 6014 --col; | |
| 6015 } | |
| 6016 #endif | |
| 6017 } | |
| 6018 #ifdef FEAT_RIGHTLEFT | |
| 6019 if (wp->w_p_rl) | |
| 6020 { | |
| 6021 --off; | |
| 6022 --col; | |
| 6023 } | |
| 6024 else | |
| 6025 #endif | |
| 6026 { | |
| 6027 ++off; | |
| 6028 ++col; | |
| 6029 } | |
| 6030 } | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6031 #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
|
6032 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
|
6033 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6034 --n_skip; |
|
2332
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6035 ++vcol_off; |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6036 if (n_extra > 0) |
|
b13079093ae1
Make 'cursorcolumn' work together with the conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2314
diff
changeset
|
6037 vcol_off += n_extra; |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6038 if (wp->w_p_wrap) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6039 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6040 /* |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6041 * Special voodoo required if 'wrap' is on. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6042 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6043 * 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
|
6044 * 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
|
6045 * 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
|
6046 * 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
|
6047 * |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6048 * 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
|
6049 * 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
|
6050 * 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
|
6051 * of bad columns we have advanced. |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6052 */ |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6053 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6054 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6055 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6056 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6057 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6058 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6059 col -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6060 boguscols -= n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6061 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6062 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6063 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6064 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6065 col += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6066 boguscols += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6067 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6068 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6069 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6070 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6071 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6072 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6073 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
|
6074 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6075 /* Need to fill two screen columns. */ |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6076 # ifdef FEAT_RIGHTLEFT |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6077 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6078 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6079 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6080 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6081 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6082 else |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6083 # endif |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6084 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6085 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6086 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6087 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6088 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6089 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6090 # ifdef FEAT_RIGHTLEFT |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6091 if (wp->w_p_rl) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6092 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6093 --boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6094 --col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6095 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6096 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6097 # endif |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6098 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6099 ++boguscols; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6100 ++col; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6101 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6102 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6103 else |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6104 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6105 if (n_extra > 0) |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6106 { |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6107 vcol += n_extra; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6108 n_extra = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6109 n_attr = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6110 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6111 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6112 |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6113 } |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6114 #endif /* FEAT_CONCEAL */ |
| 7 | 6115 else |
| 6116 --n_skip; | |
| 6117 | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
6118 /* 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
|
6119 * column. */ |
| 1849 | 6120 if (draw_state > WL_NR |
| 7 | 6121 #ifdef FEAT_DIFF |
| 6122 && filler_todo <= 0 | |
| 6123 #endif | |
| 6124 ) | |
| 6125 ++vcol; | |
| 6126 | |
| 743 | 6127 #ifdef FEAT_SYN_HL |
| 6128 if (vcol_save_attr >= 0) | |
| 6129 char_attr = vcol_save_attr; | |
| 6130 #endif | |
| 6131 | |
| 7 | 6132 /* restore attributes after "predeces" in 'listchars' */ |
| 6133 if (draw_state > WL_NR && n_attr3 > 0 && --n_attr3 == 0) | |
| 6134 char_attr = saved_attr3; | |
| 6135 | |
| 6136 /* restore attributes after last 'listchars' or 'number' char */ | |
| 6137 if (n_attr > 0 && draw_state == WL_LINE && --n_attr == 0) | |
| 6138 char_attr = saved_attr2; | |
| 6139 | |
| 6140 /* | |
| 6141 * At end of screen line and there is more to come: Display the line | |
| 1378 | 6142 * so far. If there is no more to display it is caught above. |
| 7 | 6143 */ |
| 6144 if (( | |
| 6145 #ifdef FEAT_RIGHTLEFT | |
| 6146 wp->w_p_rl ? (col < 0) : | |
| 6147 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6148 (col >= wp->w_width)) |
| 7 | 6149 && (*ptr != NUL |
| 6150 #ifdef FEAT_DIFF | |
| 6151 || filler_todo > 0 | |
| 6152 #endif | |
| 2724 | 6153 || (wp->w_p_list && lcs_eol != NUL && p_extra != at_end_str) |
| 7 | 6154 || (n_extra != 0 && (c_extra != NUL || *p_extra != NUL))) |
| 6155 ) | |
| 6156 { | |
|
2250
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6157 #ifdef FEAT_CONCEAL |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6158 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
|
6159 (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
|
6160 boguscols = 0; |
|
1bac28a53fae
Add the conceal patch from Vince Negri.
Bram Moolenaar <bram@vim.org>
parents:
2237
diff
changeset
|
6161 #else |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
6162 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
|
6163 (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
|
6164 #endif |
| 7 | 6165 ++row; |
| 6166 ++screen_row; | |
| 6167 | |
| 6168 /* When not wrapping and finished diff lines, or when displayed | |
| 6169 * '$' and highlighting until last column, break here. */ | |
| 6170 if ((!wp->w_p_wrap | |
| 6171 #ifdef FEAT_DIFF | |
| 6172 && filler_todo <= 0 | |
| 6173 #endif | |
| 6174 ) || lcs_eol_one == -1) | |
| 6175 break; | |
| 6176 | |
| 6177 /* When the window is too narrow draw all "@" lines. */ | |
| 6178 if (draw_state != WL_LINE | |
| 6179 #ifdef FEAT_DIFF | |
| 6180 && filler_todo <= 0 | |
| 6181 #endif | |
| 6182 ) | |
| 6183 { | |
|
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
16054
diff
changeset
|
6184 win_draw_end(wp, '@', ' ', TRUE, row, wp->w_height, HLF_AT); |
| 7 | 6185 draw_vsep_win(wp, row); |
| 6186 row = endrow; | |
| 6187 } | |
| 6188 | |
| 6189 /* When line got too long for screen break here. */ | |
| 6190 if (row == endrow) | |
| 6191 { | |
| 6192 ++row; | |
| 6193 break; | |
| 6194 } | |
| 6195 | |
| 6196 if (screen_cur_row == screen_row - 1 | |
| 6197 #ifdef FEAT_DIFF | |
| 6198 && filler_todo <= 0 | |
| 6199 #endif | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6200 && wp->w_width == Columns) |
| 7 | 6201 { |
| 6202 /* Remember that the line wraps, used for modeless copy. */ | |
| 6203 LineWraps[screen_row - 1] = TRUE; | |
| 6204 | |
| 6205 /* | |
| 6206 * Special trick to make copy/paste of wrapped lines work with | |
| 6207 * xterm/screen: write an extra character beyond the end of | |
| 6208 * the line. This will work with all terminal types | |
| 6209 * (regardless of the xn,am settings). | |
| 6210 * Only do this on a fast tty. | |
| 6211 * Only do this if the cursor is on the current line | |
| 6212 * (something has been written in it). | |
| 6213 * Don't do this for the GUI. | |
| 6214 * Don't do this for double-width characters. | |
| 6215 * Don't do this for a window not at the right screen border. | |
| 6216 */ | |
| 6217 if (p_tf | |
| 6218 #ifdef FEAT_GUI | |
| 6219 && !gui.in_use | |
| 6220 #endif | |
| 6221 && !(has_mbyte | |
| 1378 | 6222 && ((*mb_off2cells)(LineOffset[screen_row], |
| 6223 LineOffset[screen_row] + screen_Columns) | |
| 6224 == 2 | |
| 7 | 6225 || (*mb_off2cells)(LineOffset[screen_row - 1] |
| 1378 | 6226 + (int)Columns - 2, |
| 6227 LineOffset[screen_row] + screen_Columns) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6228 == 2))) |
| 7 | 6229 { |
| 6230 /* First make sure we are at the end of the screen line, | |
| 6231 * then output the same character again to let the | |
| 6232 * terminal know about the wrap. If the terminal doesn't | |
| 6233 * 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
|
6234 if (screen_cur_col != wp->w_width) |
| 7 | 6235 screen_char(LineOffset[screen_row - 1] |
| 6236 + (unsigned)Columns - 1, | |
| 6237 screen_row - 1, (int)(Columns - 1)); | |
| 6238 | |
| 6239 /* When there is a multi-byte character, just output a | |
| 6240 * space to keep it simple. */ | |
| 148 | 6241 if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[ |
| 6242 screen_row - 1] + (Columns - 1)]) > 1) | |
| 7 | 6243 out_char(' '); |
| 6244 else | |
| 6245 out_char(ScreenLines[LineOffset[screen_row - 1] | |
| 6246 + (Columns - 1)]); | |
| 6247 /* force a redraw of the first char on the next line */ | |
| 6248 ScreenAttrs[LineOffset[screen_row]] = (sattr_T)-1; | |
| 6249 screen_start(); /* don't know where cursor is now */ | |
| 6250 } | |
| 6251 } | |
| 6252 | |
| 6253 col = 0; | |
| 6254 off = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6255 #ifdef FEAT_RIGHTLEFT | |
| 6256 if (wp->w_p_rl) | |
| 6257 { | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
6258 col = wp->w_width - 1; /* col is not used if breaking! */ |
| 7 | 6259 off += col; |
| 6260 } | |
| 6261 #endif | |
| 6262 | |
| 6263 /* reset the drawing state for the start of a wrapped line */ | |
| 6264 draw_state = WL_START; | |
| 6265 saved_n_extra = n_extra; | |
| 6266 saved_p_extra = p_extra; | |
| 6267 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
|
6268 saved_c_final = c_final; |
| 7 | 6269 saved_char_attr = char_attr; |
| 6270 n_extra = 0; | |
| 6271 lcs_prec_todo = lcs_prec; | |
| 6272 #ifdef FEAT_LINEBREAK | |
| 6273 # ifdef FEAT_DIFF | |
| 6274 if (filler_todo <= 0) | |
| 6275 # endif | |
| 6276 need_showbreak = TRUE; | |
| 6277 #endif | |
| 6278 #ifdef FEAT_DIFF | |
| 6279 --filler_todo; | |
| 6280 /* When the filler lines are actually below the last line of the | |
| 6281 * file, don't draw the line itself, break here. */ | |
| 6282 if (filler_todo == 0 && wp->w_botfill) | |
| 6283 break; | |
| 6284 #endif | |
| 6285 } | |
| 6286 | |
| 6287 } /* for every character in the line */ | |
| 6288 | |
| 743 | 6289 #ifdef FEAT_SPELL |
| 386 | 6290 /* After an empty line check first word for capital. */ |
| 6291 if (*skipwhite(line) == NUL) | |
| 6292 { | |
| 6293 capcol_lnum = lnum + 1; | |
| 6294 cap_col = 0; | |
| 6295 } | |
| 6296 #endif | |
|
15138
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6297 #ifdef FEAT_TEXT_PROP |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6298 vim_free(text_props); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6299 vim_free(text_prop_idxs); |
|
9df130fd5e0d
patch 8.1.0579: cannot attach properties to text
Bram Moolenaar <Bram@vim.org>
parents:
15034
diff
changeset
|
6300 #endif |
| 386 | 6301 |
|
10690
206ab11fa76e
patch 8.0.0235: memory leak in diff mode
Christian Brabandt <cb@256bit.org>
parents:
10538
diff
changeset
|
6302 vim_free(p_extra_free); |
| 7 | 6303 return row; |
| 6304 } | |
| 6305 | |
| 714 | 6306 /* |
| 6307 * 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
|
6308 * Only to be used when ScreenLinesUC[off_from] != 0. |
| 714 | 6309 */ |
| 6310 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6311 comp_char_differs(int off_from, int off_to) |
| 714 | 6312 { |
| 6313 int i; | |
| 6314 | |
| 6315 for (i = 0; i < Screen_mco; ++i) | |
| 6316 { | |
| 6317 if (ScreenLinesC[i][off_from] != ScreenLinesC[i][off_to]) | |
| 6318 return TRUE; | |
| 6319 if (ScreenLinesC[i][off_from] == 0) | |
| 6320 break; | |
| 6321 } | |
| 6322 return FALSE; | |
| 6323 } | |
| 6324 | |
| 7 | 6325 /* |
| 6326 * Check whether the given character needs redrawing: | |
| 6327 * - the (first byte of the) character is different | |
| 6328 * - the attributes are different | |
| 6329 * - the character is multi-byte and the next byte is different | |
| 1616 | 6330 * - the character is two cells wide and the second cell differs. |
| 7 | 6331 */ |
| 6332 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6333 char_needs_redraw(int off_from, int off_to, int cols) |
| 7 | 6334 { |
| 6335 if (cols > 0 | |
| 6336 && ((ScreenLines[off_from] != ScreenLines[off_to] | |
| 6337 || ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6338 || (enc_dbcs != 0 | |
| 6339 && MB_BYTE2LEN(ScreenLines[off_from]) > 1 | |
| 6340 && (enc_dbcs == DBCS_JPNU && ScreenLines[off_from] == 0x8e | |
| 6341 ? ScreenLines2[off_from] != ScreenLines2[off_to] | |
| 6342 : (cols > 1 && ScreenLines[off_from + 1] | |
| 6343 != ScreenLines[off_to + 1]))) | |
| 6344 || (enc_utf8 | |
| 6345 && (ScreenLinesUC[off_from] != ScreenLinesUC[off_to] | |
| 6346 || (ScreenLinesUC[off_from] != 0 | |
| 1616 | 6347 && comp_char_differs(off_from, off_to)) |
| 3759 | 6348 || ((*mb_off2cells)(off_from, off_from + cols) > 1 |
| 6349 && ScreenLines[off_from + 1] | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6350 != ScreenLines[off_to + 1]))))) |
| 7 | 6351 return TRUE; |
| 6352 return FALSE; | |
| 6353 } | |
| 6354 | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6355 #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
|
6356 /* |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6357 * 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
|
6358 */ |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6359 int |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6360 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
|
6361 { |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6362 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
|
6363 } |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6364 #endif |
|
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6365 |
| 7 | 6366 /* |
| 6367 * Move one "cooked" screen line to the screen, but only the characters that | |
| 6368 * have actually changed. Handle insert/delete character. | |
| 6369 * "coloff" gives the first column on the screen for this line. | |
| 6370 * "endcol" gives the columns where valid characters are. | |
| 6371 * "clear_width" is the width of the window. It's > 0 if the rest of the line | |
| 6372 * 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
|
6373 * "flags" can have bits: |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6374 * SLF_POPUP popup window |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6375 * SLF_RIGHTLEFT rightleft window: |
| 7 | 6376 * When TRUE and "clear_width" > 0, clear columns 0 to "endcol" |
| 6377 * When FALSE and "clear_width" > 0, clear columns "endcol" to "clear_width" | |
| 6378 */ | |
|
11670
3b2afa2b77b3
patch 8.0.0718: output of job in terminal is not displayed
Christian Brabandt <cb@256bit.org>
parents:
11657
diff
changeset
|
6379 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6380 screen_line( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6381 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6382 int coloff, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6383 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
|
6384 int clear_width, |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6385 int flags UNUSED) |
| 7 | 6386 { |
| 6387 unsigned off_from; | |
| 6388 unsigned off_to; | |
| 1378 | 6389 unsigned max_off_from; |
| 6390 unsigned max_off_to; | |
| 7 | 6391 int col = 0; |
| 6392 int hl; | |
| 6393 int force = FALSE; /* force update rest of the line */ | |
| 6394 int redraw_this /* bool: does character need redraw? */ | |
| 6395 #ifdef FEAT_GUI | |
| 6396 = TRUE /* For GUI when while-loop empty */ | |
| 6397 #endif | |
| 6398 ; | |
| 6399 int redraw_next; /* redraw_this for next character */ | |
| 6400 int clear_next = FALSE; | |
| 6401 int char_cells; /* 1: normal char */ | |
| 6402 /* 2: occupies two display cells */ | |
| 6403 # define CHAR_CELLS char_cells | |
| 6404 | |
| 3413 | 6405 /* Check for illegal row and col, just in case. */ |
| 6406 if (row >= Rows) | |
| 6407 row = Rows - 1; | |
| 6408 if (endcol > Columns) | |
| 6409 endcol = Columns; | |
| 6410 | |
| 7 | 6411 # ifdef FEAT_CLIPBOARD |
| 6412 clip_may_clear_selection(row, row); | |
| 6413 # endif | |
| 6414 | |
| 6415 off_from = (unsigned)(current_ScreenLine - ScreenLines); | |
| 6416 off_to = LineOffset[row] + coloff; | |
| 1378 | 6417 max_off_from = off_from + screen_Columns; |
| 6418 max_off_to = LineOffset[row] + screen_Columns; | |
| 7 | 6419 |
| 6420 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6421 if (flags & SLF_RIGHTLEFT) |
| 7 | 6422 { |
| 6423 /* Clear rest first, because it's left of the text. */ | |
| 6424 if (clear_width > 0) | |
| 6425 { | |
| 6426 while (col <= endcol && ScreenLines[off_to] == ' ' | |
| 6427 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6428 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6429 { |
| 6430 ++off_to; | |
| 6431 ++col; | |
| 6432 } | |
| 6433 if (col <= endcol) | |
| 6434 screen_fill(row, row + 1, col + coloff, | |
| 6435 endcol + coloff + 1, ' ', ' ', 0); | |
| 6436 } | |
| 6437 col = endcol + 1; | |
| 6438 off_to = LineOffset[row] + col + coloff; | |
| 6439 off_from += col; | |
| 6440 endcol = (clear_width > 0 ? clear_width : -clear_width); | |
| 6441 } | |
| 6442 #endif /* FEAT_RIGHTLEFT */ | |
| 6443 | |
| 6444 redraw_next = char_needs_redraw(off_from, off_to, endcol - col); | |
| 6445 | |
| 6446 while (col < endcol) | |
| 6447 { | |
| 6448 if (has_mbyte && (col + 1 < endcol)) | |
| 1378 | 6449 char_cells = (*mb_off2cells)(off_from, max_off_from); |
| 7 | 6450 else |
| 6451 char_cells = 1; | |
| 6452 | |
| 6453 redraw_this = redraw_next; | |
| 6454 redraw_next = force || char_needs_redraw(off_from + CHAR_CELLS, | |
| 6455 off_to + CHAR_CELLS, endcol - col - CHAR_CELLS); | |
| 6456 | |
| 6457 #ifdef FEAT_GUI | |
| 6458 /* If the next character was bold, then redraw the current character to | |
| 6459 * remove any pixels that might have spilt over into us. This only | |
| 6460 * happens in the GUI. | |
| 6461 */ | |
| 6462 if (redraw_next && gui.in_use) | |
| 6463 { | |
| 6464 hl = ScreenAttrs[off_to + CHAR_CELLS]; | |
| 743 | 6465 if (hl > HL_ALL) |
| 6466 hl = syn_attr2attr(hl); | |
| 6467 if (hl & HL_BOLD) | |
| 7 | 6468 redraw_this = TRUE; |
| 6469 } | |
| 6470 #endif | |
| 6471 | |
| 6472 if (redraw_this) | |
| 6473 { | |
| 6474 /* | |
| 6475 * Special handling when 'xs' termcap flag set (hpterm): | |
| 6476 * Attributes for characters are stored at the position where the | |
| 6477 * cursor is when writing the highlighting code. The | |
| 6478 * start-highlighting code must be written with the cursor on the | |
| 6479 * first highlighted character. The stop-highlighting code must | |
| 6480 * be written with the cursor just after the last highlighted | |
| 6481 * character. | |
|
15034
6e4e0d43b20b
patch 8.1.0528: various typos in comments
Bram Moolenaar <Bram@vim.org>
parents:
14877
diff
changeset
|
6482 * Overwriting a character doesn't remove its highlighting. Need |
| 7 | 6483 * to clear the rest of the line, and force redrawing it |
| 6484 * completely. | |
| 6485 */ | |
| 6486 if ( p_wiv | |
| 6487 && !force | |
| 6488 #ifdef FEAT_GUI | |
| 6489 && !gui.in_use | |
| 6490 #endif | |
| 6491 && ScreenAttrs[off_to] != 0 | |
| 6492 && ScreenAttrs[off_from] != ScreenAttrs[off_to]) | |
| 6493 { | |
| 6494 /* | |
| 6495 * Need to remove highlighting attributes here. | |
| 6496 */ | |
| 6497 windgoto(row, col + coloff); | |
| 6498 out_str(T_CE); /* clear rest of this screen line */ | |
| 6499 screen_start(); /* don't know where cursor is now */ | |
| 6500 force = TRUE; /* force redraw of rest of the line */ | |
| 6501 redraw_next = TRUE; /* or else next char would miss out */ | |
| 6502 | |
| 6503 /* | |
| 6504 * If the previous character was highlighted, need to stop | |
| 6505 * highlighting at this character. | |
| 6506 */ | |
| 6507 if (col + coloff > 0 && ScreenAttrs[off_to - 1] != 0) | |
| 6508 { | |
| 6509 screen_attr = ScreenAttrs[off_to - 1]; | |
| 6510 term_windgoto(row, col + coloff); | |
| 6511 screen_stop_highlight(); | |
| 6512 } | |
| 6513 else | |
| 6514 screen_attr = 0; /* highlighting has stopped */ | |
| 6515 } | |
| 6516 if (enc_dbcs != 0) | |
| 6517 { | |
| 6518 /* Check if overwriting a double-byte with a single-byte or | |
| 6519 * the other way around requires another character to be | |
| 6520 * redrawn. For UTF-8 this isn't needed, because comparing | |
| 6521 * ScreenLinesUC[] is sufficient. */ | |
| 6522 if (char_cells == 1 | |
| 6523 && col + 1 < endcol | |
| 1378 | 6524 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6525 { |
| 6526 /* Writing a single-cell character over a double-cell | |
| 6527 * character: need to redraw the next cell. */ | |
| 6528 ScreenLines[off_to + 1] = 0; | |
| 6529 redraw_next = TRUE; | |
| 6530 } | |
| 6531 else if (char_cells == 2 | |
| 6532 && col + 2 < endcol | |
| 1378 | 6533 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6534 && (*mb_off2cells)(off_to + 1, max_off_to) > 1) | |
| 7 | 6535 { |
| 6536 /* Writing the second half of a double-cell character over | |
| 6537 * a double-cell character: need to redraw the second | |
| 6538 * cell. */ | |
| 6539 ScreenLines[off_to + 2] = 0; | |
| 6540 redraw_next = TRUE; | |
| 6541 } | |
| 6542 | |
| 6543 if (enc_dbcs == DBCS_JPNU) | |
| 6544 ScreenLines2[off_to] = ScreenLines2[off_from]; | |
| 6545 } | |
| 6546 /* When writing a single-width character over a double-width | |
| 6547 * character and at the end of the redrawn text, need to clear out | |
| 6548 * the right halve of the old character. | |
| 6549 * Also required when writing the right halve of a double-width | |
| 6550 * char over the left halve of an existing one. */ | |
| 6551 if (has_mbyte && col + char_cells == endcol | |
| 6552 && ((char_cells == 1 | |
| 1378 | 6553 && (*mb_off2cells)(off_to, max_off_to) > 1) |
| 7 | 6554 || (char_cells == 2 |
| 1378 | 6555 && (*mb_off2cells)(off_to, max_off_to) == 1 |
| 6556 && (*mb_off2cells)(off_to + 1, max_off_to) > 1))) | |
| 7 | 6557 clear_next = TRUE; |
| 6558 | |
| 6559 ScreenLines[off_to] = ScreenLines[off_from]; | |
| 6560 if (enc_utf8) | |
| 6561 { | |
| 6562 ScreenLinesUC[off_to] = ScreenLinesUC[off_from]; | |
| 6563 if (ScreenLinesUC[off_from] != 0) | |
| 6564 { | |
| 714 | 6565 int i; |
| 6566 | |
| 6567 for (i = 0; i < Screen_mco; ++i) | |
| 6568 ScreenLinesC[i][off_to] = ScreenLinesC[i][off_from]; | |
| 7 | 6569 } |
| 6570 } | |
| 6571 if (char_cells == 2) | |
| 6572 ScreenLines[off_to + 1] = ScreenLines[off_from + 1]; | |
| 6573 | |
| 6574 #if defined(FEAT_GUI) || defined(UNIX) | |
| 1843 | 6575 /* The bold trick makes a single column of pixels appear in the |
| 6576 * next character. When a bold character is removed, the next | |
| 7 | 6577 * character should be redrawn too. This happens for our own GUI |
| 6578 * and for some xterms. */ | |
| 6579 if ( | |
| 6580 # ifdef FEAT_GUI | |
| 6581 gui.in_use | |
| 6582 # endif | |
| 6583 # if defined(FEAT_GUI) && defined(UNIX) | |
| 6584 || | |
| 6585 # endif | |
| 6586 # ifdef UNIX | |
| 6587 term_is_xterm | |
| 6588 # endif | |
| 6589 ) | |
| 6590 { | |
| 6591 hl = ScreenAttrs[off_to]; | |
| 743 | 6592 if (hl > HL_ALL) |
| 6593 hl = syn_attr2attr(hl); | |
| 6594 if (hl & HL_BOLD) | |
| 7 | 6595 redraw_next = TRUE; |
| 6596 } | |
| 6597 #endif | |
| 6598 ScreenAttrs[off_to] = ScreenAttrs[off_from]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6599 |
| 819 | 6600 /* For simplicity set the attributes of second half of a |
| 6601 * double-wide character equal to the first half. */ | |
| 6602 if (char_cells == 2) | |
| 6603 ScreenAttrs[off_to + 1] = ScreenAttrs[off_from]; | |
| 6604 | |
| 7 | 6605 if (enc_dbcs != 0 && char_cells == 2) |
| 6606 screen_char_2(off_to, row, col + coloff); | |
| 6607 else | |
| 6608 screen_char(off_to, row, col + coloff); | |
| 6609 } | |
| 6610 else if ( p_wiv | |
| 6611 #ifdef FEAT_GUI | |
| 6612 && !gui.in_use | |
| 6613 #endif | |
| 6614 && col + coloff > 0) | |
| 6615 { | |
| 6616 if (ScreenAttrs[off_to] == ScreenAttrs[off_to - 1]) | |
| 6617 { | |
| 6618 /* | |
| 6619 * Don't output stop-highlight when moving the cursor, it will | |
| 6620 * stop the highlighting when it should continue. | |
| 6621 */ | |
| 6622 screen_attr = 0; | |
| 6623 } | |
| 6624 else if (screen_attr != 0) | |
| 6625 screen_stop_highlight(); | |
| 6626 } | |
| 6627 | |
| 6628 off_to += CHAR_CELLS; | |
| 6629 off_from += CHAR_CELLS; | |
| 6630 col += CHAR_CELLS; | |
| 6631 } | |
| 6632 | |
| 6633 if (clear_next) | |
| 6634 { | |
| 6635 /* Clear the second half of a double-wide character of which the left | |
| 6636 * half was overwritten with a single-wide character. */ | |
| 6637 ScreenLines[off_to] = ' '; | |
| 6638 if (enc_utf8) | |
| 6639 ScreenLinesUC[off_to] = 0; | |
| 6640 screen_char(off_to, row, col + coloff); | |
| 6641 } | |
| 6642 | |
| 6643 if (clear_width > 0 | |
| 6644 #ifdef FEAT_RIGHTLEFT | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6645 && !(flags & SLF_RIGHTLEFT) |
| 7 | 6646 #endif |
| 6647 ) | |
| 6648 { | |
| 6649 #ifdef FEAT_GUI | |
| 6650 int startCol = col; | |
| 6651 #endif | |
| 6652 | |
| 6653 /* blank out the rest of the line */ | |
| 6654 while (col < clear_width && ScreenLines[off_to] == ' ' | |
| 6655 && ScreenAttrs[off_to] == 0 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6656 && (!enc_utf8 || ScreenLinesUC[off_to] == 0)) |
| 7 | 6657 { |
| 6658 ++off_to; | |
| 6659 ++col; | |
| 6660 } | |
| 6661 if (col < clear_width) | |
| 6662 { | |
| 6663 #ifdef FEAT_GUI | |
| 6664 /* | |
| 6665 * In the GUI, clearing the rest of the line may leave pixels | |
| 6666 * behind if the first character cleared was bold. Some bold | |
| 6667 * fonts spill over the left. In this case we redraw the previous | |
| 6668 * character too. If we didn't skip any blanks above, then we | |
| 6669 * only redraw if the character wasn't already redrawn anyway. | |
| 6670 */ | |
| 996 | 6671 if (gui.in_use && (col > startCol || !redraw_this)) |
| 7 | 6672 { |
| 6673 hl = ScreenAttrs[off_to]; | |
| 6674 if (hl > HL_ALL || (hl & HL_BOLD)) | |
| 996 | 6675 { |
| 6676 int prev_cells = 1; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
6677 |
| 996 | 6678 if (enc_utf8) |
| 6679 /* for utf-8, ScreenLines[char_offset + 1] == 0 means | |
| 6680 * that its width is 2. */ | |
| 6681 prev_cells = ScreenLines[off_to - 1] == 0 ? 2 : 1; | |
| 6682 else if (enc_dbcs != 0) | |
| 6683 { | |
| 6684 /* find previous character by counting from first | |
| 6685 * column and get its width. */ | |
| 6686 unsigned off = LineOffset[row]; | |
| 1378 | 6687 unsigned max_off = LineOffset[row] + screen_Columns; |
| 996 | 6688 |
| 6689 while (off < off_to) | |
| 6690 { | |
| 1378 | 6691 prev_cells = (*mb_off2cells)(off, max_off); |
| 996 | 6692 off += prev_cells; |
| 6693 } | |
| 6694 } | |
| 6695 | |
| 6696 if (enc_dbcs != 0 && prev_cells > 1) | |
| 6697 screen_char_2(off_to - prev_cells, row, | |
| 6698 col + coloff - prev_cells); | |
| 6699 else | |
| 6700 screen_char(off_to - prev_cells, row, | |
| 6701 col + coloff - prev_cells); | |
| 6702 } | |
| 7 | 6703 } |
| 6704 #endif | |
| 6705 screen_fill(row, row + 1, col + coloff, clear_width + coloff, | |
| 6706 ' ', ' ', 0); | |
| 6707 off_to += clear_width - col; | |
| 6708 col = clear_width; | |
| 6709 } | |
| 6710 } | |
| 6711 | |
|
16778
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6712 if (clear_width > 0 |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6713 #ifdef FEAT_TEXT_PROP |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6714 && !(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
|
6715 #endif |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6716 ) |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6717 { |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6718 // 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
|
6719 // right of the window contents. |
|
eda4d65f232c
patch 8.1.1391: no popup window support
Bram Moolenaar <Bram@vim.org>
parents:
16768
diff
changeset
|
6720 if (coloff + col < Columns) |
| 7 | 6721 { |
| 6722 int c; | |
| 6723 | |
| 6724 c = fillchar_vsep(&hl); | |
| 6477 | 6725 if (ScreenLines[off_to] != (schar_T)c |
| 714 | 6726 || (enc_utf8 && (int)ScreenLinesUC[off_to] |
| 6727 != (c >= 0x80 ? c : 0)) | |
| 7 | 6728 || ScreenAttrs[off_to] != hl) |
| 6729 { | |
| 6730 ScreenLines[off_to] = c; | |
| 6731 ScreenAttrs[off_to] = hl; | |
| 6732 if (enc_utf8) | |
| 6733 { | |
| 6734 if (c >= 0x80) | |
| 6735 { | |
| 6736 ScreenLinesUC[off_to] = c; | |
| 714 | 6737 ScreenLinesC[0][off_to] = 0; |
| 7 | 6738 } |
| 6739 else | |
| 6740 ScreenLinesUC[off_to] = 0; | |
| 6741 } | |
| 6742 screen_char(off_to, row, col + coloff); | |
| 6743 } | |
| 6744 } | |
| 6745 else | |
| 6746 LineWraps[row] = FALSE; | |
| 6747 } | |
| 6748 } | |
| 6749 | |
| 474 | 6750 #if defined(FEAT_RIGHTLEFT) || defined(PROTO) |
| 7 | 6751 /* |
| 474 | 6752 * Mirror text "str" for right-left displaying. |
| 6753 * Only works for single-byte characters (e.g., numbers). | |
| 7 | 6754 */ |
| 474 | 6755 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6756 rl_mirror(char_u *str) |
| 7 | 6757 { |
| 6758 char_u *p1, *p2; | |
| 6759 int t; | |
| 6760 | |
| 6761 for (p1 = str, p2 = str + STRLEN(str) - 1; p1 < p2; ++p1, --p2) | |
| 6762 { | |
| 6763 t = *p1; | |
| 6764 *p1 = *p2; | |
| 6765 *p2 = t; | |
| 6766 } | |
| 6767 } | |
| 6768 #endif | |
| 6769 | |
| 6770 /* | |
| 6771 * mark all status lines for redraw; used after first :cd | |
| 6772 */ | |
| 6773 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6774 status_redraw_all(void) |
| 7 | 6775 { |
| 6776 win_T *wp; | |
| 6777 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6778 FOR_ALL_WINDOWS(wp) |
| 7 | 6779 if (wp->w_status_height) |
| 6780 { | |
| 6781 wp->w_redr_status = TRUE; | |
| 6782 redraw_later(VALID); | |
| 6783 } | |
| 6784 } | |
| 6785 | |
| 6786 /* | |
| 6787 * mark all status lines of the current buffer for redraw | |
| 6788 */ | |
| 6789 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6790 status_redraw_curbuf(void) |
| 7 | 6791 { |
| 6792 win_T *wp; | |
| 6793 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6794 FOR_ALL_WINDOWS(wp) |
| 7 | 6795 if (wp->w_status_height != 0 && wp->w_buffer == curbuf) |
| 6796 { | |
| 6797 wp->w_redr_status = TRUE; | |
| 6798 redraw_later(VALID); | |
| 6799 } | |
| 6800 } | |
| 6801 | |
| 6802 /* | |
| 6803 * Redraw all status lines that need to be redrawn. | |
| 6804 */ | |
| 6805 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6806 redraw_statuslines(void) |
| 7 | 6807 { |
| 6808 win_T *wp; | |
| 6809 | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
6810 FOR_ALL_WINDOWS(wp) |
| 7 | 6811 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
|
6812 win_redr_status(wp, FALSE); |
| 673 | 6813 if (redraw_tabline) |
| 677 | 6814 draw_tabline(); |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6815 |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6816 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6817 // Display popup windows on top of the status lines. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6818 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
6819 #endif |
| 7 | 6820 } |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6821 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
6822 #if defined(FEAT_WILDMENU) || defined(PROTO) |
| 7 | 6823 /* |
| 6824 * Redraw all status lines at the bottom of frame "frp". | |
| 6825 */ | |
| 6826 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6827 win_redraw_last_status(frame_T *frp) |
| 7 | 6828 { |
| 6829 if (frp->fr_layout == FR_LEAF) | |
| 6830 frp->fr_win->w_redr_status = TRUE; | |
| 6831 else if (frp->fr_layout == FR_ROW) | |
| 6832 { | |
|
15227
95678f27a704
patch 8.1.0623: iterating through window frames is repeated
Bram Moolenaar <Bram@vim.org>
parents:
15138
diff
changeset
|
6833 FOR_ALL_FRAMES(frp, frp->fr_child) |
| 7 | 6834 win_redraw_last_status(frp); |
| 6835 } | |
| 6836 else /* frp->fr_layout == FR_COL */ | |
| 6837 { | |
| 6838 frp = frp->fr_child; | |
| 6839 while (frp->fr_next != NULL) | |
| 6840 frp = frp->fr_next; | |
| 6841 win_redraw_last_status(frp); | |
| 6842 } | |
| 6843 } | |
| 6844 #endif | |
| 6845 | |
| 6846 /* | |
| 6847 * Draw the verticap separator right of window "wp" starting with line "row". | |
| 6848 */ | |
| 6849 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6850 draw_vsep_win(win_T *wp, int row) |
| 7 | 6851 { |
| 6852 int hl; | |
| 6853 int c; | |
| 6854 | |
| 6855 if (wp->w_vsep_width) | |
| 6856 { | |
| 6857 /* draw the vertical separator right of this window */ | |
| 6858 c = fillchar_vsep(&hl); | |
| 6859 screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height, | |
| 6860 W_ENDCOL(wp), W_ENDCOL(wp) + 1, | |
| 6861 c, ' ', hl); | |
| 6862 } | |
| 6863 } | |
| 6864 | |
| 6865 #ifdef FEAT_WILDMENU | |
|
7805
0b6c37dd858d
commit https://github.com/vim/vim/commit/baaa7e9ec7398a813e21285c272fa99792642077
Christian Brabandt <cb@256bit.org>
parents:
7697
diff
changeset
|
6866 static int skip_status_match_char(expand_T *xp, char_u *s); |
| 7 | 6867 |
| 6868 /* | |
| 1378 | 6869 * Get the length of an item as it will be shown in the status line. |
| 7 | 6870 */ |
| 6871 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6872 status_match_len(expand_T *xp, char_u *s) |
| 7 | 6873 { |
| 6874 int len = 0; | |
| 6875 | |
| 6876 #ifdef FEAT_MENU | |
| 6877 int emenu = (xp->xp_context == EXPAND_MENUS | |
| 6878 || xp->xp_context == EXPAND_MENUNAMES); | |
| 6879 | |
| 6880 /* Check for menu separators - replace with '|'. */ | |
| 6881 if (emenu && menu_is_separator(s)) | |
| 6882 return 1; | |
| 6883 #endif | |
| 6884 | |
| 6885 while (*s != NUL) | |
| 6886 { | |
| 1685 | 6887 s += skip_status_match_char(xp, s); |
| 42 | 6888 len += ptr2cells(s); |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
6889 MB_PTR_ADV(s); |
| 7 | 6890 } |
| 6891 | |
| 6892 return len; | |
| 6893 } | |
| 6894 | |
| 6895 /* | |
| 1685 | 6896 * Return the number of characters that should be skipped in a status match. |
| 277 | 6897 * These are backslashes used for escaping. Do show backslashes in help tags. |
| 6898 */ | |
| 6899 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6900 skip_status_match_char(expand_T *xp, char_u *s) |
| 277 | 6901 { |
| 1685 | 6902 if ((rem_backslash(s) && xp->xp_context != EXPAND_HELP) |
| 277 | 6903 #ifdef FEAT_MENU |
| 6904 || ((xp->xp_context == EXPAND_MENUS | |
| 6905 || xp->xp_context == EXPAND_MENUNAMES) | |
| 6906 && (s[0] == '\t' || (s[0] == '\\' && s[1] != NUL))) | |
| 6907 #endif | |
| 1685 | 6908 ) |
| 6909 { | |
| 6910 #ifndef BACKSLASH_IN_FILENAME | |
| 6911 if (xp->xp_shell && csh_like_shell() && s[1] == '\\' && s[2] == '!') | |
| 6912 return 2; | |
| 6913 #endif | |
| 6914 return 1; | |
| 6915 } | |
| 6916 return 0; | |
| 277 | 6917 } |
| 6918 | |
| 6919 /* | |
| 7 | 6920 * Show wildchar matches in the status line. |
| 6921 * Show at least the "match" item. | |
| 6922 * We start at item 'first_match' in the list and show all matches that fit. | |
| 6923 * | |
| 6924 * If inversion is possible we use it. Else '=' characters are used. | |
| 6925 */ | |
| 6926 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6927 win_redr_status_matches( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6928 expand_T *xp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6929 int num_matches, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6930 char_u **matches, /* list of matches */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6931 int match, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
6932 int showtail) |
| 7 | 6933 { |
| 6934 #define L_MATCH(m) (showtail ? sm_gettail(matches[m]) : matches[m]) | |
| 6935 int row; | |
| 6936 char_u *buf; | |
| 6937 int len; | |
| 1378 | 6938 int clen; /* length in screen cells */ |
| 7 | 6939 int fillchar; |
| 6940 int attr; | |
| 6941 int i; | |
| 6942 int highlight = TRUE; | |
| 6943 char_u *selstart = NULL; | |
| 6944 int selstart_col = 0; | |
| 6945 char_u *selend = NULL; | |
| 6946 static int first_match = 0; | |
| 6947 int add_left = FALSE; | |
| 6948 char_u *s; | |
| 6949 #ifdef FEAT_MENU | |
| 6950 int emenu; | |
| 6951 #endif | |
| 6952 int l; | |
| 6953 | |
| 6954 if (matches == NULL) /* interrupted completion? */ | |
| 6955 return; | |
| 6956 | |
| 39 | 6957 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
|
6958 buf = alloc(Columns * MB_MAXBYTES + 1); |
| 39 | 6959 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
|
6960 buf = alloc(Columns + 1); |
| 7 | 6961 if (buf == NULL) |
| 6962 return; | |
| 6963 | |
| 6964 if (match == -1) /* don't show match but original text */ | |
| 6965 { | |
| 6966 match = 0; | |
| 6967 highlight = FALSE; | |
| 6968 } | |
| 6969 /* count 1 for the ending ">" */ | |
| 6970 clen = status_match_len(xp, L_MATCH(match)) + 3; | |
| 6971 if (match == 0) | |
| 6972 first_match = 0; | |
| 6973 else if (match < first_match) | |
| 6974 { | |
| 6975 /* jumping left, as far as we can go */ | |
| 6976 first_match = match; | |
| 6977 add_left = TRUE; | |
| 6978 } | |
| 6979 else | |
| 6980 { | |
| 6981 /* check if match fits on the screen */ | |
| 6982 for (i = first_match; i < match; ++i) | |
| 6983 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6984 if (first_match > 0) | |
| 6985 clen += 2; | |
| 6986 /* jumping right, put match at the left */ | |
| 6987 if ((long)clen > Columns) | |
| 6988 { | |
| 6989 first_match = match; | |
| 6990 /* if showing the last match, we can add some on the left */ | |
| 6991 clen = 2; | |
| 6992 for (i = match; i < num_matches; ++i) | |
| 6993 { | |
| 6994 clen += status_match_len(xp, L_MATCH(i)) + 2; | |
| 6995 if ((long)clen >= Columns) | |
| 6996 break; | |
| 6997 } | |
| 6998 if (i == num_matches) | |
| 6999 add_left = TRUE; | |
| 7000 } | |
| 7001 } | |
| 7002 if (add_left) | |
| 7003 while (first_match > 0) | |
| 7004 { | |
| 7005 clen += status_match_len(xp, L_MATCH(first_match - 1)) + 2; | |
| 7006 if ((long)clen >= Columns) | |
| 7007 break; | |
| 7008 --first_match; | |
| 7009 } | |
| 7010 | |
|
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
|
7011 fillchar = fillchar_status(&attr, curwin); |
| 7 | 7012 |
| 7013 if (first_match == 0) | |
| 7014 { | |
| 7015 *buf = NUL; | |
| 7016 len = 0; | |
| 7017 } | |
| 7018 else | |
| 7019 { | |
| 7020 STRCPY(buf, "< "); | |
| 7021 len = 2; | |
| 7022 } | |
| 7023 clen = len; | |
| 7024 | |
| 7025 i = first_match; | |
| 7026 while ((long)(clen + status_match_len(xp, L_MATCH(i)) + 2) < Columns) | |
| 7027 { | |
| 7028 if (i == match) | |
| 7029 { | |
| 7030 selstart = buf + len; | |
| 7031 selstart_col = clen; | |
| 7032 } | |
| 7033 | |
| 7034 s = L_MATCH(i); | |
| 7035 /* Check for menu separators - replace with '|' */ | |
| 7036 #ifdef FEAT_MENU | |
| 7037 emenu = (xp->xp_context == EXPAND_MENUS | |
| 7038 || xp->xp_context == EXPAND_MENUNAMES); | |
| 7039 if (emenu && menu_is_separator(s)) | |
| 7040 { | |
| 7041 STRCPY(buf + len, transchar('|')); | |
| 7042 l = (int)STRLEN(buf + len); | |
| 7043 len += l; | |
| 7044 clen += l; | |
| 7045 } | |
| 7046 else | |
| 7047 #endif | |
| 7048 for ( ; *s != NUL; ++s) | |
| 7049 { | |
| 1685 | 7050 s += skip_status_match_char(xp, s); |
| 7 | 7051 clen += ptr2cells(s); |
| 474 | 7052 if (has_mbyte && (l = (*mb_ptr2len)(s)) > 1) |
| 7 | 7053 { |
| 7054 STRNCPY(buf + len, s, l); | |
| 7055 s += l - 1; | |
| 7056 len += l; | |
| 7057 } | |
| 7058 else | |
| 7059 { | |
| 7060 STRCPY(buf + len, transchar_byte(*s)); | |
| 7061 len += (int)STRLEN(buf + len); | |
| 7062 } | |
| 7063 } | |
| 7064 if (i == match) | |
| 7065 selend = buf + len; | |
| 7066 | |
| 7067 *(buf + len++) = ' '; | |
| 7068 *(buf + len++) = ' '; | |
| 7069 clen += 2; | |
| 7070 if (++i == num_matches) | |
| 7071 break; | |
| 7072 } | |
| 7073 | |
| 7074 if (i != num_matches) | |
| 7075 { | |
| 7076 *(buf + len++) = '>'; | |
| 7077 ++clen; | |
| 7078 } | |
| 7079 | |
| 7080 buf[len] = NUL; | |
| 7081 | |
| 7082 row = cmdline_row - 1; | |
| 7083 if (row >= 0) | |
| 7084 { | |
| 7085 if (wild_menu_showing == 0) | |
| 7086 { | |
| 7087 if (msg_scrolled > 0) | |
| 7088 { | |
| 7089 /* Put the wildmenu just above the command line. If there is | |
| 7090 * no room, scroll the screen one line up. */ | |
| 7091 if (cmdline_row == Rows - 1) | |
| 7092 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
7093 screen_del_lines(0, 0, 1, (int)Rows, TRUE, 0, NULL); |
| 7 | 7094 ++msg_scrolled; |
| 7095 } | |
| 7096 else | |
| 7097 { | |
| 7098 ++cmdline_row; | |
| 7099 ++row; | |
| 7100 } | |
| 7101 wild_menu_showing = WM_SCROLLED; | |
| 7102 } | |
| 7103 else | |
| 7104 { | |
| 7105 /* Create status line if needed by setting 'laststatus' to 2. | |
| 7106 * Set 'winminheight' to zero to avoid that the window is | |
| 7107 * resized. */ | |
| 7108 if (lastwin->w_status_height == 0) | |
| 7109 { | |
| 7110 save_p_ls = p_ls; | |
| 7111 save_p_wmh = p_wmh; | |
| 7112 p_ls = 2; | |
| 7113 p_wmh = 0; | |
| 7114 last_status(FALSE); | |
| 7115 } | |
| 7116 wild_menu_showing = WM_SHOWN; | |
| 7117 } | |
| 7118 } | |
| 7119 | |
| 7120 screen_puts(buf, row, 0, attr); | |
| 7121 if (selstart != NULL && highlight) | |
| 7122 { | |
| 7123 *selend = NUL; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7124 screen_puts(selstart, row, selstart_col, HL_ATTR(HLF_WM)); |
| 7 | 7125 } |
| 7126 | |
| 7127 screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); | |
| 7128 } | |
| 7129 | |
| 7130 win_redraw_last_status(topframe); | |
| 7131 vim_free(buf); | |
| 7132 } | |
| 7133 #endif | |
| 7134 | |
| 7135 /* | |
| 7136 * Redraw the status line of window wp. | |
| 7137 * | |
| 7138 * 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
|
7139 * 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
|
7140 * displayed. |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7141 */ |
|
b5e43a048878
patch 8.1.0057: popup menu displayed wrong when using autocmd
Christian Brabandt <cb@256bit.org>
parents:
14004
diff
changeset
|
7142 static void |
|
14191
ec39f281e3e8
patch 8.1.0113: compiler warning for unused variable
Christian Brabandt <cb@256bit.org>
parents:
14175
diff
changeset
|
7143 win_redr_status(win_T *wp, int ignore_pum UNUSED) |
| 7 | 7144 { |
| 7145 int row; | |
| 7146 char_u *p; | |
| 7147 int len; | |
| 7148 int fillchar; | |
| 7149 int attr; | |
| 7150 int this_ru_col; | |
| 1910 | 7151 static int busy = FALSE; |
| 7152 | |
| 7153 /* It's possible to get here recursively when 'statusline' (indirectly) | |
| 7154 * invokes ":redrawstatus". Simply ignore the call then. */ | |
| 7155 if (busy) | |
| 7156 return; | |
| 7157 busy = TRUE; | |
| 7 | 7158 |
| 7159 wp->w_redr_status = FALSE; | |
| 7160 if (wp->w_status_height == 0) | |
| 7161 { | |
| 7162 /* no status line, can only be last window */ | |
| 7163 redraw_cmdline = TRUE; | |
| 7164 } | |
| 540 | 7165 else if (!redrawing() |
| 7166 #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
|
7167 // 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
|
7168 // 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
|
7169 || (!ignore_pum && pum_visible()) |
| 540 | 7170 #endif |
| 7171 ) | |
| 7 | 7172 { |
| 7173 /* Don't redraw right now, do it later. */ | |
| 7174 wp->w_redr_status = TRUE; | |
| 7175 } | |
| 7176 #ifdef FEAT_STL_OPT | |
| 40 | 7177 else if (*p_stl != NUL || *wp->w_p_stl != NUL) |
| 7 | 7178 { |
| 7179 /* redraw custom status line */ | |
| 1983 | 7180 redraw_custom_statusline(wp); |
| 7 | 7181 } |
| 7182 #endif | |
| 7183 else | |
| 7184 { | |
|
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
|
7185 fillchar = fillchar_status(&attr, wp); |
| 7 | 7186 |
| 685 | 7187 get_trans_bufname(wp->w_buffer); |
| 7 | 7188 p = NameBuff; |
| 7189 len = (int)STRLEN(p); | |
| 7190 | |
|
11834
0cfe4a07c2ad
patch 8.0.0797: finished job in terminal window is not handled
Christian Brabandt <cb@256bit.org>
parents:
11698
diff
changeset
|
7191 if (bt_help(wp->w_buffer) |
| 7 | 7192 #ifdef FEAT_QUICKFIX |
| 7193 || wp->w_p_pvw | |
| 7194 #endif | |
| 7195 || bufIsChanged(wp->w_buffer) | |
| 7196 || wp->w_buffer->b_p_ro) | |
| 7197 *(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
|
7198 if (bt_help(wp->w_buffer)) |
| 7 | 7199 { |
| 809 | 7200 STRCPY(p + len, _("[Help]")); |
| 7 | 7201 len += (int)STRLEN(p + len); |
| 7202 } | |
| 7203 #ifdef FEAT_QUICKFIX | |
| 7204 if (wp->w_p_pvw) | |
| 7205 { | |
| 7206 STRCPY(p + len, _("[Preview]")); | |
| 7207 len += (int)STRLEN(p + len); | |
| 7208 } | |
| 7209 #endif | |
|
11981
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7210 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
|
7211 #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
|
7212 && !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
|
7213 #endif |
|
cf36b424ea03
patch 8.0.0871: status line for a terminal window always has "[+]".
Christian Brabandt <cb@256bit.org>
parents:
11915
diff
changeset
|
7214 ) |
| 7 | 7215 { |
| 7216 STRCPY(p + len, "[+]"); | |
| 7217 len += 3; | |
| 7218 } | |
| 7219 if (wp->w_buffer->b_p_ro) | |
| 7220 { | |
|
4795
8360a59aa04b
updated for version 7.3.1144
Bram Moolenaar <bram@vim.org>
parents:
4736
diff
changeset
|
7221 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
|
7222 len += (int)STRLEN(p + len); |
| 7 | 7223 } |
| 7224 | |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7225 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
|
7226 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
|
7227 this_ru_col = (wp->w_width + 1) / 2; |
| 7 | 7228 if (this_ru_col <= 1) |
| 7229 { | |
| 7230 p = (char_u *)"<"; /* No room for file name! */ | |
| 7231 len = 1; | |
| 7232 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7233 else if (has_mbyte) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7234 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7235 int clen = 0, i; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7236 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7237 /* Count total number of display cells. */ |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7238 clen = mb_string2cells(p, -1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7239 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7240 /* Find first character that will fit. |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7241 * 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
|
7242 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
|
7243 i += (*mb_ptr2len)(p + i)) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7244 clen -= (*mb_ptr2cells)(p + i); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7245 len = clen; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7246 if (i > 0) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7247 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7248 p = p + i - 1; |
| 7 | 7249 *p = '<'; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7250 ++len; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7251 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7252 |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7253 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7254 else if (len > this_ru_col - 1) |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7255 { |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7256 p += len - (this_ru_col - 1); |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7257 *p = '<'; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7258 len = this_ru_col - 1; |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7259 } |
| 7 | 7260 |
| 7261 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
|
7262 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
|
7263 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
|
7264 this_ru_col + wp->w_wincol, fillchar, fillchar, attr); |
| 7 | 7265 |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7266 if (get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL) |
| 7 | 7267 && (int)(this_ru_col - len) > (int)(STRLEN(NameBuff) + 1)) |
| 7268 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
|
7269 - 1 + wp->w_wincol), attr); |
| 7 | 7270 |
| 7271 #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
|
7272 win_redr_ruler(wp, TRUE, ignore_pum); |
| 7 | 7273 #endif |
| 7274 } | |
| 7275 | |
| 7276 /* | |
| 7277 * May need to draw the character below the vertical separator. | |
| 7278 */ | |
| 7279 if (wp->w_vsep_width != 0 && wp->w_status_height != 0 && redrawing()) | |
| 7280 { | |
| 7281 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
|
7282 fillchar = fillchar_status(&attr, wp); |
| 7 | 7283 else |
| 7284 fillchar = fillchar_vsep(&attr); | |
| 7285 screen_putchar(fillchar, W_WINROW(wp) + wp->w_height, W_ENDCOL(wp), | |
| 7286 attr); | |
| 7287 } | |
| 1910 | 7288 busy = FALSE; |
| 7 | 7289 } |
| 7290 | |
| 680 | 7291 #ifdef FEAT_STL_OPT |
| 7292 /* | |
| 7293 * Redraw the status line according to 'statusline' and take care of any | |
| 7294 * errors encountered. | |
| 7295 */ | |
| 7296 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7297 redraw_custom_statusline(win_T *wp) |
| 680 | 7298 { |
| 1983 | 7299 static int entered = FALSE; |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7300 int saved_did_emsg = did_emsg; |
| 1983 | 7301 |
| 7302 /* When called recursively return. This can happen when the statusline | |
| 7303 * contains an expression that triggers a redraw. */ | |
| 7304 if (entered) | |
| 7305 return; | |
| 7306 entered = TRUE; | |
| 680 | 7307 |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7308 did_emsg = FALSE; |
| 680 | 7309 win_redr_custom(wp, FALSE); |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7310 if (did_emsg) |
| 1983 | 7311 { |
| 7312 /* When there is an error disable the statusline, otherwise the | |
| 7313 * display is messed up with errors and a redraw triggers the problem | |
| 7314 * again and again. */ | |
| 680 | 7315 set_string_option_direct((char_u *)"statusline", -1, |
| 7316 (char_u *)"", OPT_FREE | (*wp->w_p_stl != NUL | |
| 694 | 7317 ? OPT_LOCAL : OPT_GLOBAL), SID_ERROR); |
| 1983 | 7318 } |
|
8847
470ea7526cc6
commit https://github.com/vim/vim/commit/a742e084b677f76c67e9e52c4f9fb9ab24002e20
Christian Brabandt <cb@256bit.org>
parents:
8819
diff
changeset
|
7319 did_emsg |= saved_did_emsg; |
| 1983 | 7320 entered = FALSE; |
| 680 | 7321 } |
| 7322 #endif | |
| 7323 | |
| 7 | 7324 /* |
| 7325 * Return TRUE if the status line of window "wp" is connected to the status | |
| 7326 * line of the window right of it. If not, then it's a vertical separator. | |
| 7327 * Only call if (wp->w_vsep_width != 0). | |
| 7328 */ | |
| 7329 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7330 stl_connected(win_T *wp) |
| 7 | 7331 { |
| 7332 frame_T *fr; | |
| 7333 | |
| 7334 fr = wp->w_frame; | |
| 7335 while (fr->fr_parent != NULL) | |
| 7336 { | |
| 7337 if (fr->fr_parent->fr_layout == FR_COL) | |
| 7338 { | |
| 7339 if (fr->fr_next != NULL) | |
| 7340 break; | |
| 7341 } | |
| 7342 else | |
| 7343 { | |
| 7344 if (fr->fr_next != NULL) | |
| 7345 return TRUE; | |
| 7346 } | |
| 7347 fr = fr->fr_parent; | |
| 7348 } | |
| 7349 return FALSE; | |
| 7350 } | |
| 7351 | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
7352 |
| 7 | 7353 /* |
| 7354 * Get the value to show for the language mappings, active 'keymap'. | |
| 7355 */ | |
| 7356 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7357 get_keymap_str( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7358 win_T *wp, |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7359 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
|
7360 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
|
7361 int len) /* length of buffer */ |
| 7 | 7362 { |
| 7363 char_u *p; | |
| 7364 | |
| 7365 if (wp->w_buffer->b_p_iminsert != B_IMODE_LMAP) | |
| 7366 return FALSE; | |
| 7367 | |
| 7368 { | |
| 7369 #ifdef FEAT_EVAL | |
| 7370 buf_T *old_curbuf = curbuf; | |
| 7371 win_T *old_curwin = curwin; | |
| 7372 char_u *s; | |
| 7373 | |
| 7374 curbuf = wp->w_buffer; | |
| 7375 curwin = wp; | |
| 7376 STRCPY(buf, "b:keymap_name"); /* must be writable */ | |
| 7377 ++emsg_skip; | |
| 714 | 7378 s = p = eval_to_string(buf, NULL, FALSE); |
| 7 | 7379 --emsg_skip; |
| 7380 curbuf = old_curbuf; | |
| 7381 curwin = old_curwin; | |
| 7382 if (p == NULL || *p == NUL) | |
| 7383 #endif | |
| 7384 { | |
| 7385 #ifdef FEAT_KEYMAP | |
| 7386 if (wp->w_buffer->b_kmap_state & KEYMAP_LOADED) | |
| 7387 p = wp->w_buffer->b_p_keymap; | |
| 7388 else | |
| 7389 #endif | |
| 7390 p = (char_u *)"lang"; | |
| 7391 } | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
7392 if (vim_snprintf((char *)buf, len, (char *)fmt, p) > len - 1) |
| 7 | 7393 buf[0] = NUL; |
| 7394 #ifdef FEAT_EVAL | |
| 7395 vim_free(s); | |
| 7396 #endif | |
| 7397 } | |
| 7398 return buf[0] != NUL; | |
| 7399 } | |
| 7400 | |
| 7401 #if defined(FEAT_STL_OPT) || defined(PROTO) | |
| 7402 /* | |
| 677 | 7403 * Redraw the status line or ruler of window "wp". |
| 7404 * When "wp" is NULL redraw the tab pages line from 'tabline'. | |
| 7 | 7405 */ |
| 7406 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7407 win_redr_custom( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7408 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7409 int draw_ruler) /* TRUE or FALSE */ |
| 7 | 7410 { |
| 5539 | 7411 static int entered = FALSE; |
| 7 | 7412 int attr; |
| 7413 int curattr; | |
| 7414 int row; | |
| 7415 int col = 0; | |
| 7416 int maxwidth; | |
| 7417 int width; | |
| 7418 int n; | |
| 7419 int len; | |
| 7420 int fillchar; | |
| 7421 char_u buf[MAXPATHL]; | |
| 1983 | 7422 char_u *stl; |
| 7 | 7423 char_u *p; |
| 681 | 7424 struct stl_hlrec hltab[STL_MAX_ITEM]; |
| 7425 struct stl_hlrec tabtab[STL_MAX_ITEM]; | |
| 677 | 7426 int use_sandbox = FALSE; |
| 2693 | 7427 win_T *ewp; |
| 7428 int p_crb_save; | |
| 7 | 7429 |
| 5539 | 7430 /* There is a tiny chance that this gets called recursively: When |
| 7431 * redrawing a status line triggers redrawing the ruler or tabline. | |
| 7432 * Avoid trouble by not allowing recursion. */ | |
| 7433 if (entered) | |
| 7434 return; | |
| 7435 entered = TRUE; | |
| 7436 | |
| 7 | 7437 /* setup environment for the task at hand */ |
| 677 | 7438 if (wp == NULL) |
| 7439 { | |
| 7440 /* Use 'tabline'. Always at the first line of the screen. */ | |
| 1983 | 7441 stl = p_tal; |
| 677 | 7442 row = 0; |
| 707 | 7443 fillchar = ' '; |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
7444 attr = HL_ATTR(HLF_TPF); |
| 677 | 7445 maxwidth = Columns; |
| 7446 # ifdef FEAT_EVAL | |
| 681 | 7447 use_sandbox = was_set_insecurely((char_u *)"tabline", 0); |
| 677 | 7448 # endif |
| 7449 } | |
| 40 | 7450 else |
| 677 | 7451 { |
| 7452 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
|
7453 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
|
7454 maxwidth = wp->w_width; |
| 677 | 7455 |
| 7456 if (draw_ruler) | |
| 7457 { | |
| 1983 | 7458 stl = p_ruf; |
| 677 | 7459 /* advance past any leading group spec - implicit in ru_col */ |
| 1983 | 7460 if (*stl == '%') |
| 7461 { | |
| 7462 if (*++stl == '-') | |
| 7463 stl++; | |
| 7464 if (atoi((char *)stl)) | |
| 7465 while (VIM_ISDIGIT(*stl)) | |
| 7466 stl++; | |
| 7467 if (*stl++ != '(') | |
| 7468 stl = p_ruf; | |
| 677 | 7469 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
7470 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
|
7471 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
|
7472 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
|
7473 maxwidth = wp->w_width - col; |
| 677 | 7474 if (!wp->w_status_height) |
| 7475 { | |
| 7476 row = Rows - 1; | |
| 7477 --maxwidth; /* writing in last column may cause scrolling */ | |
| 7478 fillchar = ' '; | |
| 7479 attr = 0; | |
| 7480 } | |
| 7481 | |
| 7482 # ifdef FEAT_EVAL | |
| 681 | 7483 use_sandbox = was_set_insecurely((char_u *)"rulerformat", 0); |
| 677 | 7484 # endif |
| 7485 } | |
| 7486 else | |
| 7487 { | |
| 7488 if (*wp->w_p_stl != NUL) | |
| 1983 | 7489 stl = wp->w_p_stl; |
| 677 | 7490 else |
| 1983 | 7491 stl = p_stl; |
| 677 | 7492 # ifdef FEAT_EVAL |
| 681 | 7493 use_sandbox = was_set_insecurely((char_u *)"statusline", |
| 7494 *wp->w_p_stl == NUL ? 0 : OPT_LOCAL); | |
| 677 | 7495 # endif |
| 7496 } | |
| 7497 | |
|
12513
3ca08bf99396
patch 8.0.1135: W_WINCOL() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12510
diff
changeset
|
7498 col += wp->w_wincol; |
| 677 | 7499 } |
| 7500 | |
| 7 | 7501 if (maxwidth <= 0) |
| 5539 | 7502 goto theend; |
| 677 | 7503 |
| 2693 | 7504 /* Temporarily reset 'cursorbind', we don't want a side effect from moving |
| 7505 * the cursor away and back. */ | |
| 7506 ewp = wp == NULL ? curwin : wp; | |
| 7507 p_crb_save = ewp->w_p_crb; | |
| 7508 ewp->w_p_crb = FALSE; | |
| 7509 | |
| 1983 | 7510 /* Make a copy, because the statusline may include a function call that |
| 7511 * might change the option value and free the memory. */ | |
| 7512 stl = vim_strsave(stl); | |
| 2693 | 7513 width = build_stl_str_hl(ewp, buf, sizeof(buf), |
| 1983 | 7514 stl, use_sandbox, |
| 681 | 7515 fillchar, maxwidth, hltab, tabtab); |
| 1983 | 7516 vim_free(stl); |
| 2693 | 7517 ewp->w_p_crb = p_crb_save; |
| 2661 | 7518 |
| 7519 /* Make all characters printable. */ | |
| 7520 p = transstr(buf); | |
| 7521 if (p != NULL) | |
| 7522 { | |
| 7523 vim_strncpy(buf, p, sizeof(buf) - 1); | |
| 7524 vim_free(p); | |
| 7525 } | |
| 7526 | |
| 7527 /* fill up with "fillchar" */ | |
| 835 | 7528 len = (int)STRLEN(buf); |
| 1883 | 7529 while (width < maxwidth && len < (int)sizeof(buf) - 1) |
| 7 | 7530 { |
| 7531 len += (*mb_char2bytes)(fillchar, buf + len); | |
| 7532 ++width; | |
| 7533 } | |
| 7534 buf[len] = NUL; | |
| 7535 | |
| 681 | 7536 /* |
| 7537 * Draw each snippet with the specified highlighting. | |
| 7538 */ | |
| 7 | 7539 curattr = attr; |
| 7540 p = buf; | |
| 681 | 7541 for (n = 0; hltab[n].start != NULL; n++) |
| 7542 { | |
| 7543 len = (int)(hltab[n].start - p); | |
| 7 | 7544 screen_puts_len(p, len, row, col, curattr); |
| 7545 col += vim_strnsize(p, len); | |
| 681 | 7546 p = hltab[n].start; |
| 7547 | |
| 7548 if (hltab[n].userhl == 0) | |
| 7 | 7549 curattr = attr; |
| 681 | 7550 else if (hltab[n].userhl < 0) |
| 7551 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
|
7552 #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
|
7553 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
|
7554 && 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
|
7555 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
|
7556 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
|
7557 && 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
|
7558 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
|
7559 #endif |
| 680 | 7560 else if (wp != NULL && wp != curwin && wp->w_status_height != 0) |
| 681 | 7561 curattr = highlight_stlnc[hltab[n].userhl - 1]; |
| 7 | 7562 else |
| 681 | 7563 curattr = highlight_user[hltab[n].userhl - 1]; |
| 7 | 7564 } |
| 7565 screen_puts(p, row, col, curattr); | |
| 681 | 7566 |
| 7567 if (wp == NULL) | |
| 7568 { | |
| 7569 /* Fill the TabPageIdxs[] array for clicking in the tab pagesline. */ | |
| 7570 col = 0; | |
| 7571 len = 0; | |
| 7572 p = buf; | |
| 7573 fillchar = 0; | |
| 7574 for (n = 0; tabtab[n].start != NULL; n++) | |
| 7575 { | |
| 7576 len += vim_strnsize(p, (int)(tabtab[n].start - p)); | |
| 7577 while (col < len) | |
| 7578 TabPageIdxs[col++] = fillchar; | |
| 7579 p = tabtab[n].start; | |
| 7580 fillchar = tabtab[n].userhl; | |
| 7581 } | |
| 7582 while (col < Columns) | |
| 7583 TabPageIdxs[col++] = fillchar; | |
| 7584 } | |
| 5539 | 7585 |
| 7586 theend: | |
| 7587 entered = FALSE; | |
| 7 | 7588 } |
| 7589 | |
| 7590 #endif /* FEAT_STL_OPT */ | |
| 7591 | |
| 7592 /* | |
| 7593 * Output a single character directly to the screen and update ScreenLines. | |
| 7594 */ | |
| 7595 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7596 screen_putchar(int c, int row, int col, int attr) |
| 7 | 7597 { |
| 3549 | 7598 char_u buf[MB_MAXBYTES + 1]; |
| 7599 | |
| 7600 if (has_mbyte) | |
| 7601 buf[(*mb_char2bytes)(c, buf)] = NUL; | |
| 7602 else | |
| 7603 { | |
| 7604 buf[0] = c; | |
| 7605 buf[1] = NUL; | |
| 7606 } | |
| 7 | 7607 screen_puts(buf, row, col, attr); |
| 7608 } | |
| 7609 | |
| 7610 /* | |
| 7611 * Get a single character directly from ScreenLines into "bytes[]". | |
| 7612 * Also return its attribute in *attrp; | |
| 7613 */ | |
| 7614 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7615 screen_getbytes(int row, int col, char_u *bytes, int *attrp) |
| 7 | 7616 { |
| 7617 unsigned off; | |
| 7618 | |
| 7619 /* safety check */ | |
| 7620 if (ScreenLines != NULL && row < screen_Rows && col < screen_Columns) | |
| 7621 { | |
| 7622 off = LineOffset[row] + col; | |
| 7623 *attrp = ScreenAttrs[off]; | |
| 7624 bytes[0] = ScreenLines[off]; | |
| 7625 bytes[1] = NUL; | |
| 7626 | |
| 7627 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 7628 bytes[utfc_char2bytes(off, bytes)] = NUL; | |
| 7629 else if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 7630 { | |
| 7631 bytes[0] = ScreenLines[off]; | |
| 7632 bytes[1] = ScreenLines2[off]; | |
| 7633 bytes[2] = NUL; | |
| 7634 } | |
| 7635 else if (enc_dbcs && MB_BYTE2LEN(bytes[0]) > 1) | |
| 7636 { | |
| 7637 bytes[1] = ScreenLines[off + 1]; | |
| 7638 bytes[2] = NUL; | |
| 7639 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7640 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7641 } |
|
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7642 |
| 714 | 7643 /* |
| 7644 * Return TRUE if composing characters for screen posn "off" differs from | |
| 7645 * composing characters in "u8cc". | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7646 * Only to be used when ScreenLinesUC[off] != 0. |
| 714 | 7647 */ |
| 7648 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7649 screen_comp_differs(int off, int *u8cc) |
| 714 | 7650 { |
| 7651 int i; | |
| 7652 | |
| 7653 for (i = 0; i < Screen_mco; ++i) | |
| 7654 { | |
| 7655 if (ScreenLinesC[i][off] != (u8char_T)u8cc[i]) | |
| 7656 return TRUE; | |
| 7657 if (u8cc[i] == 0) | |
| 7658 break; | |
| 7659 } | |
| 7660 return FALSE; | |
| 7661 } | |
| 7662 | |
| 7 | 7663 /* |
| 7664 * Put string '*text' on the screen at position 'row' and 'col', with | |
| 7665 * attributes 'attr', and update ScreenLines[] and ScreenAttrs[]. | |
| 7666 * Note: only outputs within one row, message is truncated at screen boundary! | |
| 7667 * Note: if ScreenLines[], row and/or col is invalid, nothing is done. | |
| 7668 */ | |
| 7669 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7670 screen_puts( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7671 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7672 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7673 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7674 int attr) |
| 7 | 7675 { |
| 7676 screen_puts_len(text, -1, row, col, attr); | |
| 7677 } | |
| 7678 | |
| 7679 /* | |
| 7680 * Like screen_puts(), but output "text[len]". When "len" is -1 output up to | |
| 7681 * a NUL. | |
| 7682 */ | |
| 7683 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7684 screen_puts_len( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7685 char_u *text, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7686 int textlen, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7687 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7688 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7689 int attr) |
| 7 | 7690 { |
| 7691 unsigned off; | |
| 7692 char_u *ptr = text; | |
| 5923 | 7693 int len = textlen; |
| 7 | 7694 int c; |
| 1378 | 7695 unsigned max_off; |
| 7 | 7696 int mbyte_blen = 1; |
| 7697 int mbyte_cells = 1; | |
| 7698 int u8c = 0; | |
| 714 | 7699 int u8cc[MAX_MCO]; |
| 7 | 7700 int clear_next_cell = FALSE; |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7701 #ifdef FEAT_ARABIC |
| 7 | 7702 int prev_c = 0; /* previous Arabic character */ |
| 714 | 7703 int pc, nc, nc1; |
| 7704 int pcc[MAX_MCO]; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7705 #endif |
| 1843 | 7706 int force_redraw_this; |
| 7707 int force_redraw_next = FALSE; | |
| 7708 int need_redraw; | |
| 7 | 7709 |
|
16914
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7710 // Safety check. The check for negative row and column is to fix issue |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7711 // #4102. TODO: find out why row/col could be negative. |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7712 if (ScreenLines == NULL |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7713 || row >= screen_Rows || row < 0 |
|
66a94fd8e37d
patch 8.1.1458: crash when using gtags
Bram Moolenaar <Bram@vim.org>
parents:
16910
diff
changeset
|
7714 || col >= screen_Columns || col < 0) |
| 7 | 7715 return; |
| 1843 | 7716 off = LineOffset[row] + col; |
| 7 | 7717 |
| 1668 | 7718 /* When drawing over the right halve of a double-wide char clear out the |
| 7719 * left halve. Only needed in a terminal. */ | |
| 1685 | 7720 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
|
7721 #ifdef FEAT_GUI |
| 1668 | 7722 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7723 #endif |
| 1668 | 7724 && mb_fix_col(col, row) != col) |
| 1843 | 7725 { |
| 7726 ScreenLines[off - 1] = ' '; | |
| 7727 ScreenAttrs[off - 1] = 0; | |
| 7728 if (enc_utf8) | |
| 7729 { | |
| 7730 ScreenLinesUC[off - 1] = 0; | |
| 7731 ScreenLinesC[0][off - 1] = 0; | |
| 7732 } | |
| 7733 /* redraw the previous cell, make it empty */ | |
| 7734 screen_char(off - 1, row, col - 1); | |
| 7735 /* force the cell at "col" to be redrawn */ | |
| 7736 force_redraw_next = TRUE; | |
| 7737 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7738 |
| 1378 | 7739 max_off = LineOffset[row] + screen_Columns; |
| 1340 | 7740 while (col < screen_Columns |
| 7741 && (len < 0 || (int)(ptr - text) < len) | |
| 7742 && *ptr != NUL) | |
| 7 | 7743 { |
| 7744 c = *ptr; | |
| 7745 /* check if this is the first byte of a multibyte */ | |
| 7746 if (has_mbyte) | |
| 7747 { | |
| 7748 if (enc_utf8 && len > 0) | |
| 474 | 7749 mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr)); |
| 7 | 7750 else |
| 474 | 7751 mbyte_blen = (*mb_ptr2len)(ptr); |
| 7 | 7752 if (enc_dbcs == DBCS_JPNU && c == 0x8e) |
| 7753 mbyte_cells = 1; | |
| 7754 else if (enc_dbcs != 0) | |
| 7755 mbyte_cells = mbyte_blen; | |
| 7756 else /* enc_utf8 */ | |
| 7757 { | |
| 7758 if (len >= 0) | |
| 714 | 7759 u8c = utfc_ptr2char_len(ptr, u8cc, |
| 7 | 7760 (int)((text + len) - ptr)); |
| 7761 else | |
| 714 | 7762 u8c = utfc_ptr2char(ptr, u8cc); |
| 7 | 7763 mbyte_cells = utf_char2cells(u8c); |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7764 #ifdef FEAT_ARABIC |
| 7 | 7765 if (p_arshape && !p_tbidi && ARABIC_CHAR(u8c)) |
| 7766 { | |
| 7767 /* Do Arabic shaping. */ | |
| 7768 if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) | |
| 7769 { | |
| 7770 /* Past end of string to be displayed. */ | |
| 7771 nc = NUL; | |
| 7772 nc1 = NUL; | |
| 7773 } | |
| 7774 else | |
| 714 | 7775 { |
| 1994 | 7776 nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc, |
| 7777 (int)((text + len) - ptr - mbyte_blen)); | |
| 714 | 7778 nc1 = pcc[0]; |
| 7779 } | |
| 7 | 7780 pc = prev_c; |
| 7781 prev_c = u8c; | |
| 714 | 7782 u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc); |
| 7 | 7783 } |
| 7784 else | |
| 7785 prev_c = u8c; | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7786 #endif |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7787 if (col + mbyte_cells > screen_Columns) |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7788 { |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7789 /* 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
|
7790 * 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
|
7791 c = '>'; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7792 mbyte_cells = 1; |
|
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
7793 } |
| 7 | 7794 } |
| 7795 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7796 |
| 1843 | 7797 force_redraw_this = force_redraw_next; |
| 7798 force_redraw_next = FALSE; | |
| 7799 | |
| 7800 need_redraw = ScreenLines[off] != c | |
| 7 | 7801 || (mbyte_cells == 2 |
| 7802 && ScreenLines[off + 1] != (enc_dbcs ? ptr[1] : 0)) | |
| 7803 || (enc_dbcs == DBCS_JPNU | |
| 7804 && c == 0x8e | |
| 7805 && ScreenLines2[off] != ptr[1]) | |
| 7806 || (enc_utf8 | |
|
2124
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7807 && (ScreenLinesUC[off] != |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7808 (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
|
7809 || (ScreenLinesUC[off] != 0 |
|
dc8a5699253b
updated for version 7.2.406
Bram Moolenaar <bram@zimbu.org>
parents:
2122
diff
changeset
|
7810 && screen_comp_differs(off, u8cc)))) |
| 7 | 7811 || ScreenAttrs[off] != attr |
| 1843 | 7812 || exmode_active; |
| 7813 | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
7814 if (need_redraw || force_redraw_this) |
| 7 | 7815 { |
| 7816 #if defined(FEAT_GUI) || defined(UNIX) | |
| 7817 /* The bold trick makes a single row of pixels appear in the next | |
| 7818 * character. When a bold character is removed, the next | |
| 7819 * character should be redrawn too. This happens for our own GUI | |
| 1843 | 7820 * and for some xterms. */ |
| 7821 if (need_redraw && ScreenLines[off] != ' ' && ( | |
| 7 | 7822 # ifdef FEAT_GUI |
| 7823 gui.in_use | |
| 7824 # endif | |
| 7825 # if defined(FEAT_GUI) && defined(UNIX) | |
| 7826 || | |
| 7827 # endif | |
| 7828 # ifdef UNIX | |
| 7829 term_is_xterm | |
| 7830 # endif | |
| 1843 | 7831 )) |
| 7832 { | |
| 7833 int n = ScreenAttrs[off]; | |
| 7834 | |
| 7835 if (n > HL_ALL) | |
| 7836 n = syn_attr2attr(n); | |
| 7837 if (n & HL_BOLD) | |
| 7838 force_redraw_next = TRUE; | |
| 7 | 7839 } |
| 7840 #endif | |
| 7841 /* When at the end of the text and overwriting a two-cell | |
| 7842 * character with a one-cell character, need to clear the next | |
| 7843 * cell. Also when overwriting the left halve of a two-cell char | |
| 7844 * with the right halve of a two-cell char. Do this only once | |
| 7845 * (mb_off2cells() may return 2 on the right halve). */ | |
| 7846 if (clear_next_cell) | |
| 7847 clear_next_cell = FALSE; | |
| 7848 else if (has_mbyte | |
| 7849 && (len < 0 ? ptr[mbyte_blen] == NUL | |
| 7850 : ptr + mbyte_blen >= text + len) | |
| 1378 | 7851 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7852 || (mbyte_cells == 2 |
| 1378 | 7853 && (*mb_off2cells)(off, max_off) == 1 |
| 7854 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7855 clear_next_cell = TRUE; |
| 7856 | |
| 7857 /* Make sure we never leave a second byte of a double-byte behind, | |
| 7858 * it confuses mb_off2cells(). */ | |
| 7859 if (enc_dbcs | |
| 1378 | 7860 && ((mbyte_cells == 1 && (*mb_off2cells)(off, max_off) > 1) |
| 7 | 7861 || (mbyte_cells == 2 |
| 1378 | 7862 && (*mb_off2cells)(off, max_off) == 1 |
| 7863 && (*mb_off2cells)(off + 1, max_off) > 1))) | |
| 7 | 7864 ScreenLines[off + mbyte_blen] = 0; |
| 7865 ScreenLines[off] = c; | |
| 7866 ScreenAttrs[off] = attr; | |
| 7867 if (enc_utf8) | |
| 7868 { | |
| 714 | 7869 if (c < 0x80 && u8cc[0] == 0) |
| 7 | 7870 ScreenLinesUC[off] = 0; |
| 7871 else | |
| 7872 { | |
| 714 | 7873 int i; |
| 7874 | |
| 7 | 7875 ScreenLinesUC[off] = u8c; |
| 714 | 7876 for (i = 0; i < Screen_mco; ++i) |
| 7877 { | |
| 7878 ScreenLinesC[i][off] = u8cc[i]; | |
| 7879 if (u8cc[i] == 0) | |
| 7880 break; | |
| 7881 } | |
| 7 | 7882 } |
| 7883 if (mbyte_cells == 2) | |
| 7884 { | |
| 7885 ScreenLines[off + 1] = 0; | |
| 7886 ScreenAttrs[off + 1] = attr; | |
| 7887 } | |
| 7888 screen_char(off, row, col); | |
| 7889 } | |
| 7890 else if (mbyte_cells == 2) | |
| 7891 { | |
| 7892 ScreenLines[off + 1] = ptr[1]; | |
| 7893 ScreenAttrs[off + 1] = attr; | |
| 7894 screen_char_2(off, row, col); | |
| 7895 } | |
| 7896 else if (enc_dbcs == DBCS_JPNU && c == 0x8e) | |
| 7897 { | |
| 7898 ScreenLines2[off] = ptr[1]; | |
| 7899 screen_char(off, row, col); | |
| 7900 } | |
| 7901 else | |
| 7902 screen_char(off, row, col); | |
| 7903 } | |
| 7904 if (has_mbyte) | |
| 7905 { | |
| 7906 off += mbyte_cells; | |
| 7907 col += mbyte_cells; | |
| 7908 ptr += mbyte_blen; | |
| 7909 if (clear_next_cell) | |
| 5923 | 7910 { |
| 7911 /* This only happens at the end, display one space next. */ | |
| 7 | 7912 ptr = (char_u *)" "; |
| 5923 | 7913 len = -1; |
| 7914 } | |
| 7 | 7915 } |
| 7916 else | |
| 7917 { | |
| 7918 ++off; | |
| 7919 ++col; | |
| 7920 ++ptr; | |
| 7921 } | |
| 7922 } | |
| 1843 | 7923 |
| 7924 /* If we detected the next character needs to be redrawn, but the text | |
| 7925 * doesn't extend up to there, update the character here. */ | |
| 7926 if (force_redraw_next && col < screen_Columns) | |
| 7927 { | |
| 7928 if (enc_dbcs != 0 && dbcs_off2cells(off, max_off) > 1) | |
| 7929 screen_char_2(off, row, col); | |
| 7930 else | |
| 7931 screen_char(off, row, col); | |
| 7932 } | |
| 7 | 7933 } |
| 7934 | |
| 7935 #ifdef FEAT_SEARCH_EXTRA | |
| 7936 /* | |
| 1326 | 7937 * Prepare for 'hlsearch' highlighting. |
| 7 | 7938 */ |
| 7939 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7940 start_search_hl(void) |
| 7 | 7941 { |
| 7942 if (p_hls && !no_hlsearch) | |
| 7943 { | |
| 7944 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
|
7945 search_hl.attr = HL_ATTR(HLF_L); |
| 1521 | 7946 # ifdef FEAT_RELTIME |
| 7947 /* Set the time limit to 'redrawtime'. */ | |
| 7948 profile_setlimit(p_rdt, &search_hl.tm); | |
| 7949 # endif | |
| 7 | 7950 } |
| 7951 } | |
| 7952 | |
| 7953 /* | |
| 1326 | 7954 * Clean up for 'hlsearch' highlighting. |
| 7 | 7955 */ |
| 7956 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7957 end_search_hl(void) |
| 7 | 7958 { |
| 7959 if (search_hl.rm.regprog != NULL) | |
| 7960 { | |
|
4805
66803af09906
updated for version 7.3.1149
Bram Moolenaar <bram@vim.org>
parents:
4795
diff
changeset
|
7961 vim_regfree(search_hl.rm.regprog); |
| 7 | 7962 search_hl.rm.regprog = NULL; |
| 7963 } | |
| 7964 } | |
| 7965 | |
| 7966 /* | |
|
2284
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7967 * 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
|
7968 */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7969 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
7970 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
|
7971 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7972 matchitem_T *cur; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7973 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7974 /* 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
|
7975 * match */ |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7976 cur = wp->w_match_head; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7977 while (cur != NULL) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7978 { |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7979 cur->hl.rm = cur->match; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7980 if (cur->hlg_id == 0) |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7981 cur->hl.attr = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7982 else |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7983 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
|
7984 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
|
7985 cur->hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7986 cur->hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7987 # ifdef FEAT_RELTIME |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7988 /* 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
|
7989 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
|
7990 # endif |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7991 cur = cur->next; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7992 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7993 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
|
7994 search_hl.lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7995 search_hl.first_lnum = 0; |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7996 /* 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
|
7997 } |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7998 |
|
cca510a8b85b
Better init for match highlighting when using conceal feature.
Bram Moolenaar <bram@vim.org>
parents:
2277
diff
changeset
|
7999 /* |
| 7 | 8000 * Advance to the match in window "wp" line "lnum" or past it. |
| 8001 */ | |
| 8002 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8003 prepare_search_hl(win_T *wp, linenr_T lnum) |
| 7 | 8004 { |
| 1326 | 8005 matchitem_T *cur; /* points to the match list */ |
| 8006 match_T *shl; /* points to search_hl or a match */ | |
| 8007 int shl_flag; /* flag to indicate whether search_hl | |
| 8008 has been processed or not */ | |
| 5979 | 8009 int pos_inprogress; /* marks that position match search is |
| 8010 in progress */ | |
| 7 | 8011 int n; |
| 8012 | |
| 8013 /* | |
| 8014 * When using a multi-line pattern, start searching at the top | |
| 8015 * of the window or just after a closed fold. | |
| 1326 | 8016 * Do this both for search_hl and the match list. |
| 7 | 8017 */ |
| 1326 | 8018 cur = wp->w_match_head; |
| 8019 shl_flag = FALSE; | |
| 8020 while (cur != NULL || shl_flag == FALSE) | |
| 8021 { | |
| 8022 if (shl_flag == FALSE) | |
| 8023 { | |
| 8024 shl = &search_hl; | |
| 8025 shl_flag = TRUE; | |
| 8026 } | |
| 8027 else | |
| 8028 shl = &cur->hl; | |
| 7 | 8029 if (shl->rm.regprog != NULL |
| 8030 && shl->lnum == 0 | |
| 8031 && re_multiline(shl->rm.regprog)) | |
| 8032 { | |
| 8033 if (shl->first_lnum == 0) | |
| 8034 { | |
| 8035 # ifdef FEAT_FOLDING | |
| 8036 for (shl->first_lnum = lnum; | |
| 8037 shl->first_lnum > wp->w_topline; --shl->first_lnum) | |
| 8038 if (hasFoldingWin(wp, shl->first_lnum - 1, | |
| 8039 NULL, NULL, TRUE, NULL)) | |
| 8040 break; | |
| 8041 # else | |
| 8042 shl->first_lnum = wp->w_topline; | |
| 8043 # endif | |
| 8044 } | |
| 5979 | 8045 if (cur != NULL) |
| 8046 cur->pos.cur = 0; | |
| 8047 pos_inprogress = TRUE; | |
| 7 | 8048 n = 0; |
| 5979 | 8049 while (shl->first_lnum < lnum && (shl->rm.regprog != NULL |
| 8050 || (cur != NULL && pos_inprogress))) | |
| 8051 { | |
|
9992
3e3b0ce24b61
commit https://github.com/vim/vim/commit/e17bdffff78ebd6a4e3cff26754cc667557ea810
Christian Brabandt <cb@256bit.org>
parents:
9939
diff
changeset
|
8052 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
|
8053 shl == &search_hl ? NULL : cur); |
| 5979 | 8054 pos_inprogress = cur == NULL || cur->pos.cur == 0 |
| 8055 ? FALSE : TRUE; | |
| 7 | 8056 if (shl->lnum != 0) |
| 8057 { | |
| 8058 shl->first_lnum = shl->lnum | |
| 8059 + shl->rm.endpos[0].lnum | |
| 8060 - shl->rm.startpos[0].lnum; | |
| 8061 n = shl->rm.endpos[0].col; | |
| 8062 } | |
| 8063 else | |
| 8064 { | |
| 8065 ++shl->first_lnum; | |
| 8066 n = 0; | |
| 8067 } | |
| 8068 } | |
| 8069 } | |
| 1326 | 8070 if (shl != &search_hl && cur != NULL) |
| 8071 cur = cur->next; | |
| 7 | 8072 } |
| 8073 } | |
| 8074 | |
| 8075 /* | |
| 1326 | 8076 * Search for a next 'hlsearch' or match. |
| 7 | 8077 * Uses shl->buf. |
| 8078 * Sets shl->lnum and shl->rm contents. | |
| 8079 * Note: Assumes a previous match is always before "lnum", unless | |
| 8080 * shl->lnum is zero. | |
| 8081 * Careful: Any pointers for buffer lines will become invalid. | |
| 8082 */ | |
| 8083 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8084 next_search_hl( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8085 win_T *win, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8086 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
|
8087 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8088 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
|
8089 matchitem_T *cur) /* to retrieve match positions if any */ |
| 7 | 8090 { |
| 8091 linenr_T l; | |
| 8092 colnr_T matchcol; | |
| 8093 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
|
8094 int save_called_emsg = called_emsg; |
| 7 | 8095 |
|
14515
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8096 // 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
|
8097 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
|
8098 { |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8099 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
|
8100 return; |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8101 } |
|
3648e74dd523
patch 8.1.0271: 'incsearch' doesn't work for :s, :g or :v
Christian Brabandt <cb@256bit.org>
parents:
14428
diff
changeset
|
8102 |
| 7 | 8103 if (shl->lnum != 0) |
| 8104 { | |
| 8105 /* Check for three situations: | |
| 8106 * 1. If the "lnum" is below a previous match, start a new search. | |
| 8107 * 2. If the previous match includes "mincol", use it. | |
| 8108 * 3. Continue after the previous match. | |
| 8109 */ | |
| 8110 l = shl->lnum + shl->rm.endpos[0].lnum - shl->rm.startpos[0].lnum; | |
| 8111 if (lnum > l) | |
| 8112 shl->lnum = 0; | |
| 8113 else if (lnum < l || shl->rm.endpos[0].col > mincol) | |
| 8114 return; | |
| 8115 } | |
| 8116 | |
| 8117 /* | |
| 8118 * Repeat searching for a match until one is found that includes "mincol" | |
| 8119 * or none is found in this line. | |
| 8120 */ | |
| 8121 called_emsg = FALSE; | |
| 8122 for (;;) | |
| 8123 { | |
| 1521 | 8124 #ifdef FEAT_RELTIME |
| 8125 /* Stop searching after passing the time limit. */ | |
| 8126 if (profile_passed_limit(&(shl->tm))) | |
| 8127 { | |
| 8128 shl->lnum = 0; /* no match found in time */ | |
| 8129 break; | |
| 8130 } | |
| 8131 #endif | |
| 7 | 8132 /* Three situations: |
| 8133 * 1. No useful previous match: search from start of line. | |
| 8134 * 2. Not Vi compatible or empty match: continue at next character. | |
| 8135 * Break the loop if this is beyond the end of the line. | |
| 8136 * 3. Vi compatible searching: continue at end of previous match. | |
| 8137 */ | |
| 8138 if (shl->lnum == 0) | |
| 8139 matchcol = 0; | |
| 8140 else if (vim_strchr(p_cpo, CPO_SEARCH) == NULL | |
| 8141 || (shl->rm.endpos[0].lnum == 0 | |
| 685 | 8142 && shl->rm.endpos[0].col <= shl->rm.startpos[0].col)) |
| 8143 { | |
| 688 | 8144 char_u *ml; |
| 685 | 8145 |
| 8146 matchcol = shl->rm.startpos[0].col; | |
| 688 | 8147 ml = ml_get_buf(shl->buf, lnum, FALSE) + matchcol; |
| 685 | 8148 if (*ml == NUL) |
| 8149 { | |
| 8150 ++matchcol; | |
| 7 | 8151 shl->lnum = 0; |
| 8152 break; | |
| 8153 } | |
| 685 | 8154 if (has_mbyte) |
| 8155 matchcol += mb_ptr2len(ml); | |
| 8156 else | |
| 8157 ++matchcol; | |
| 7 | 8158 } |
| 8159 else | |
| 8160 matchcol = shl->rm.endpos[0].col; | |
| 8161 | |
| 8162 shl->lnum = lnum; | |
| 5979 | 8163 if (shl->rm.regprog != NULL) |
| 8164 { | |
| 6394 | 8165 /* Remember whether shl->rm is using a copy of the regprog in |
| 8166 * cur->match. */ | |
| 8167 int regprog_is_copy = (shl != &search_hl && cur != NULL | |
| 8168 && shl == &cur->hl | |
| 8169 && 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
|
8170 int timed_out = FALSE; |
| 6394 | 8171 |
| 5979 | 8172 nmatched = vim_regexec_multi(&shl->rm, win, shl->buf, lnum, |
| 8173 matchcol, | |
| 1521 | 8174 #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
|
8175 &(shl->tm), &timed_out |
| 1521 | 8176 #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
|
8177 NULL, NULL |
| 5979 | 8178 #endif |
| 8179 ); | |
| 6394 | 8180 /* Copy the regprog, in case it got freed and recompiled. */ |
| 8181 if (regprog_is_copy) | |
| 8182 cur->match.regprog = cur->hl.rm.regprog; | |
| 8183 | |
|
11521
578df034735d
patch 8.0.0643: when a pattern search is slow Vim becomes unusable
Christian Brabandt <cb@256bit.org>
parents:
11516
diff
changeset
|
8184 if (called_emsg || got_int || timed_out) |
| 5979 | 8185 { |
| 8186 /* Error while handling regexp: stop using this regexp. */ | |
| 8187 if (shl == &search_hl) | |
| 8188 { | |
| 8189 /* don't free regprog in the match list, it's a copy */ | |
| 8190 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
|
8191 set_no_hlsearch(TRUE); |
| 5979 | 8192 } |
| 8193 shl->rm.regprog = NULL; | |
| 8194 shl->lnum = 0; | |
| 8195 got_int = FALSE; /* avoid the "Type :quit to exit Vim" | |
| 8196 message */ | |
| 8197 break; | |
| 8198 } | |
| 8199 } | |
| 8200 else if (cur != NULL) | |
| 8201 nmatched = next_search_hl_pos(shl, lnum, &(cur->pos), matchcol); | |
| 5987 | 8202 else |
| 8203 nmatched = 0; | |
| 7 | 8204 if (nmatched == 0) |
| 8205 { | |
| 8206 shl->lnum = 0; /* no match found */ | |
| 8207 break; | |
| 8208 } | |
| 8209 if (shl->rm.startpos[0].lnum > 0 | |
| 8210 || shl->rm.startpos[0].col >= mincol | |
| 8211 || nmatched > 1 | |
| 8212 || shl->rm.endpos[0].col > mincol) | |
| 8213 { | |
| 8214 shl->lnum += shl->rm.startpos[0].lnum; | |
| 8215 break; /* useful match found */ | |
| 8216 } | |
| 8217 } | |
|
14161
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8218 |
|
7cac4646c552
patch 8.1.0098: segfault when pattern with z() is very slow
Christian Brabandt <cb@256bit.org>
parents:
14093
diff
changeset
|
8219 // 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
|
8220 called_emsg = save_called_emsg; |
| 7 | 8221 } |
| 8222 | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8223 /* |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8224 * 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
|
8225 * Return zero otherwise. |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8226 */ |
| 5979 | 8227 static int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8228 next_search_hl_pos( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8229 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
|
8230 linenr_T lnum, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8231 posmatch_T *posmatch, /* match positions */ |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8232 colnr_T mincol) /* minimal column for a match */ |
| 5979 | 8233 { |
| 8234 int i; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8235 int found = -1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8236 |
| 5979 | 8237 for (i = posmatch->cur; i < MAXPOSMATCH; i++) |
| 8238 { | |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8239 llpos_T *pos = &posmatch->pos[i]; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8240 |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8241 if (pos->lnum == 0) |
| 5979 | 8242 break; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8243 if (pos->len == 0 && pos->col < mincol) |
| 5979 | 8244 continue; |
|
10273
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8245 if (pos->lnum == lnum) |
| 5979 | 8246 { |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8247 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8248 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8249 /* 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
|
8250 * them */ |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8251 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
|
8252 { |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8253 llpos_T tmp = *pos; |
|
489eae19cad9
commit https://github.com/vim/vim/commit/a6c27ee6db2c328e0ab0e6d143e2a295a0bb9c9a
Christian Brabandt <cb@256bit.org>
parents:
10247
diff
changeset
|
8254 |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8255 *pos = posmatch->pos[found]; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8256 posmatch->pos[found] = tmp; |
| 5979 | 8257 } |
| 8258 } | |
| 8259 else | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8260 found = i; |
| 5979 | 8261 } |
| 8262 } | |
| 8263 posmatch->cur = 0; | |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8264 if (found >= 0) |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8265 { |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8266 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
|
8267 ? 0 : posmatch->pos[found].col - 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8268 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
|
8269 ? MAXCOL : start + posmatch->pos[found].len; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8270 |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8271 shl->lnum = lnum; |
| 5979 | 8272 shl->rm.startpos[0].lnum = 0; |
| 8273 shl->rm.startpos[0].col = start; | |
| 8274 shl->rm.endpos[0].lnum = 0; | |
| 8275 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
|
8276 shl->is_addpos = TRUE; |
|
10287
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8277 posmatch->cur = found + 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8278 return 1; |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8279 } |
|
1c1fcf515607
commit https://github.com/vim/vim/commit/8507747600bddfd6a68aed057840856bf5548e61
Christian Brabandt <cb@256bit.org>
parents:
10273
diff
changeset
|
8280 return 0; |
| 5979 | 8281 } |
| 5985 | 8282 #endif |
| 5979 | 8283 |
| 7 | 8284 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8285 screen_start_highlight(int attr) |
| 7 | 8286 { |
| 8287 attrentry_T *aep = NULL; | |
| 8288 | |
| 8289 screen_attr = attr; | |
| 8290 if (full_screen | |
|
15868
7fad90423bd2
patch 8.1.0941: macros for MS-Windows are inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15850
diff
changeset
|
8291 #ifdef MSWIN |
| 7 | 8292 && termcap_active |
| 8293 #endif | |
| 8294 ) | |
| 8295 { | |
| 8296 #ifdef FEAT_GUI | |
| 8297 if (gui.in_use) | |
| 8298 { | |
| 8299 char buf[20]; | |
| 8300 | |
| 681 | 8301 /* The GUI handles this internally. */ |
| 8302 sprintf(buf, IF_EB("\033|%dh", ESC_STR "|%dh"), attr); | |
| 7 | 8303 OUT_STR(buf); |
| 8304 } | |
| 8305 else | |
| 8306 #endif | |
| 8307 { | |
| 8308 if (attr > HL_ALL) /* special HL attr. */ | |
| 8309 { | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8310 if (IS_CTERM) |
| 7 | 8311 aep = syn_cterm_attr2entry(attr); |
| 8312 else | |
| 8313 aep = syn_term_attr2entry(attr); | |
| 8314 if (aep == NULL) /* did ":syntax clear" */ | |
| 8315 attr = 0; | |
| 8316 else | |
| 8317 attr = aep->ae_attr; | |
| 8318 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8319 if ((attr & HL_BOLD) && *T_MD != NUL) /* bold */ |
| 7 | 8320 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
|
8321 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
|
8322 #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
|
8323 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
|
8324 ? 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
|
8325 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8326 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8327 t_colors > 1 && aep->ae_u.cterm.fg_color)) |
| 681 | 8328 /* If the Normal FG color has BOLD attribute and the new HL |
| 8329 * has a FG color defined, clear BOLD. */ | |
| 8330 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
|
8331 if ((attr & HL_STANDOUT) && *T_SO != NUL) /* standout */ |
| 7 | 8332 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
|
8333 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
|
8334 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
|
8335 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
|
8336 || ((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
|
8337 && *T_US != NUL) |
| 7 | 8338 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
|
8339 if ((attr & HL_ITALIC) && *T_CZH != NUL) /* italic */ |
| 7 | 8340 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
|
8341 if ((attr & HL_INVERSE) && *T_MR != NUL) /* inverse (reverse) */ |
| 7 | 8342 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
|
8343 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
|
8344 out_str(T_STS); |
| 7 | 8345 |
| 8346 /* | |
| 8347 * Output the color or start string after bold etc., in case the | |
| 8348 * bold etc. override the color setting. | |
| 8349 */ | |
| 8350 if (aep != NULL) | |
| 8351 { | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8352 #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
|
8353 /* 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
|
8354 * 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
|
8355 * 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
|
8356 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
|
8357 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8358 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
|
8359 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
|
8360 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8361 else |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8362 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8363 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
|
8364 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8365 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
|
8366 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
|
8367 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8368 #ifdef FEAT_TERMGUICOLORS |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8369 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
|
8370 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8371 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
|
8372 term_bg_rgb_color(aep->ae_u.cterm.bg_rgb); |
| 7 | 8373 } |
| 8374 else | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8375 #endif |
|
13339
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8376 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
|
8377 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8378 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
|
8379 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
|
8380 } |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8381 |
|
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
|
8382 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
|
8383 { |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8384 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
|
8385 out_str(aep->ae_u.term.start); |
| 7 | 8386 } |
| 8387 } | |
| 8388 } | |
| 8389 } | |
| 8390 } | |
| 8391 | |
| 8392 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8393 screen_stop_highlight(void) |
| 7 | 8394 { |
| 8395 int do_ME = FALSE; /* output T_ME code */ | |
| 8396 | |
| 8397 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
|
8398 #ifdef MSWIN |
| 7 | 8399 && termcap_active |
| 8400 #endif | |
| 8401 ) | |
| 8402 { | |
| 8403 #ifdef FEAT_GUI | |
| 8404 if (gui.in_use) | |
| 8405 { | |
| 8406 char buf[20]; | |
| 8407 | |
| 8408 /* use internal GUI code */ | |
| 8409 sprintf(buf, IF_EB("\033|%dH", ESC_STR "|%dH"), screen_attr); | |
| 8410 OUT_STR(buf); | |
| 8411 } | |
| 8412 else | |
| 8413 #endif | |
| 8414 { | |
| 8415 if (screen_attr > HL_ALL) /* special HL attr. */ | |
| 8416 { | |
| 8417 attrentry_T *aep; | |
| 8418 | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8419 if (IS_CTERM) |
| 7 | 8420 { |
| 8421 /* | |
| 8422 * Assume that t_me restores the original colors! | |
| 8423 */ | |
| 8424 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
|
8425 if (aep != NULL && (( |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8426 #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
|
8427 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
|
8428 ? 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
|
8429 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8430 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8431 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
|
8432 #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
|
8433 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
|
8434 ? 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
|
8435 : |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8436 #endif |
|
da2a9e217200
patch 8.0.1544: when using 'termguicolors' SpellBad doesn't show
Christian Brabandt <cb@256bit.org>
parents:
13314
diff
changeset
|
8437 aep->ae_u.cterm.bg_color))) |
| 7 | 8438 do_ME = TRUE; |
| 8439 } | |
| 8440 else | |
| 8441 { | |
| 8442 aep = syn_term_attr2entry(screen_attr); | |
| 8443 if (aep != NULL && aep->ae_u.term.stop != NULL) | |
| 8444 { | |
| 8445 if (STRCMP(aep->ae_u.term.stop, T_ME) == 0) | |
| 8446 do_ME = TRUE; | |
| 8447 else | |
| 8448 out_str(aep->ae_u.term.stop); | |
| 8449 } | |
| 8450 } | |
| 8451 if (aep == NULL) /* did ":syntax clear" */ | |
| 8452 screen_attr = 0; | |
| 8453 else | |
| 8454 screen_attr = aep->ae_attr; | |
| 8455 } | |
| 8456 | |
| 8457 /* | |
| 8458 * Often all ending-codes are equal to T_ME. Avoid outputting the | |
| 8459 * same sequence several times. | |
| 8460 */ | |
| 8461 if (screen_attr & HL_STANDOUT) | |
| 8462 { | |
| 8463 if (STRCMP(T_SE, T_ME) == 0) | |
| 8464 do_ME = TRUE; | |
| 8465 else | |
| 8466 out_str(T_SE); | |
| 8467 } | |
|
13094
72366f4e3264
patch 8.0.1422: no fallback to underline when undercurl is not set
Christian Brabandt <cb@256bit.org>
parents:
13024
diff
changeset
|
8468 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
|
8469 { |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8470 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
|
8471 do_ME = TRUE; |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8472 else |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8473 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
|
8474 } |
|
339681756948
patch 8.0.1358: undercurl is not used in the terminal
Christian Brabandt <cb@256bit.org>
parents:
12700
diff
changeset
|
8475 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
|
8476 || ((screen_attr & HL_UNDERCURL) && *T_UCE == NUL)) |
| 7 | 8477 { |
| 8478 if (STRCMP(T_UE, T_ME) == 0) | |
| 8479 do_ME = TRUE; | |
| 8480 else | |
| 8481 out_str(T_UE); | |
| 8482 } | |
| 8483 if (screen_attr & HL_ITALIC) | |
| 8484 { | |
| 8485 if (STRCMP(T_CZR, T_ME) == 0) | |
| 8486 do_ME = TRUE; | |
| 8487 else | |
| 8488 out_str(T_CZR); | |
| 8489 } | |
|
12317
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8490 if (screen_attr & HL_STRIKETHROUGH) |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8491 { |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8492 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
|
8493 do_ME = TRUE; |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8494 else |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8495 out_str(T_STE); |
|
2a8890b80923
patch 8.0.1038: strike-through text not supported
Christian Brabandt <cb@256bit.org>
parents:
12293
diff
changeset
|
8496 } |
| 7 | 8497 if (do_ME || (screen_attr & (HL_BOLD | HL_INVERSE))) |
| 8498 out_str(T_ME); | |
| 8499 | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8500 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8501 if (p_tgc) |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8502 { |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8503 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
|
8504 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
|
8505 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
|
8506 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
|
8507 } |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8508 else |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8509 #endif |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8510 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8511 if (t_colors > 1) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8512 { |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8513 /* set Normal cterm colors */ |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8514 if (cterm_normal_fg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8515 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
|
8516 if (cterm_normal_bg_color != 0) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8517 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
|
8518 if (cterm_normal_fg_bold) |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8519 out_str(T_MD); |
|
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8520 } |
| 7 | 8521 } |
| 8522 } | |
| 8523 } | |
| 8524 screen_attr = 0; | |
| 8525 } | |
| 8526 | |
| 8527 /* | |
| 8528 * Reset the colors for a cterm. Used when leaving Vim. | |
| 8529 * The machine specific code may override this again. | |
| 8530 */ | |
| 8531 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8532 reset_cterm_colors(void) |
| 7 | 8533 { |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8534 if (IS_CTERM) |
| 7 | 8535 { |
| 8536 /* set Normal cterm colors */ | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
8537 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8538 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
|
8539 || cterm_normal_bg_gui_color != INVALCOLOR) |
|
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
8540 : (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
|
8541 #else |
| 7 | 8542 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
|
8543 #endif |
| 7 | 8544 { |
| 8545 out_str(T_OP); | |
| 8546 screen_attr = -1; | |
| 8547 } | |
| 8548 if (cterm_normal_fg_bold) | |
| 8549 { | |
| 8550 out_str(T_ME); | |
| 8551 screen_attr = -1; | |
| 8552 } | |
| 8553 } | |
| 8554 } | |
| 8555 | |
| 8556 /* | |
| 8557 * Put character ScreenLines["off"] on the screen at position "row" and "col", | |
| 8558 * using the attributes from ScreenAttrs["off"]. | |
| 8559 */ | |
| 8560 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8561 screen_char(unsigned off, int row, int col) |
| 7 | 8562 { |
| 8563 int attr; | |
| 8564 | |
| 8565 /* Check for illegal values, just in case (could happen just after | |
| 8566 * resizing). */ | |
| 8567 if (row >= screen_Rows || col >= screen_Columns) | |
| 8568 return; | |
| 8569 | |
|
15521
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8570 #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
|
8571 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
|
8572 return; |
|
6d949e552e99
patch 8.1.0768: updating completions may cause the popup menu to flicker
Bram Moolenaar <Bram@vim.org>
parents:
15502
diff
changeset
|
8573 #endif |
| 6602 | 8574 /* Outputting a character in the last cell on the screen may scroll the |
| 8575 * screen up. Only do it when the "xn" termcap property is set, otherwise | |
| 8576 * mark the character invalid (update it when scrolled up). */ | |
| 8577 if (*T_XN == NUL | |
| 8578 && row == screen_Rows - 1 && col == screen_Columns - 1 | |
| 7 | 8579 #ifdef FEAT_RIGHTLEFT |
| 8580 /* account for first command-line character in rightleft mode */ | |
| 8581 && !cmdmsg_rl | |
| 8582 #endif | |
| 8583 ) | |
| 8584 { | |
| 8585 ScreenAttrs[off] = (sattr_T)-1; | |
| 8586 return; | |
| 8587 } | |
| 8588 | |
| 8589 /* | |
| 8590 * Stop highlighting first, so it's easier to move the cursor. | |
| 8591 */ | |
| 8592 if (screen_char_attr != 0) | |
| 8593 attr = screen_char_attr; | |
| 8594 else | |
| 8595 attr = ScreenAttrs[off]; | |
| 8596 if (screen_attr != attr) | |
| 8597 screen_stop_highlight(); | |
| 8598 | |
| 8599 windgoto(row, col); | |
| 8600 | |
| 8601 if (screen_attr != attr) | |
| 8602 screen_start_highlight(attr); | |
| 8603 | |
| 8604 if (enc_utf8 && ScreenLinesUC[off] != 0) | |
| 8605 { | |
| 8606 char_u buf[MB_MAXBYTES + 1]; | |
| 8607 | |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8608 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
|
8609 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8610 if (*p_ambw == 'd' |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8611 #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
|
8612 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8613 #endif |
|
13024
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8614 ) |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8615 { |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8616 /* 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
|
8617 * 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
|
8618 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
|
8619 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
|
8620 } |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8621 /* 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
|
8622 * character */ |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8623 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
|
8624 } |
|
8819
a1132255e3e1
commit https://github.com/vim/vim/commit/cb0700844c1274fe8bc0ceaffaee0ad21c406f30
Christian Brabandt <cb@256bit.org>
parents:
8817
diff
changeset
|
8625 else if (utf_char2cells(ScreenLinesUC[off]) > 1) |
| 7 | 8626 ++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
|
8627 |
|
27934188d7b5
patch 8.0.1388: char not overwritten with ambiguous width char
Christian Brabandt <cb@256bit.org>
parents:
12998
diff
changeset
|
8628 /* 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
|
8629 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
|
8630 out_str(buf); |
| 7 | 8631 } |
| 8632 else | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8633 { |
| 7 | 8634 out_flush_check(); |
| 8635 out_char(ScreenLines[off]); | |
| 8636 /* double-byte character in single-width cell */ | |
| 8637 if (enc_dbcs == DBCS_JPNU && ScreenLines[off] == 0x8e) | |
| 8638 out_char(ScreenLines2[off]); | |
| 8639 } | |
| 8640 | |
| 8641 screen_cur_col++; | |
| 8642 } | |
| 8643 | |
| 8644 /* | |
| 8645 * Used for enc_dbcs only: Put one double-wide character at ScreenLines["off"] | |
| 8646 * on the screen at position 'row' and 'col'. | |
| 8647 * The attributes of the first byte is used for all. This is required to | |
| 8648 * output the two bytes of a double-byte character with nothing in between. | |
| 8649 */ | |
| 8650 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8651 screen_char_2(unsigned off, int row, int col) |
| 7 | 8652 { |
| 8653 /* Check for illegal values (could be wrong when screen was resized). */ | |
| 8654 if (off + 1 >= (unsigned)(screen_Rows * screen_Columns)) | |
| 8655 return; | |
| 8656 | |
| 8657 /* Outputting the last character on the screen may scrollup the screen. | |
| 8658 * Don't to it! Mark the character invalid (update it when scrolled up) */ | |
| 8659 if (row == screen_Rows - 1 && col >= screen_Columns - 2) | |
| 8660 { | |
| 8661 ScreenAttrs[off] = (sattr_T)-1; | |
| 8662 return; | |
| 8663 } | |
| 8664 | |
| 8665 /* Output the first byte normally (positions the cursor), then write the | |
| 8666 * second byte directly. */ | |
| 8667 screen_char(off, row, col); | |
| 8668 out_char(ScreenLines[off + 1]); | |
| 8669 ++screen_cur_col; | |
| 8670 } | |
| 8671 | |
| 8672 /* | |
| 8673 * Draw a rectangle of the screen, inverted when "invert" is TRUE. | |
| 8674 * This uses the contents of ScreenLines[] and doesn't change it. | |
| 8675 */ | |
| 8676 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8677 screen_draw_rectangle( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8678 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8679 int col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8680 int height, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8681 int width, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8682 int invert) |
| 7 | 8683 { |
| 8684 int r, c; | |
| 8685 int off; | |
| 1378 | 8686 int max_off; |
| 7 | 8687 |
| 534 | 8688 /* Can't use ScreenLines unless initialized */ |
| 8689 if (ScreenLines == NULL) | |
| 8690 return; | |
| 8691 | |
| 7 | 8692 if (invert) |
| 8693 screen_char_attr = HL_INVERSE; | |
| 8694 for (r = row; r < row + height; ++r) | |
| 8695 { | |
| 8696 off = LineOffset[r]; | |
| 1378 | 8697 max_off = off + screen_Columns; |
| 7 | 8698 for (c = col; c < col + width; ++c) |
| 8699 { | |
| 1378 | 8700 if (enc_dbcs != 0 && dbcs_off2cells(off + c, max_off) > 1) |
| 7 | 8701 { |
| 8702 screen_char_2(off + c, r, c); | |
| 8703 ++c; | |
| 8704 } | |
| 8705 else | |
| 8706 { | |
| 8707 screen_char(off + c, r, c); | |
| 1378 | 8708 if (utf_off2cells(off + c, max_off) > 1) |
| 7 | 8709 ++c; |
| 8710 } | |
| 8711 } | |
| 8712 } | |
| 8713 screen_char_attr = 0; | |
| 8714 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
8715 |
| 7 | 8716 /* |
| 8717 * Redraw the characters for a vertically split window. | |
| 8718 */ | |
| 8719 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8720 redraw_block(int row, int end, win_T *wp) |
| 7 | 8721 { |
| 8722 int col; | |
| 8723 int width; | |
| 8724 | |
| 8725 # ifdef FEAT_CLIPBOARD | |
| 8726 clip_may_clear_selection(row, end - 1); | |
| 8727 # endif | |
| 8728 | |
| 8729 if (wp == NULL) | |
| 8730 { | |
| 8731 col = 0; | |
| 8732 width = Columns; | |
| 8733 } | |
| 8734 else | |
| 8735 { | |
| 8736 col = wp->w_wincol; | |
| 8737 width = wp->w_width; | |
| 8738 } | |
| 8739 screen_draw_rectangle(row, col, end - row, width, FALSE); | |
| 8740 } | |
| 8741 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8742 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8743 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
|
8744 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8745 ScreenLines[off] = ' '; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8746 ScreenAttrs[off] = attr; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8747 if (enc_utf8) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8748 ScreenLinesUC[off] = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8749 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8750 |
| 7 | 8751 /* |
| 8752 * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' | |
| 8753 * with character 'c1' in first column followed by 'c2' in the other columns. | |
| 8754 * Use attributes 'attr'. | |
| 8755 */ | |
| 8756 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8757 screen_fill( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8758 int start_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8759 int end_row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8760 int start_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8761 int end_col, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8762 int c1, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8763 int c2, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8764 int attr) |
| 7 | 8765 { |
| 8766 int row; | |
| 8767 int col; | |
| 8768 int off; | |
| 8769 int end_off; | |
| 8770 int did_delete; | |
| 8771 int c; | |
| 8772 int norm_term; | |
| 8773 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8774 int force_next = FALSE; | |
| 8775 #endif | |
| 8776 | |
| 8777 if (end_row > screen_Rows) /* safety check */ | |
| 8778 end_row = screen_Rows; | |
| 8779 if (end_col > screen_Columns) /* safety check */ | |
| 8780 end_col = screen_Columns; | |
| 8781 if (ScreenLines == NULL | |
| 8782 || start_row >= end_row | |
| 8783 || start_col >= end_col) /* nothing to do */ | |
| 8784 return; | |
| 8785 | |
| 8786 /* it's a "normal" terminal when not in a GUI or cterm */ | |
| 8787 norm_term = ( | |
| 8788 #ifdef FEAT_GUI | |
| 8789 !gui.in_use && | |
| 8790 #endif | |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
8791 !IS_CTERM); |
| 7 | 8792 for (row = start_row; row < end_row; ++row) |
| 8793 { | |
| 1668 | 8794 if (has_mbyte |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8795 #ifdef FEAT_GUI |
| 1668 | 8796 && !gui.in_use |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
8797 #endif |
| 1668 | 8798 ) |
| 8799 { | |
| 8800 /* When drawing over the right halve of a double-wide char clear | |
| 8801 * out the left halve. When drawing over the left halve of a | |
| 8802 * double wide-char clear out the right halve. Only needed in a | |
| 8803 * terminal. */ | |
| 1685 | 8804 if (start_col > 0 && mb_fix_col(start_col, row) != start_col) |
| 1670 | 8805 screen_puts_len((char_u *)" ", 1, row, start_col - 1, 0); |
| 1677 | 8806 if (end_col < screen_Columns && mb_fix_col(end_col, row) != end_col) |
| 1670 | 8807 screen_puts_len((char_u *)" ", 1, row, end_col, 0); |
| 1668 | 8808 } |
| 7 | 8809 /* |
| 8810 * Try to use delete-line termcap code, when no attributes or in a | |
| 8811 * "normal" terminal, where a bold/italic space is just a | |
| 8812 * space. | |
| 8813 */ | |
| 8814 did_delete = FALSE; | |
| 8815 if (c2 == ' ' | |
| 8816 && end_col == Columns | |
| 8817 && can_clear(T_CE) | |
| 8818 && (attr == 0 | |
| 8819 || (norm_term | |
| 8820 && attr <= HL_ALL | |
| 8821 && ((attr & ~(HL_BOLD | HL_ITALIC)) == 0)))) | |
| 8822 { | |
| 8823 /* | |
| 8824 * check if we really need to clear something | |
| 8825 */ | |
| 8826 col = start_col; | |
| 8827 if (c1 != ' ') /* don't clear first char */ | |
| 8828 ++col; | |
| 8829 | |
| 8830 off = LineOffset[row] + col; | |
| 8831 end_off = LineOffset[row] + end_col; | |
| 8832 | |
| 8833 /* skip blanks (used often, keep it fast!) */ | |
| 8834 if (enc_utf8) | |
| 8835 while (off < end_off && ScreenLines[off] == ' ' | |
| 8836 && ScreenAttrs[off] == 0 && ScreenLinesUC[off] == 0) | |
| 8837 ++off; | |
| 8838 else | |
| 8839 while (off < end_off && ScreenLines[off] == ' ' | |
| 8840 && ScreenAttrs[off] == 0) | |
| 8841 ++off; | |
| 8842 if (off < end_off) /* something to be cleared */ | |
| 8843 { | |
| 8844 col = off - LineOffset[row]; | |
| 8845 screen_stop_highlight(); | |
| 8846 term_windgoto(row, col);/* clear rest of this screen line */ | |
| 8847 out_str(T_CE); | |
| 8848 screen_start(); /* don't know where cursor is now */ | |
| 8849 col = end_col - col; | |
| 8850 while (col--) /* clear chars in ScreenLines */ | |
| 8851 { | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
8852 space_to_screenline(off, 0); |
| 7 | 8853 ++off; |
| 8854 } | |
| 8855 } | |
| 8856 did_delete = TRUE; /* the chars are cleared now */ | |
| 8857 } | |
| 8858 | |
| 8859 off = LineOffset[row] + start_col; | |
| 8860 c = c1; | |
| 8861 for (col = start_col; col < end_col; ++col) | |
| 8862 { | |
| 8863 if (ScreenLines[off] != c | |
| 714 | 8864 || (enc_utf8 && (int)ScreenLinesUC[off] |
| 8865 != (c >= 0x80 ? c : 0)) | |
| 7 | 8866 || ScreenAttrs[off] != attr |
| 8867 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8868 || force_next | |
| 8869 #endif | |
| 8870 ) | |
| 8871 { | |
| 8872 #if defined(FEAT_GUI) || defined(UNIX) | |
| 8873 /* The bold trick may make a single row of pixels appear in | |
| 8874 * the next character. When a bold character is removed, the | |
| 8875 * next character should be redrawn too. This happens for our | |
| 8876 * own GUI and for some xterms. */ | |
| 8877 if ( | |
| 8878 # ifdef FEAT_GUI | |
| 8879 gui.in_use | |
| 8880 # endif | |
| 8881 # if defined(FEAT_GUI) && defined(UNIX) | |
| 8882 || | |
| 8883 # endif | |
| 8884 # ifdef UNIX | |
| 8885 term_is_xterm | |
| 8886 # endif | |
| 8887 ) | |
| 8888 { | |
| 8889 if (ScreenLines[off] != ' ' | |
| 8890 && (ScreenAttrs[off] > HL_ALL | |
| 8891 || ScreenAttrs[off] & HL_BOLD)) | |
| 8892 force_next = TRUE; | |
| 8893 else | |
| 8894 force_next = FALSE; | |
| 8895 } | |
| 8896 #endif | |
| 8897 ScreenLines[off] = c; | |
| 8898 if (enc_utf8) | |
| 8899 { | |
| 8900 if (c >= 0x80) | |
| 8901 { | |
| 8902 ScreenLinesUC[off] = c; | |
| 714 | 8903 ScreenLinesC[0][off] = 0; |
| 7 | 8904 } |
| 8905 else | |
| 8906 ScreenLinesUC[off] = 0; | |
| 8907 } | |
| 8908 ScreenAttrs[off] = attr; | |
| 8909 if (!did_delete || c != ' ') | |
| 8910 screen_char(off, row, col); | |
| 8911 } | |
| 8912 ++off; | |
| 8913 if (col == start_col) | |
| 8914 { | |
| 8915 if (did_delete) | |
| 8916 break; | |
| 8917 c = c2; | |
| 8918 } | |
| 8919 } | |
| 8920 if (end_col == Columns) | |
| 8921 LineWraps[row] = FALSE; | |
| 8922 if (row == Rows - 1) /* overwritten the command line */ | |
| 8923 { | |
| 8924 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
|
8925 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
|
8926 && c1 == ' ' && c2 == ' ' && attr == 0) |
| 7 | 8927 clear_cmdline = FALSE; /* command line has been cleared */ |
| 644 | 8928 if (start_col == 0) |
| 8929 mode_displayed = FALSE; /* mode cleared or overwritten */ | |
| 7 | 8930 } |
| 8931 } | |
| 8932 } | |
| 8933 | |
| 8934 /* | |
| 8935 * Check if there should be a delay. Used before clearing or redrawing the | |
| 8936 * screen or the command line. | |
| 8937 */ | |
| 8938 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8939 check_for_delay(int check_msg_scroll) |
| 7 | 8940 { |
| 8941 if ((emsg_on_display || (check_msg_scroll && msg_scroll)) | |
| 8942 && !did_wait_return | |
| 8943 && emsg_silent == 0) | |
| 8944 { | |
| 8945 out_flush(); | |
| 8946 ui_delay(1000L, TRUE); | |
| 8947 emsg_on_display = FALSE; | |
| 8948 if (check_msg_scroll) | |
| 8949 msg_scroll = FALSE; | |
| 8950 } | |
| 8951 } | |
| 8952 | |
| 8953 /* | |
|
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
|
8954 * 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
|
8955 */ |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8956 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
|
8957 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
|
8958 { |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8959 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
|
8960 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8961 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
|
8962 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
|
8963 } |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8964 |
|
57e0f6b4a87d
patch 8.1.1165: no test for mouse clicks in the terminal tabpage line
Bram Moolenaar <Bram@vim.org>
parents:
16211
diff
changeset
|
8965 /* |
| 7 | 8966 * screen_valid - allocate screen buffers if size changed |
| 3263 | 8967 * If "doclear" is TRUE: clear screen if it has been resized. |
| 7 | 8968 * Returns TRUE if there is a valid screen to write to. |
| 8969 * Returns FALSE when starting up and screen not initialized yet. | |
| 8970 */ | |
| 8971 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8972 screen_valid(int doclear) |
| 7 | 8973 { |
| 3263 | 8974 screenalloc(doclear); /* allocate screen buffers if size changed */ |
| 7 | 8975 return (ScreenLines != NULL); |
| 8976 } | |
| 8977 | |
| 8978 /* | |
| 8979 * Resize the shell to Rows and Columns. | |
| 8980 * Allocate ScreenLines[] and associated items. | |
| 8981 * | |
| 8982 * There may be some time between setting Rows and Columns and (re)allocating | |
| 8983 * ScreenLines[]. This happens when starting up and when (manually) changing | |
| 8984 * the shell size. Always use screen_Rows and screen_Columns to access items | |
| 8985 * in ScreenLines[]. Use Rows and Columns for positioning text etc. where the | |
| 8986 * final size of the shell is needed. | |
| 8987 */ | |
| 8988 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
8989 screenalloc(int doclear) |
| 7 | 8990 { |
| 8991 int new_row, old_row; | |
| 8992 #ifdef FEAT_GUI | |
| 8993 int old_Rows; | |
| 8994 #endif | |
| 8995 win_T *wp; | |
| 8996 int outofmem = FALSE; | |
| 8997 int len; | |
| 8998 schar_T *new_ScreenLines; | |
| 8999 u8char_T *new_ScreenLinesUC = NULL; | |
| 714 | 9000 u8char_T *new_ScreenLinesC[MAX_MCO]; |
| 7 | 9001 schar_T *new_ScreenLines2 = NULL; |
| 714 | 9002 int i; |
| 7 | 9003 sattr_T *new_ScreenAttrs; |
| 9004 unsigned *new_LineOffset; | |
| 9005 char_u *new_LineWraps; | |
| 681 | 9006 short *new_TabPageIdxs; |
| 671 | 9007 tabpage_T *tp; |
| 7 | 9008 static int entered = FALSE; /* avoid recursiveness */ |
| 944 | 9009 static int done_outofmem_msg = FALSE; /* did outofmem message */ |
| 1824 | 9010 int retry_count = 0; |
| 9011 | |
| 9012 retry: | |
| 7 | 9013 /* |
| 9014 * Allocation of the screen buffers is done only when the size changes and | |
| 9015 * when Rows and Columns have been set and we have started doing full | |
| 9016 * screen stuff. | |
| 9017 */ | |
| 9018 if ((ScreenLines != NULL | |
| 9019 && Rows == screen_Rows | |
| 9020 && Columns == screen_Columns | |
| 9021 && enc_utf8 == (ScreenLinesUC != NULL) | |
| 9022 && (enc_dbcs == DBCS_JPNU) == (ScreenLines2 != NULL) | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9023 && p_mco == Screen_mco) |
| 7 | 9024 || Rows == 0 |
| 9025 || Columns == 0 | |
| 9026 || (!full_screen && ScreenLines == NULL)) | |
| 9027 return; | |
| 9028 | |
| 9029 /* | |
| 9030 * It's possible that we produce an out-of-memory message below, which | |
| 9031 * will cause this function to be called again. To break the loop, just | |
| 9032 * return here. | |
| 9033 */ | |
| 9034 if (entered) | |
| 9035 return; | |
| 9036 entered = TRUE; | |
| 9037 | |
| 911 | 9038 /* |
| 9039 * Note that the window sizes are updated before reallocating the arrays, | |
| 9040 * thus we must not redraw here! | |
| 9041 */ | |
| 9042 ++RedrawingDisabled; | |
| 9043 | |
| 7 | 9044 win_new_shellsize(); /* fit the windows in the new sized shell */ |
| 9045 | |
| 9046 comp_col(); /* recompute columns for shown command and ruler */ | |
| 9047 | |
| 9048 /* | |
| 9049 * We're changing the size of the screen. | |
| 9050 * - Allocate new arrays for ScreenLines and ScreenAttrs. | |
| 9051 * - Move lines from the old arrays into the new arrays, clear extra | |
| 9052 * lines (unless the screen is going to be cleared). | |
| 9053 * - Free the old arrays. | |
| 9054 * | |
| 9055 * If anything fails, make ScreenLines NULL, so we don't do anything! | |
| 9056 * Continuing with the old ScreenLines may result in a crash, because the | |
| 9057 * size is wrong. | |
| 9058 */ | |
| 671 | 9059 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9060 win_free_lsize(wp); |
| 1946 | 9061 if (aucmd_win != NULL) |
| 9062 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
|
9063 #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
|
9064 // 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
|
9065 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
|
9066 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
|
9067 // 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
|
9068 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
|
9069 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
|
9070 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
|
9071 #endif |
| 7 | 9072 |
|
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
|
9073 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
|
9074 vim_memset(new_ScreenLinesC, 0, sizeof(u8char_T *) * MAX_MCO); |
| 7 | 9075 if (enc_utf8) |
| 9076 { | |
|
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
|
9077 new_ScreenLinesUC = LALLOC_MULT(u8char_T, (Rows + 1) * Columns); |
| 714 | 9078 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
|
9079 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
|
9080 (Rows + 1) * Columns); |
| 7 | 9081 } |
| 9082 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
|
9083 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
|
9084 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
|
9085 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
|
9086 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
|
9087 new_TabPageIdxs = LALLOC_MULT(short, Columns); |
| 7 | 9088 |
| 677 | 9089 FOR_ALL_TAB_WINDOWS(tp, wp) |
| 7 | 9090 { |
| 9091 if (win_alloc_lines(wp) == FAIL) | |
| 9092 { | |
| 9093 outofmem = TRUE; | |
| 1819 | 9094 goto give_up; |
| 9095 } | |
| 9096 } | |
| 1946 | 9097 if (aucmd_win != NULL && aucmd_win->w_lines == NULL |
| 9098 && win_alloc_lines(aucmd_win) == FAIL) | |
| 1906 | 9099 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
|
9100 #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
|
9101 // 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
|
9102 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
|
9103 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
|
9104 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9105 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
|
9106 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
|
9107 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9108 // 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
|
9109 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
|
9110 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
|
9111 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
|
9112 { |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9113 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
|
9114 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
|
9115 } |
|
473e76401434
patch 8.1.1442: popup windows not considered when the Vim window is resized
Bram Moolenaar <Bram@vim.org>
parents:
16880
diff
changeset
|
9116 #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
|
9117 |
| 1819 | 9118 give_up: |
| 7 | 9119 |
| 714 | 9120 for (i = 0; i < p_mco; ++i) |
| 9121 if (new_ScreenLinesC[i] == NULL) | |
| 9122 break; | |
| 7 | 9123 if (new_ScreenLines == NULL |
| 714 | 9124 || (enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco)) |
| 7 | 9125 || (enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL) |
| 9126 || new_ScreenAttrs == NULL | |
| 9127 || new_LineOffset == NULL | |
| 9128 || new_LineWraps == NULL | |
| 671 | 9129 || new_TabPageIdxs == NULL |
| 7 | 9130 || outofmem) |
| 9131 { | |
| 944 | 9132 if (ScreenLines != NULL || !done_outofmem_msg) |
| 534 | 9133 { |
| 9134 /* guess the size */ | |
| 9135 do_outofmem_msg((long_u)((Rows + 1) * Columns)); | |
| 9136 | |
| 9137 /* Remember we did this to avoid getting outofmem messages over | |
| 9138 * and over again. */ | |
| 944 | 9139 done_outofmem_msg = TRUE; |
| 534 | 9140 } |
|
13244
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9141 VIM_CLEAR(new_ScreenLines); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9142 VIM_CLEAR(new_ScreenLinesUC); |
| 714 | 9143 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
|
9144 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
|
9145 VIM_CLEAR(new_ScreenLines2); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9146 VIM_CLEAR(new_ScreenAttrs); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9147 VIM_CLEAR(new_LineOffset); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9148 VIM_CLEAR(new_LineWraps); |
|
ac42c4b11dbc
patch 8.0.1496: clearing a pointer takes two lines
Christian Brabandt <cb@256bit.org>
parents:
13204
diff
changeset
|
9149 VIM_CLEAR(new_TabPageIdxs); |
| 7 | 9150 } |
| 9151 else | |
| 9152 { | |
| 944 | 9153 done_outofmem_msg = FALSE; |
| 534 | 9154 |
| 7 | 9155 for (new_row = 0; new_row < Rows; ++new_row) |
| 9156 { | |
| 9157 new_LineOffset[new_row] = new_row * Columns; | |
| 9158 new_LineWraps[new_row] = FALSE; | |
| 9159 | |
| 9160 /* | |
| 9161 * If the screen is not going to be cleared, copy as much as | |
| 9162 * possible from the old screen to the new one and clear the rest | |
| 9163 * (used when resizing the window at the "--more--" prompt or when | |
| 9164 * executing an external command, for the GUI). | |
| 9165 */ | |
| 3263 | 9166 if (!doclear) |
| 7 | 9167 { |
| 9168 (void)vim_memset(new_ScreenLines + new_row * Columns, | |
| 9169 ' ', (size_t)Columns * sizeof(schar_T)); | |
| 9170 if (enc_utf8) | |
| 9171 { | |
| 9172 (void)vim_memset(new_ScreenLinesUC + new_row * Columns, | |
| 9173 0, (size_t)Columns * sizeof(u8char_T)); | |
| 714 | 9174 for (i = 0; i < p_mco; ++i) |
| 9175 (void)vim_memset(new_ScreenLinesC[i] | |
| 9176 + new_row * Columns, | |
| 7 | 9177 0, (size_t)Columns * sizeof(u8char_T)); |
| 9178 } | |
| 9179 if (enc_dbcs == DBCS_JPNU) | |
| 9180 (void)vim_memset(new_ScreenLines2 + new_row * Columns, | |
| 9181 0, (size_t)Columns * sizeof(schar_T)); | |
| 9182 (void)vim_memset(new_ScreenAttrs + new_row * Columns, | |
| 9183 0, (size_t)Columns * sizeof(sattr_T)); | |
| 9184 old_row = new_row + (screen_Rows - Rows); | |
| 534 | 9185 if (old_row >= 0 && ScreenLines != NULL) |
| 7 | 9186 { |
| 9187 if (screen_Columns < Columns) | |
| 9188 len = screen_Columns; | |
| 9189 else | |
| 9190 len = Columns; | |
| 571 | 9191 /* When switching to utf-8 don't copy characters, they |
| 714 | 9192 * may be invalid now. Also when p_mco changes. */ |
| 9193 if (!(enc_utf8 && ScreenLinesUC == NULL) | |
| 9194 && p_mco == Screen_mco) | |
| 26 | 9195 mch_memmove(new_ScreenLines + new_LineOffset[new_row], |
| 9196 ScreenLines + LineOffset[old_row], | |
| 9197 (size_t)len * sizeof(schar_T)); | |
| 714 | 9198 if (enc_utf8 && ScreenLinesUC != NULL |
| 9199 && p_mco == Screen_mco) | |
| 7 | 9200 { |
| 9201 mch_memmove(new_ScreenLinesUC + new_LineOffset[new_row], | |
| 9202 ScreenLinesUC + LineOffset[old_row], | |
| 9203 (size_t)len * sizeof(u8char_T)); | |
| 714 | 9204 for (i = 0; i < p_mco; ++i) |
| 9205 mch_memmove(new_ScreenLinesC[i] | |
| 9206 + new_LineOffset[new_row], | |
| 9207 ScreenLinesC[i] + LineOffset[old_row], | |
| 7 | 9208 (size_t)len * sizeof(u8char_T)); |
| 9209 } | |
| 9210 if (enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL) | |
| 9211 mch_memmove(new_ScreenLines2 + new_LineOffset[new_row], | |
| 9212 ScreenLines2 + LineOffset[old_row], | |
| 9213 (size_t)len * sizeof(schar_T)); | |
| 9214 mch_memmove(new_ScreenAttrs + new_LineOffset[new_row], | |
| 9215 ScreenAttrs + LineOffset[old_row], | |
| 9216 (size_t)len * sizeof(sattr_T)); | |
| 9217 } | |
| 9218 } | |
| 9219 } | |
| 9220 /* Use the last line of the screen for the current line. */ | |
| 9221 current_ScreenLine = new_ScreenLines + Rows * Columns; | |
| 9222 } | |
| 9223 | |
| 356 | 9224 free_screenlines(); |
| 9225 | |
| 7 | 9226 ScreenLines = new_ScreenLines; |
| 9227 ScreenLinesUC = new_ScreenLinesUC; | |
| 714 | 9228 for (i = 0; i < p_mco; ++i) |
| 9229 ScreenLinesC[i] = new_ScreenLinesC[i]; | |
| 9230 Screen_mco = p_mco; | |
| 7 | 9231 ScreenLines2 = new_ScreenLines2; |
| 9232 ScreenAttrs = new_ScreenAttrs; | |
| 9233 LineOffset = new_LineOffset; | |
| 9234 LineWraps = new_LineWraps; | |
| 671 | 9235 TabPageIdxs = new_TabPageIdxs; |
| 7 | 9236 |
| 9237 /* It's important that screen_Rows and screen_Columns reflect the actual | |
| 9238 * size of ScreenLines[]. Set them before calling anything. */ | |
| 9239 #ifdef FEAT_GUI | |
| 9240 old_Rows = screen_Rows; | |
| 9241 #endif | |
| 9242 screen_Rows = Rows; | |
| 9243 screen_Columns = Columns; | |
| 9244 | |
| 9245 must_redraw = CLEAR; /* need to clear the screen later */ | |
| 3263 | 9246 if (doclear) |
| 7 | 9247 screenclear2(); |
| 9248 #ifdef FEAT_GUI | |
| 9249 else if (gui.in_use | |
| 9250 && !gui.starting | |
| 9251 && ScreenLines != NULL | |
| 9252 && old_Rows != Rows) | |
| 9253 { | |
| 9254 (void)gui_redraw_block(0, 0, (int)Rows - 1, (int)Columns - 1, 0); | |
| 9255 /* | |
| 9256 * Adjust the position of the cursor, for when executing an external | |
| 9257 * command. | |
| 9258 */ | |
| 9259 if (msg_row >= Rows) /* Rows got smaller */ | |
| 9260 msg_row = Rows - 1; /* put cursor at last row */ | |
| 9261 else if (Rows > old_Rows) /* Rows got bigger */ | |
| 9262 msg_row += Rows - old_Rows; /* put cursor in same place */ | |
| 9263 if (msg_col >= Columns) /* Columns got smaller */ | |
| 9264 msg_col = Columns - 1; /* put cursor at last column */ | |
| 9265 } | |
| 9266 #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
|
9267 clear_TabPageIdxs(); |
| 7 | 9268 |
| 9269 entered = FALSE; | |
| 911 | 9270 --RedrawingDisabled; |
| 766 | 9271 |
| 1824 | 9272 /* |
| 9273 * Do not apply autocommands more than 3 times to avoid an endless loop | |
| 9274 * in case applying autocommands always changes Rows or Columns. | |
| 9275 */ | |
| 9276 if (starting == 0 && ++retry_count <= 3) | |
| 9277 { | |
| 766 | 9278 apply_autocmds(EVENT_VIMRESIZED, NULL, NULL, FALSE, curbuf); |
| 1824 | 9279 /* In rare cases, autocommands may have altered Rows or Columns, |
| 9280 * jump back to check if we need to allocate the screen again. */ | |
| 9281 goto retry; | |
| 9282 } | |
| 7 | 9283 } |
| 9284 | |
| 9285 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9286 free_screenlines(void) |
| 356 | 9287 { |
| 714 | 9288 int i; |
| 9289 | |
| 356 | 9290 vim_free(ScreenLinesUC); |
| 714 | 9291 for (i = 0; i < Screen_mco; ++i) |
| 9292 vim_free(ScreenLinesC[i]); | |
| 356 | 9293 vim_free(ScreenLines2); |
| 714 | 9294 vim_free(ScreenLines); |
| 356 | 9295 vim_free(ScreenAttrs); |
| 9296 vim_free(LineOffset); | |
| 9297 vim_free(LineWraps); | |
| 671 | 9298 vim_free(TabPageIdxs); |
| 356 | 9299 } |
| 9300 | |
| 9301 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9302 screenclear(void) |
| 7 | 9303 { |
| 9304 check_for_delay(FALSE); | |
| 9305 screenalloc(FALSE); /* allocate screen buffers if size changed */ | |
| 9306 screenclear2(); /* clear the screen */ | |
| 9307 } | |
| 9308 | |
| 9309 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9310 screenclear2(void) |
| 7 | 9311 { |
| 9312 int i; | |
| 9313 | |
| 9314 if (starting == NO_SCREEN || ScreenLines == NULL | |
| 9315 #ifdef FEAT_GUI | |
| 9316 || (gui.in_use && gui.starting) | |
| 9317 #endif | |
| 9318 ) | |
| 9319 return; | |
| 9320 | |
| 9321 #ifdef FEAT_GUI | |
| 9322 if (!gui.in_use) | |
| 9323 #endif | |
| 9324 screen_attr = -1; /* force setting the Normal colors */ | |
| 9325 screen_stop_highlight(); /* don't want highlighting here */ | |
| 9326 | |
| 9327 #ifdef FEAT_CLIPBOARD | |
| 9328 /* disable selection without redrawing it */ | |
| 9329 clip_scroll_selection(9999); | |
| 9330 #endif | |
| 9331 | |
| 9332 /* blank out ScreenLines */ | |
| 9333 for (i = 0; i < Rows; ++i) | |
| 9334 { | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9335 lineclear(LineOffset[i], (int)Columns, 0); |
| 7 | 9336 LineWraps[i] = FALSE; |
| 9337 } | |
| 9338 | |
| 9339 if (can_clear(T_CL)) | |
| 9340 { | |
| 9341 out_str(T_CL); /* clear the display */ | |
| 9342 clear_cmdline = FALSE; | |
| 644 | 9343 mode_displayed = FALSE; |
| 7 | 9344 } |
| 9345 else | |
| 9346 { | |
| 9347 /* can't clear the screen, mark all chars with invalid attributes */ | |
| 9348 for (i = 0; i < Rows; ++i) | |
| 9349 lineinvalid(LineOffset[i], (int)Columns); | |
| 9350 clear_cmdline = TRUE; | |
| 9351 } | |
| 9352 | |
| 9353 screen_cleared = TRUE; /* can use contents of ScreenLines now */ | |
| 9354 | |
| 9355 win_rest_invalid(firstwin); | |
| 9356 redraw_cmdline = TRUE; | |
| 673 | 9357 redraw_tabline = TRUE; |
| 7 | 9358 if (must_redraw == CLEAR) /* no need to clear again */ |
| 9359 must_redraw = NOT_VALID; | |
| 9360 compute_cmdrow(); | |
| 9361 msg_row = cmdline_row; /* put cursor on last line for messages */ | |
| 9362 msg_col = 0; | |
| 9363 screen_start(); /* don't know where cursor is now */ | |
| 9364 msg_scrolled = 0; /* can't scroll back */ | |
| 9365 msg_didany = FALSE; | |
| 9366 msg_didout = FALSE; | |
| 9367 } | |
| 9368 | |
| 9369 /* | |
| 9370 * Clear one line in ScreenLines. | |
| 9371 */ | |
| 9372 static void | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9373 lineclear(unsigned off, int width, int attr) |
| 7 | 9374 { |
| 9375 (void)vim_memset(ScreenLines + off, ' ', (size_t)width * sizeof(schar_T)); | |
| 9376 if (enc_utf8) | |
| 9377 (void)vim_memset(ScreenLinesUC + off, 0, | |
| 9378 (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
|
9379 (void)vim_memset(ScreenAttrs + off, attr, (size_t)width * sizeof(sattr_T)); |
| 7 | 9380 } |
| 9381 | |
| 9382 /* | |
| 9383 * Mark one line in ScreenLines invalid by setting the attributes to an | |
| 9384 * invalid value. | |
| 9385 */ | |
| 9386 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9387 lineinvalid(unsigned off, int width) |
| 7 | 9388 { |
| 9389 (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); | |
| 9390 } | |
| 9391 | |
| 9392 /* | |
| 9393 * Copy part of a Screenline for vertically split window "wp". | |
| 9394 */ | |
| 9395 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9396 linecopy(int to, int from, win_T *wp) |
| 7 | 9397 { |
| 9398 unsigned off_to = LineOffset[to] + wp->w_wincol; | |
| 9399 unsigned off_from = LineOffset[from] + wp->w_wincol; | |
| 9400 | |
| 9401 mch_memmove(ScreenLines + off_to, ScreenLines + off_from, | |
| 9402 wp->w_width * sizeof(schar_T)); | |
| 9403 if (enc_utf8) | |
| 9404 { | |
| 714 | 9405 int i; |
| 9406 | |
| 7 | 9407 mch_memmove(ScreenLinesUC + off_to, ScreenLinesUC + off_from, |
| 9408 wp->w_width * sizeof(u8char_T)); | |
| 714 | 9409 for (i = 0; i < p_mco; ++i) |
| 9410 mch_memmove(ScreenLinesC[i] + off_to, ScreenLinesC[i] + off_from, | |
| 9411 wp->w_width * sizeof(u8char_T)); | |
| 7 | 9412 } |
| 9413 if (enc_dbcs == DBCS_JPNU) | |
| 9414 mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, | |
| 9415 wp->w_width * sizeof(schar_T)); | |
| 9416 mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, | |
| 9417 wp->w_width * sizeof(sattr_T)); | |
| 9418 } | |
| 9419 | |
| 9420 /* | |
| 9421 * Return TRUE if clearing with term string "p" would work. | |
| 9422 * It can't work when the string is empty or it won't set the right background. | |
| 9423 */ | |
| 9424 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9425 can_clear(char_u *p) |
| 7 | 9426 { |
| 9427 return (*p != NUL && (t_colors <= 1 | |
| 9428 #ifdef FEAT_GUI | |
| 9429 || gui.in_use | |
| 9430 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
9431 #ifdef FEAT_TERMGUICOLORS |
|
9939
ccb6461b82df
commit https://github.com/vim/vim/commit/1b58cdd160c2e0ada0f638679a2aa27e4665fc48
Christian Brabandt <cb@256bit.org>
parents:
9885
diff
changeset
|
9432 || (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
|
9433 || (!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
|
9434 #else |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9435 || cterm_normal_bg_color == 0 |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9436 #endif |
|
b6472fd9f5ba
commit https://github.com/vim/vim/commit/d18f672fc9477f3c0cb7cc4ce8d9237ed825c612
Christian Brabandt <cb@256bit.org>
parents:
9282
diff
changeset
|
9437 || *T_UT != NUL)); |
| 7 | 9438 } |
| 9439 | |
| 9440 /* | |
| 9441 * Reset cursor position. Use whenever cursor was moved because of outputting | |
| 9442 * something directly to the screen (shell commands) or a terminal control | |
| 9443 * code. | |
| 9444 */ | |
| 9445 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9446 screen_start(void) |
| 7 | 9447 { |
| 9448 screen_cur_row = screen_cur_col = 9999; | |
| 9449 } | |
| 9450 | |
| 9451 /* | |
| 9452 * Move the cursor to position "row","col" in the screen. | |
| 9453 * This tries to find the most efficient way to move, minimizing the number of | |
| 9454 * characters sent to the terminal. | |
| 9455 */ | |
| 9456 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9457 windgoto(int row, int col) |
| 7 | 9458 { |
| 205 | 9459 sattr_T *p; |
| 7 | 9460 int i; |
| 9461 int plan; | |
| 9462 int cost; | |
| 9463 int wouldbe_col; | |
| 9464 int noinvcurs; | |
| 9465 char_u *bs; | |
| 9466 int goto_cost; | |
| 9467 int attr; | |
| 9468 | |
| 1213 | 9469 #define GOTO_COST 7 /* assume a term_windgoto() takes about 7 chars */ |
| 7 | 9470 #define HIGHL_COST 5 /* assume unhighlight takes 5 chars */ |
| 9471 | |
| 9472 #define PLAN_LE 1 | |
| 9473 #define PLAN_CR 2 | |
| 9474 #define PLAN_NL 3 | |
| 9475 #define PLAN_WRITE 4 | |
| 9476 /* Can't use ScreenLines unless initialized */ | |
| 9477 if (ScreenLines == NULL) | |
| 9478 return; | |
| 9479 | |
| 9480 if (col != screen_cur_col || row != screen_cur_row) | |
| 9481 { | |
| 9482 /* Check for valid position. */ | |
| 9483 if (row < 0) /* window without text lines? */ | |
| 9484 row = 0; | |
| 9485 if (row >= screen_Rows) | |
| 9486 row = screen_Rows - 1; | |
| 9487 if (col >= screen_Columns) | |
| 9488 col = screen_Columns - 1; | |
| 9489 | |
| 9490 /* check if no cursor movement is allowed in highlight mode */ | |
| 9491 if (screen_attr && *T_MS == NUL) | |
| 9492 noinvcurs = HIGHL_COST; | |
| 9493 else | |
| 9494 noinvcurs = 0; | |
| 9495 goto_cost = GOTO_COST + noinvcurs; | |
| 9496 | |
| 9497 /* | |
| 9498 * Plan how to do the positioning: | |
| 9499 * 1. Use CR to move it to column 0, same row. | |
| 9500 * 2. Use T_LE to move it a few columns to the left. | |
| 9501 * 3. Use NL to move a few lines down, column 0. | |
| 9502 * 4. Move a few columns to the right with T_ND or by writing chars. | |
| 9503 * | |
| 9504 * Don't do this if the cursor went beyond the last column, the cursor | |
| 9505 * position is unknown then (some terminals wrap, some don't ) | |
| 9506 * | |
| 1213 | 9507 * First check if the highlighting attributes allow us to write |
| 7 | 9508 * characters to move the cursor to the right. |
| 9509 */ | |
| 9510 if (row >= screen_cur_row && screen_cur_col < Columns) | |
| 9511 { | |
| 9512 /* | |
| 9513 * If the cursor is in the same row, bigger col, we can use CR | |
| 9514 * or T_LE. | |
| 9515 */ | |
| 9516 bs = NULL; /* init for GCC */ | |
| 9517 attr = screen_attr; | |
| 9518 if (row == screen_cur_row && col < screen_cur_col) | |
| 9519 { | |
| 9520 /* "le" is preferred over "bc", because "bc" is obsolete */ | |
| 9521 if (*T_LE) | |
| 9522 bs = T_LE; /* "cursor left" */ | |
| 9523 else | |
| 9524 bs = T_BC; /* "backspace character (old) */ | |
| 9525 if (*bs) | |
| 9526 cost = (screen_cur_col - col) * (int)STRLEN(bs); | |
| 9527 else | |
| 9528 cost = 999; | |
| 9529 if (col + 1 < cost) /* using CR is less characters */ | |
| 9530 { | |
| 9531 plan = PLAN_CR; | |
| 9532 wouldbe_col = 0; | |
| 9533 cost = 1; /* CR is just one character */ | |
| 9534 } | |
| 9535 else | |
| 9536 { | |
| 9537 plan = PLAN_LE; | |
| 9538 wouldbe_col = col; | |
| 9539 } | |
| 9540 if (noinvcurs) /* will stop highlighting */ | |
| 9541 { | |
| 9542 cost += noinvcurs; | |
| 9543 attr = 0; | |
| 9544 } | |
| 9545 } | |
| 9546 | |
| 9547 /* | |
| 9548 * If the cursor is above where we want to be, we can use CR LF. | |
| 9549 */ | |
| 9550 else if (row > screen_cur_row) | |
| 9551 { | |
| 9552 plan = PLAN_NL; | |
| 9553 wouldbe_col = 0; | |
| 9554 cost = (row - screen_cur_row) * 2; /* CR LF */ | |
| 9555 if (noinvcurs) /* will stop highlighting */ | |
| 9556 { | |
| 9557 cost += noinvcurs; | |
| 9558 attr = 0; | |
| 9559 } | |
| 9560 } | |
| 9561 | |
| 9562 /* | |
| 9563 * If the cursor is in the same row, smaller col, just use write. | |
| 9564 */ | |
| 9565 else | |
| 9566 { | |
| 9567 plan = PLAN_WRITE; | |
| 9568 wouldbe_col = screen_cur_col; | |
| 9569 cost = 0; | |
| 9570 } | |
| 9571 | |
| 9572 /* | |
| 9573 * Check if any characters that need to be written have the | |
| 9574 * correct attributes. Also avoid UTF-8 characters. | |
| 9575 */ | |
| 9576 i = col - wouldbe_col; | |
| 9577 if (i > 0) | |
| 9578 cost += i; | |
| 9579 if (cost < goto_cost && i > 0) | |
| 9580 { | |
| 9581 /* | |
| 9582 * Check if the attributes are correct without additionally | |
| 9583 * stopping highlighting. | |
| 9584 */ | |
| 9585 p = ScreenAttrs + LineOffset[row] + wouldbe_col; | |
| 9586 while (i && *p++ == attr) | |
| 9587 --i; | |
| 9588 if (i != 0) | |
| 9589 { | |
| 9590 /* | |
| 9591 * Try if it works when highlighting is stopped here. | |
| 9592 */ | |
| 9593 if (*--p == 0) | |
| 9594 { | |
| 9595 cost += noinvcurs; | |
| 9596 while (i && *p++ == 0) | |
| 9597 --i; | |
| 9598 } | |
| 9599 if (i != 0) | |
| 9600 cost = 999; /* different attributes, don't do it */ | |
| 9601 } | |
| 9602 if (enc_utf8) | |
| 9603 { | |
| 9604 /* Don't use an UTF-8 char for positioning, it's slow. */ | |
| 9605 for (i = wouldbe_col; i < col; ++i) | |
| 9606 if (ScreenLinesUC[LineOffset[row] + i] != 0) | |
| 9607 { | |
| 9608 cost = 999; | |
| 9609 break; | |
| 9610 } | |
| 9611 } | |
| 9612 } | |
| 9613 | |
| 9614 /* | |
| 9615 * We can do it without term_windgoto()! | |
| 9616 */ | |
| 9617 if (cost < goto_cost) | |
| 9618 { | |
| 9619 if (plan == PLAN_LE) | |
| 9620 { | |
| 9621 if (noinvcurs) | |
| 9622 screen_stop_highlight(); | |
| 9623 while (screen_cur_col > col) | |
| 9624 { | |
| 9625 out_str(bs); | |
| 9626 --screen_cur_col; | |
| 9627 } | |
| 9628 } | |
| 9629 else if (plan == PLAN_CR) | |
| 9630 { | |
| 9631 if (noinvcurs) | |
| 9632 screen_stop_highlight(); | |
| 9633 out_char('\r'); | |
| 9634 screen_cur_col = 0; | |
| 9635 } | |
| 9636 else if (plan == PLAN_NL) | |
| 9637 { | |
| 9638 if (noinvcurs) | |
| 9639 screen_stop_highlight(); | |
| 9640 while (screen_cur_row < row) | |
| 9641 { | |
| 9642 out_char('\n'); | |
| 9643 ++screen_cur_row; | |
| 9644 } | |
| 9645 screen_cur_col = 0; | |
| 9646 } | |
| 9647 | |
| 9648 i = col - screen_cur_col; | |
| 9649 if (i > 0) | |
| 9650 { | |
| 9651 /* | |
| 9652 * Use cursor-right if it's one character only. Avoids | |
| 9653 * removing a line of pixels from the last bold char, when | |
| 9654 * using the bold trick in the GUI. | |
| 9655 */ | |
| 9656 if (T_ND[0] != NUL && T_ND[1] == NUL) | |
| 9657 { | |
| 9658 while (i-- > 0) | |
| 9659 out_char(*T_ND); | |
| 9660 } | |
| 9661 else | |
| 9662 { | |
| 9663 int off; | |
| 9664 | |
| 9665 off = LineOffset[row] + screen_cur_col; | |
| 9666 while (i-- > 0) | |
| 9667 { | |
| 9668 if (ScreenAttrs[off] != screen_attr) | |
| 9669 screen_stop_highlight(); | |
| 9670 out_flush_check(); | |
| 9671 out_char(ScreenLines[off]); | |
| 9672 if (enc_dbcs == DBCS_JPNU | |
| 9673 && ScreenLines[off] == 0x8e) | |
| 9674 out_char(ScreenLines2[off]); | |
| 9675 ++off; | |
| 9676 } | |
| 9677 } | |
| 9678 } | |
| 9679 } | |
| 9680 } | |
| 9681 else | |
| 9682 cost = 999; | |
| 9683 | |
| 9684 if (cost >= goto_cost) | |
| 9685 { | |
| 9686 if (noinvcurs) | |
| 9687 screen_stop_highlight(); | |
| 5995 | 9688 if (row == screen_cur_row && (col > screen_cur_col) |
| 9689 && *T_CRI != NUL) | |
| 7 | 9690 term_cursor_right(col - screen_cur_col); |
| 9691 else | |
| 9692 term_windgoto(row, col); | |
| 9693 } | |
| 9694 screen_cur_row = row; | |
| 9695 screen_cur_col = col; | |
| 9696 } | |
| 9697 } | |
| 9698 | |
| 9699 /* | |
| 9700 * Set cursor to its position in the current window. | |
| 9701 */ | |
| 9702 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9703 setcursor(void) |
| 7 | 9704 { |
|
13400
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9705 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
|
9706 } |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9707 |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9708 /* |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9709 * 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
|
9710 * 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
|
9711 */ |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9712 void |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9713 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
|
9714 { |
|
c415cdd49ea4
patch 8.0.1574: show cursor in wrong place when using popup menu
Christian Brabandt <cb@256bit.org>
parents:
13380
diff
changeset
|
9715 if (force || redrawing()) |
| 7 | 9716 { |
| 9717 validate_cursor(); | |
| 9718 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
|
9719 curwin->w_wincol + ( |
| 7 | 9720 #ifdef FEAT_RIGHTLEFT |
| 1545 | 9721 /* With 'rightleft' set and the cursor on a double-wide |
| 9722 * 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
|
9723 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
|
9724 - ((has_mbyte |
| 1545 | 9725 && (*mb_ptr2cells)(ml_get_cursor()) == 2 |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
9726 && vim_isprintc(gchar_cursor())) ? 2 : 1)) : |
| 7 | 9727 #endif |
| 9728 curwin->w_wcol)); | |
| 9729 } | |
| 9730 } | |
| 9731 | |
| 9732 | |
| 9733 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9734 * 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
|
9735 * 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
|
9736 * If 'mayclear' is TRUE the screen will be cleared if it is faster than |
| 7 | 9737 * scrolling. |
| 9738 * Returns FAIL if the lines are not inserted, OK for success. | |
| 9739 */ | |
| 9740 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9741 win_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9742 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9743 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9744 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9745 int invalid, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9746 int mayclear) |
| 7 | 9747 { |
| 9748 int did_delete; | |
| 9749 int nextrow; | |
| 9750 int lastrow; | |
| 9751 int retval; | |
| 9752 | |
| 9753 if (invalid) | |
| 9754 wp->w_lines_valid = 0; | |
| 9755 | |
| 9756 if (wp->w_height < 5) | |
| 9757 return FAIL; | |
| 9758 | |
| 9759 if (line_count > wp->w_height - row) | |
| 9760 line_count = wp->w_height - row; | |
| 9761 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9762 retval = win_do_lines(wp, row, line_count, mayclear, FALSE, 0); |
| 7 | 9763 if (retval != MAYBE) |
| 9764 return retval; | |
| 9765 | |
| 9766 /* | |
| 9767 * If there is a next window or a status line, we first try to delete the | |
| 9768 * lines at the bottom to avoid messing what is after the window. | |
| 9769 * If this fails and there are following windows, don't do anything to avoid | |
| 9770 * messing up those windows, better just redraw. | |
| 9771 */ | |
| 9772 did_delete = FALSE; | |
| 9773 if (wp->w_next != NULL || wp->w_status_height) | |
| 9774 { | |
| 9775 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
|
9776 line_count, (int)Rows, FALSE, 0, NULL) == OK) |
| 7 | 9777 did_delete = TRUE; |
| 9778 else if (wp->w_next) | |
| 9779 return FAIL; | |
| 9780 } | |
| 9781 /* | |
| 9782 * if no lines deleted, blank the lines that will end up below the window | |
| 9783 */ | |
| 9784 if (!did_delete) | |
| 9785 { | |
| 9786 wp->w_redr_status = TRUE; | |
| 9787 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
|
9788 nextrow = W_WINROW(wp) + wp->w_height + wp->w_status_height; |
| 7 | 9789 lastrow = nextrow + line_count; |
| 9790 if (lastrow > Rows) | |
| 9791 lastrow = Rows; | |
| 9792 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
|
9793 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9794 ' ', ' ', 0); |
| 9795 } | |
| 9796 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9797 if (screen_ins_lines(0, W_WINROW(wp) + row, line_count, (int)Rows, 0, NULL) |
| 7 | 9798 == FAIL) |
| 9799 { | |
| 9800 /* deletion will have messed up other windows */ | |
| 9801 if (did_delete) | |
| 9802 { | |
| 9803 wp->w_redr_status = TRUE; | |
| 9804 win_rest_invalid(W_NEXT(wp)); | |
| 9805 } | |
| 9806 return FAIL; | |
| 9807 } | |
| 9808 | |
| 9809 return OK; | |
| 9810 } | |
| 9811 | |
| 9812 /* | |
|
11655
8014350fe51a
patch 8.0.0710: a job that writes to a buffer clears completion
Christian Brabandt <cb@256bit.org>
parents:
11607
diff
changeset
|
9813 * Delete "line_count" window lines at "row" in window "wp". |
| 7 | 9814 * If "invalid" is TRUE curwin->w_lines[] is invalidated. |
| 9815 * If "mayclear" is TRUE the screen will be cleared if it is faster than | |
| 9816 * scrolling | |
| 9817 * Return OK for success, FAIL if the lines are not deleted. | |
| 9818 */ | |
| 9819 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9820 win_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9821 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9822 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9823 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9824 int invalid, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9825 int mayclear, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9826 int clear_attr) /* for clearing lines */ |
| 7 | 9827 { |
| 9828 int retval; | |
| 9829 | |
| 9830 if (invalid) | |
| 9831 wp->w_lines_valid = 0; | |
| 9832 | |
| 9833 if (line_count > wp->w_height - row) | |
| 9834 line_count = wp->w_height - row; | |
| 9835 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9836 retval = win_do_lines(wp, row, line_count, mayclear, TRUE, clear_attr); |
| 7 | 9837 if (retval != MAYBE) |
| 9838 return retval; | |
| 9839 | |
| 9840 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
|
9841 (int)Rows, FALSE, clear_attr, NULL) == FAIL) |
| 7 | 9842 return FAIL; |
| 9843 | |
| 9844 /* | |
| 9845 * If there are windows or status lines below, try to put them at the | |
| 9846 * correct place. If we can't do that, they have to be redrawn. | |
| 9847 */ | |
| 9848 if (wp->w_next || wp->w_status_height || cmdline_row < Rows - 1) | |
| 9849 { | |
| 9850 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
|
9851 line_count, (int)Rows, clear_attr, NULL) == FAIL) |
| 7 | 9852 { |
| 9853 wp->w_redr_status = TRUE; | |
| 9854 win_rest_invalid(wp->w_next); | |
| 9855 } | |
| 9856 } | |
| 9857 /* | |
| 9858 * If this is the last window and there is no status line, redraw the | |
| 9859 * command line later. | |
| 9860 */ | |
| 9861 else | |
| 9862 redraw_cmdline = TRUE; | |
| 9863 return OK; | |
| 9864 } | |
| 9865 | |
| 9866 /* | |
| 9867 * Common code for win_ins_lines() and win_del_lines(). | |
| 9868 * Returns OK or FAIL when the work has been done. | |
| 9869 * Returns MAYBE when not finished yet. | |
| 9870 */ | |
| 9871 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9872 win_do_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9873 win_T *wp, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9874 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9875 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9876 int mayclear, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9877 int del, |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9878 int clear_attr) |
| 7 | 9879 { |
| 9880 int retval; | |
| 9881 | |
| 9882 if (!redrawing() || line_count <= 0) | |
| 9883 return FAIL; | |
| 9884 | |
|
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
|
9885 /* 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
|
9886 * 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
|
9887 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
|
9888 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
|
9889 |
| 7 | 9890 /* 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
|
9891 if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) |
| 7 | 9892 { |
|
11416
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9893 if (!no_win_do_lines_ins) |
|
32aed0993813
patch 8.0.0592: if a job writes to a buffer screen is not updated
Christian Brabandt <cb@256bit.org>
parents:
11277
diff
changeset
|
9894 screenclear(); /* will set wp->w_lines_valid to 0 */ |
| 7 | 9895 return FAIL; |
| 9896 } | |
| 9897 | |
| 9898 /* | |
| 9899 * Delete all remaining lines | |
| 9900 */ | |
| 9901 if (row + line_count >= wp->w_height) | |
| 9902 { | |
| 9903 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
|
9904 wp->w_wincol, (int)W_ENDCOL(wp), |
| 7 | 9905 ' ', ' ', 0); |
| 9906 return OK; | |
| 9907 } | |
| 9908 | |
| 9909 /* | |
|
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
|
9910 * When scrolling, the message on the command line should be cleared, |
| 7 | 9911 * 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
|
9912 * Don't do this when avoiding to insert lines. |
| 7 | 9913 */ |
|
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
|
9914 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
|
9915 clear_cmdline = TRUE; |
| 7 | 9916 |
| 9917 /* | |
| 9918 * If the terminal can set a scroll region, use that. | |
| 9919 * Always do this in a vertically split window. This will redraw from | |
| 9920 * ScreenLines[] when t_CV isn't defined. That's faster than using | |
| 9921 * win_line(). | |
| 9922 * 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
|
9923 * 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
|
9924 * scroll-up . |
| 7 | 9925 */ |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
9926 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
|
9927 { |
| 7 | 9928 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9929 scroll_region_set(wp, row); | |
| 9930 if (del) | |
| 9931 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
|
9932 wp->w_height - row, FALSE, clear_attr, wp); |
| 7 | 9933 else |
| 9934 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
|
9935 wp->w_height - row, clear_attr, wp); |
| 7 | 9936 if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) |
| 9937 scroll_region_reset(); | |
| 9938 return retval; | |
| 9939 } | |
| 9940 | |
| 9941 if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ | |
| 9942 return FAIL; | |
| 9943 | |
| 9944 return MAYBE; | |
| 9945 } | |
| 9946 | |
| 9947 /* | |
| 9948 * window 'wp' and everything after it is messed up, mark it for redraw | |
| 9949 */ | |
| 9950 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9951 win_rest_invalid(win_T *wp) |
| 7 | 9952 { |
| 9953 while (wp != NULL) | |
| 9954 { | |
| 9955 redraw_win_later(wp, NOT_VALID); | |
| 9956 wp->w_redr_status = TRUE; | |
| 9957 wp = wp->w_next; | |
| 9958 } | |
| 9959 redraw_cmdline = TRUE; | |
| 9960 } | |
| 9961 | |
| 9962 /* | |
| 9963 * The rest of the routines in this file perform screen manipulations. The | |
| 9964 * given operation is performed physically on the screen. The corresponding | |
| 9965 * change is also made to the internal screen image. In this way, the editor | |
| 9966 * anticipates the effect of editing changes on the appearance of the screen. | |
| 9967 * That way, when we call screenupdate a complete redraw isn't usually | |
| 9968 * necessary. Another advantage is that we can keep adding code to anticipate | |
| 9969 * screen changes, and in the meantime, everything still works. | |
| 9970 */ | |
| 9971 | |
| 9972 /* | |
| 9973 * types for inserting or deleting lines | |
| 9974 */ | |
| 9975 #define USE_T_CAL 1 | |
| 9976 #define USE_T_CDL 2 | |
| 9977 #define USE_T_AL 3 | |
| 9978 #define USE_T_CE 4 | |
| 9979 #define USE_T_DL 5 | |
| 9980 #define USE_T_SR 6 | |
| 9981 #define USE_NL 7 | |
| 9982 #define USE_T_CD 8 | |
| 9983 #define USE_REDRAW 9 | |
| 9984 | |
| 9985 /* | |
| 9986 * insert lines on the screen and update ScreenLines[] | |
| 9987 * 'end' is the line after the scrolled part. Normally it is Rows. | |
| 9988 * When scrolling region used 'off' is the offset from the top for the region. | |
| 9989 * 'row' and 'end' are relative to the start of the region. | |
| 9990 * | |
| 9991 * return FAIL for failure, OK for success. | |
| 9992 */ | |
| 446 | 9993 int |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9994 screen_ins_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9995 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9996 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9997 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
9998 int end, |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
9999 int clear_attr, |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10000 win_T *wp) /* NULL or window to use width from */ |
| 7 | 10001 { |
| 10002 int i; | |
| 10003 int j; | |
| 10004 unsigned temp; | |
| 10005 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10006 int cursor_col = 0; |
| 7 | 10007 int type; |
| 10008 int result_empty; | |
| 10009 int can_ce = can_clear(T_CE); | |
| 10010 | |
| 10011 /* | |
| 10012 * FAIL if | |
| 10013 * - there is no valid screen | |
| 10014 * - the screen has to be redrawn completely | |
| 10015 * - the line count is less than one | |
| 10016 * - 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
|
10017 * - redrawing for a callback and there is a modeless selection |
| 7 | 10018 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10019 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
|
10020 #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
|
10021 || (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
|
10022 && 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
|
10023 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10024 ) |
| 7 | 10025 return FAIL; |
| 10026 | |
| 10027 /* | |
| 10028 * There are seven ways to insert lines: | |
| 10029 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10030 * characters from ScreenLines[]. | |
| 10031 * 1. Use T_CD (clear to end of display) if it exists and the result of | |
| 10032 * the insert is just empty lines | |
| 10033 * 2. Use T_CAL (insert multiple lines) if it exists and T_AL is not | |
| 10034 * present or line_count > 1. It looks better if we do all the inserts | |
| 10035 * at once. | |
| 10036 * 3. Use T_CDL (delete multiple lines) if it exists and the result of the | |
| 10037 * insert is just empty lines and T_CE is not present or line_count > | |
| 10038 * 1. | |
| 10039 * 4. Use T_AL (insert line) if it exists. | |
| 10040 * 5. Use T_CE (erase line) if it exists and the result of the insert is | |
| 10041 * just empty lines. | |
| 10042 * 6. Use T_DL (delete line) if it exists and the result of the insert is | |
| 10043 * just empty lines. | |
| 10044 * 7. Use T_SR (scroll reverse) if it exists and inserting at row 0 and | |
| 10045 * the 'da' flag is not set or we have clear line capability. | |
| 10046 * 8. redraw the characters from ScreenLines[]. | |
| 10047 * | |
| 10048 * Careful: In a hpterm scroll reverse doesn't work as expected, it moves | |
| 10049 * the scrollbar for the window. It does have insert line, use that if it | |
| 10050 * exists. | |
| 10051 */ | |
| 10052 result_empty = (row + line_count >= end); | |
| 10053 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10054 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
|
10055 else if (can_clear(T_CD) && result_empty) |
| 7 | 10056 type = USE_T_CD; |
| 10057 else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) | |
| 10058 type = USE_T_CAL; | |
| 10059 else if (*T_CDL != NUL && result_empty && (line_count > 1 || !can_ce)) | |
| 10060 type = USE_T_CDL; | |
| 10061 else if (*T_AL != NUL) | |
| 10062 type = USE_T_AL; | |
| 10063 else if (can_ce && result_empty) | |
| 10064 type = USE_T_CE; | |
| 10065 else if (*T_DL != NUL && result_empty) | |
| 10066 type = USE_T_DL; | |
| 10067 else if (*T_SR != NUL && row == 0 && (*T_DA == NUL || can_ce)) | |
| 10068 type = USE_T_SR; | |
| 10069 else | |
| 10070 return FAIL; | |
| 10071 | |
| 10072 /* | |
| 10073 * For clearing the lines screen_del_lines() is used. This will also take | |
| 10074 * care of t_db if necessary. | |
| 10075 */ | |
| 10076 if (type == USE_T_CD || type == USE_T_CDL || | |
| 10077 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
|
10078 return screen_del_lines(off, row, line_count, end, FALSE, 0, wp); |
| 7 | 10079 |
| 10080 /* | |
| 10081 * If text is retained below the screen, first clear or delete as many | |
| 10082 * lines at the bottom of the window as are about to be inserted so that | |
| 10083 * the deleted lines won't later surface during a screen_del_lines. | |
| 10084 */ | |
| 10085 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
|
10086 screen_del_lines(off, end - line_count, line_count, end, FALSE, 0, wp); |
| 7 | 10087 |
| 10088 #ifdef FEAT_CLIPBOARD | |
| 10089 /* Remove a modeless selection when inserting lines halfway the screen | |
| 10090 * 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
|
10091 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10092 clip_clear_selection(&clip_star); |
| 7 | 10093 else |
| 10094 clip_scroll_selection(-line_count); | |
| 10095 #endif | |
| 10096 | |
| 10097 #ifdef FEAT_GUI | |
| 10098 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10099 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10100 gui_dont_update_cursor(row + off <= gui.cursor_row); |
| 7 | 10101 #endif |
| 10102 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10103 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
|
10104 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
|
10105 |
| 7 | 10106 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10107 cursor_row = row; | |
| 10108 else | |
| 10109 cursor_row = row + off; | |
| 10110 | |
| 10111 /* | |
| 10112 * Shift LineOffset[] line_count down to reflect the inserted lines. | |
| 10113 * Clear the inserted lines in ScreenLines[]. | |
| 10114 */ | |
| 10115 row += off; | |
| 10116 end += off; | |
| 10117 for (i = 0; i < line_count; ++i) | |
| 10118 { | |
| 10119 if (wp != NULL && wp->w_width != Columns) | |
| 10120 { | |
| 10121 /* need to copy part of a line */ | |
| 10122 j = end - 1 - i; | |
| 10123 while ((j -= line_count) >= row) | |
| 10124 linecopy(j + line_count, j, wp); | |
| 10125 j += line_count; | |
| 10126 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
|
10127 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
|
10128 clear_attr); |
| 7 | 10129 else |
| 10130 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10131 LineWraps[j] = FALSE; | |
| 10132 } | |
| 10133 else | |
| 10134 { | |
| 10135 j = end - 1 - i; | |
| 10136 temp = LineOffset[j]; | |
| 10137 while ((j -= line_count) >= row) | |
| 10138 { | |
| 10139 LineOffset[j + line_count] = LineOffset[j]; | |
| 10140 LineWraps[j + line_count] = LineWraps[j]; | |
| 10141 } | |
| 10142 LineOffset[j + line_count] = temp; | |
| 10143 LineWraps[j + line_count] = FALSE; | |
| 10144 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
|
10145 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10146 else |
| 10147 lineinvalid(temp, (int)Columns); | |
| 10148 } | |
| 10149 } | |
| 10150 | |
| 10151 screen_stop_highlight(); | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10152 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
|
10153 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
|
10154 screen_start_highlight(clear_attr); |
| 7 | 10155 |
| 10156 /* redraw the characters */ | |
| 10157 if (type == USE_REDRAW) | |
| 10158 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
|
10159 else if (type == USE_T_CAL) |
| 7 | 10160 { |
| 10161 term_append_lines(line_count); | |
| 10162 screen_start(); /* don't know where cursor is now */ | |
| 10163 } | |
| 10164 else | |
| 10165 { | |
| 10166 for (i = 0; i < line_count; i++) | |
| 10167 { | |
| 10168 if (type == USE_T_AL) | |
| 10169 { | |
| 10170 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
|
10171 windgoto(cursor_row, cursor_col); |
| 7 | 10172 out_str(T_AL); |
| 10173 } | |
| 10174 else /* type == USE_T_SR */ | |
| 10175 out_str(T_SR); | |
| 10176 screen_start(); /* don't know where cursor is now */ | |
| 10177 } | |
| 10178 } | |
| 10179 | |
| 10180 /* | |
| 10181 * With scroll-reverse and 'da' flag set we need to clear the lines that | |
| 10182 * have been scrolled down into the region. | |
| 10183 */ | |
| 10184 if (type == USE_T_SR && *T_DA) | |
| 10185 { | |
| 10186 for (i = 0; i < line_count; ++i) | |
| 10187 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10188 windgoto(off + i, cursor_col); |
| 7 | 10189 out_str(T_CE); |
| 10190 screen_start(); /* don't know where cursor is now */ | |
| 10191 } | |
| 10192 } | |
| 10193 | |
| 10194 #ifdef FEAT_GUI | |
| 10195 gui_can_update_cursor(); | |
| 10196 if (gui.in_use) | |
| 10197 out_flush(); /* always flush after a scroll */ | |
| 10198 #endif | |
| 10199 return OK; | |
| 10200 } | |
| 10201 | |
| 10202 /* | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10203 * 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
|
10204 * "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
|
10205 * 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
|
10206 * "row" and "end" are relative to the start of the region. |
| 7 | 10207 * |
| 10208 * Return OK for success, FAIL if the lines are not deleted. | |
| 10209 */ | |
| 10210 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10211 screen_del_lines( |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10212 int off, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10213 int row, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10214 int line_count, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10215 int end, |
|
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10216 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
|
10217 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
|
10218 win_T *wp UNUSED) /* NULL or window to use width from */ |
| 7 | 10219 { |
| 10220 int j; | |
| 10221 int i; | |
| 10222 unsigned temp; | |
| 10223 int cursor_row; | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10224 int cursor_col = 0; |
| 7 | 10225 int cursor_end; |
| 10226 int result_empty; /* result is empty until end of region */ | |
| 10227 int can_delete; /* deleting line codes can be used */ | |
| 10228 int type; | |
| 10229 | |
| 10230 /* | |
| 10231 * FAIL if | |
| 10232 * - there is no valid screen | |
| 10233 * - the screen has to be redrawn completely | |
| 10234 * - the line count is less than one | |
| 10235 * - 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
|
10236 * - redrawing for a callback and there is a modeless selection |
| 7 | 10237 */ |
|
11698
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10238 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
|
10239 || (!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
|
10240 #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
|
10241 || (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
|
10242 && 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
|
10243 #endif |
|
4f59d2a66bf7
patch 8.0.0732: when updating a buffer modeless selection is lost
Christian Brabandt <cb@256bit.org>
parents:
11672
diff
changeset
|
10244 ) |
| 7 | 10245 return FAIL; |
| 10246 | |
| 10247 /* | |
| 10248 * Check if the rest of the current region will become empty. | |
| 10249 */ | |
| 10250 result_empty = row + line_count >= end; | |
| 10251 | |
| 10252 /* | |
| 10253 * We can delete lines only when 'db' flag not set or when 'ce' option | |
| 10254 * available. | |
| 10255 */ | |
| 10256 can_delete = (*T_DB == NUL || can_clear(T_CE)); | |
| 10257 | |
| 10258 /* | |
| 10259 * There are six ways to delete lines: | |
| 10260 * 0. When in a vertically split window and t_CV isn't set, redraw the | |
| 10261 * characters from ScreenLines[]. | |
| 10262 * 1. Use T_CD if it exists and the result is empty. | |
| 10263 * 2. Use newlines if row == 0 and count == 1 or T_CDL does not exist. | |
| 10264 * 3. Use T_CDL (delete multiple lines) if it exists and line_count > 1 or | |
| 10265 * none of the other ways work. | |
| 10266 * 4. Use T_CE (erase line) if the result is empty. | |
| 10267 * 5. Use T_DL (delete line) if it exists. | |
| 10268 * 6. redraw the characters from ScreenLines[]. | |
| 10269 */ | |
| 10270 if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) | |
| 10271 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
|
10272 else if (can_clear(T_CD) && result_empty) |
| 7 | 10273 type = USE_T_CD; |
| 10274 #if defined(__BEOS__) && defined(BEOS_DR8) | |
| 10275 /* | |
| 10276 * USE_NL does not seem to work in Terminal of DR8 so we set T_DB="" in | |
| 10277 * its internal termcap... this works okay for tests which test *T_DB != | |
| 10278 * NUL. It has the disadvantage that the user cannot use any :set t_* | |
| 10279 * command to get T_DB (back) to empty_option, only :set term=... will do | |
| 10280 * the trick... | |
| 10281 * Anyway, this hack will hopefully go away with the next OS release. | |
| 10282 * (Olaf Seibert) | |
| 10283 */ | |
| 10284 else if (row == 0 && T_DB == empty_option | |
| 10285 && (line_count == 1 || *T_CDL == NUL)) | |
| 10286 #else | |
| 10287 else if (row == 0 && ( | |
| 10288 #ifndef AMIGA | |
| 10289 /* On the Amiga, somehow '\n' on the last line doesn't always scroll | |
| 10290 * up, so use delete-line command */ | |
| 10291 line_count == 1 || | |
| 10292 #endif | |
| 10293 *T_CDL == NUL)) | |
| 10294 #endif | |
| 10295 type = USE_NL; | |
| 10296 else if (*T_CDL != NUL && line_count > 1 && can_delete) | |
| 10297 type = USE_T_CDL; | |
| 10298 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
|
10299 && (wp == NULL || wp->w_width == Columns)) |
| 7 | 10300 type = USE_T_CE; |
| 10301 else if (*T_DL != NUL && can_delete) | |
| 10302 type = USE_T_DL; | |
| 10303 else if (*T_CDL != NUL && can_delete) | |
| 10304 type = USE_T_CDL; | |
| 10305 else | |
| 10306 return FAIL; | |
| 10307 | |
| 10308 #ifdef FEAT_CLIPBOARD | |
| 10309 /* Remove a modeless selection when deleting lines halfway the screen or | |
| 10310 * 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
|
10311 if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) |
| 3674 | 10312 clip_clear_selection(&clip_star); |
| 7 | 10313 else |
| 10314 clip_scroll_selection(line_count); | |
| 10315 #endif | |
| 10316 | |
| 10317 #ifdef FEAT_GUI | |
| 10318 /* Don't update the GUI cursor here, ScreenLines[] is invalid until the | |
| 10319 * scrolling is actually carried out. */ | |
|
9848
664276833670
commit https://github.com/vim/vim/commit/107abd2ca53c31fd3bb40d77ff296e98eaae2975
Christian Brabandt <cb@256bit.org>
parents:
9754
diff
changeset
|
10320 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
|
10321 && gui.cursor_row < end + off); |
| 7 | 10322 #endif |
| 10323 | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10324 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
|
10325 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
|
10326 |
| 7 | 10327 if (*T_CCS != NUL) /* cursor relative to region */ |
| 10328 { | |
| 10329 cursor_row = row; | |
| 10330 cursor_end = end; | |
| 10331 } | |
| 10332 else | |
| 10333 { | |
| 10334 cursor_row = row + off; | |
| 10335 cursor_end = end + off; | |
| 10336 } | |
| 10337 | |
| 10338 /* | |
| 10339 * Now shift LineOffset[] line_count up to reflect the deleted lines. | |
| 10340 * Clear the inserted lines in ScreenLines[]. | |
| 10341 */ | |
| 10342 row += off; | |
| 10343 end += off; | |
| 10344 for (i = 0; i < line_count; ++i) | |
| 10345 { | |
| 10346 if (wp != NULL && wp->w_width != Columns) | |
| 10347 { | |
| 10348 /* need to copy part of a line */ | |
| 10349 j = row + i; | |
| 10350 while ((j += line_count) <= end - 1) | |
| 10351 linecopy(j - line_count, j, wp); | |
| 10352 j -= line_count; | |
| 10353 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
|
10354 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
|
10355 clear_attr); |
| 7 | 10356 else |
| 10357 lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width); | |
| 10358 LineWraps[j] = FALSE; | |
| 10359 } | |
| 10360 else | |
| 10361 { | |
| 10362 /* whole width, moving the line pointers is faster */ | |
| 10363 j = row + i; | |
| 10364 temp = LineOffset[j]; | |
| 10365 while ((j += line_count) <= end - 1) | |
| 10366 { | |
| 10367 LineOffset[j - line_count] = LineOffset[j]; | |
| 10368 LineWraps[j - line_count] = LineWraps[j]; | |
| 10369 } | |
| 10370 LineOffset[j - line_count] = temp; | |
| 10371 LineWraps[j - line_count] = FALSE; | |
| 10372 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
|
10373 lineclear(temp, (int)Columns, clear_attr); |
| 7 | 10374 else |
| 10375 lineinvalid(temp, (int)Columns); | |
| 10376 } | |
| 10377 } | |
| 10378 | |
|
12152
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10379 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
|
10380 screen_stop_highlight(); |
|
69af108df70e
patch 8.0.0956: scrolling in a terminal window has flicker
Christian Brabandt <cb@256bit.org>
parents:
12122
diff
changeset
|
10381 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
|
10382 screen_start_highlight(clear_attr); |
| 7 | 10383 |
| 10384 /* redraw the characters */ | |
| 10385 if (type == USE_REDRAW) | |
| 10386 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
|
10387 else if (type == USE_T_CD) /* delete the lines */ |
| 7 | 10388 { |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10389 windgoto(cursor_row, cursor_col); |
| 7 | 10390 out_str(T_CD); |
| 10391 screen_start(); /* don't know where cursor is now */ | |
| 10392 } | |
| 10393 else if (type == USE_T_CDL) | |
| 10394 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10395 windgoto(cursor_row, cursor_col); |
| 7 | 10396 term_delete_lines(line_count); |
| 10397 screen_start(); /* don't know where cursor is now */ | |
| 10398 } | |
| 10399 /* | |
| 10400 * Deleting lines at top of the screen or scroll region: Just scroll | |
| 10401 * the whole screen (scroll region) up by outputting newlines on the | |
| 10402 * last line. | |
| 10403 */ | |
| 10404 else if (type == USE_NL) | |
| 10405 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10406 windgoto(cursor_end - 1, cursor_col); |
| 7 | 10407 for (i = line_count; --i >= 0; ) |
| 10408 out_char('\n'); /* cursor will remain on same line */ | |
| 10409 } | |
| 10410 else | |
| 10411 { | |
| 10412 for (i = line_count; --i >= 0; ) | |
| 10413 { | |
| 10414 if (type == USE_T_DL) | |
| 10415 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10416 windgoto(cursor_row, cursor_col); |
| 7 | 10417 out_str(T_DL); /* delete a line */ |
| 10418 } | |
| 10419 else /* type == USE_T_CE */ | |
| 10420 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10421 windgoto(cursor_row + i, cursor_col); |
| 7 | 10422 out_str(T_CE); /* erase a line */ |
| 10423 } | |
| 10424 screen_start(); /* don't know where cursor is now */ | |
| 10425 } | |
| 10426 } | |
| 10427 | |
| 10428 /* | |
| 10429 * If the 'db' flag is set, we need to clear the lines that have been | |
| 10430 * scrolled up at the bottom of the region. | |
| 10431 */ | |
| 10432 if (*T_DB && (type == USE_T_DL || type == USE_T_CDL)) | |
| 10433 { | |
| 10434 for (i = line_count; i > 0; --i) | |
| 10435 { | |
|
14081
45c595c0ddaf
patch 8.1.0058: display problem with margins and scrolling
Christian Brabandt <cb@256bit.org>
parents:
14079
diff
changeset
|
10436 windgoto(cursor_end - i, cursor_col); |
| 7 | 10437 out_str(T_CE); /* erase a line */ |
| 10438 screen_start(); /* don't know where cursor is now */ | |
| 10439 } | |
| 10440 } | |
| 10441 | |
| 10442 #ifdef FEAT_GUI | |
| 10443 gui_can_update_cursor(); | |
| 10444 if (gui.in_use) | |
| 10445 out_flush(); /* always flush after a scroll */ | |
| 10446 #endif | |
| 10447 | |
| 10448 return OK; | |
| 10449 } | |
| 10450 | |
| 10451 /* | |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10452 * 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
|
10453 * 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
|
10454 */ |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10455 int |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10456 skip_showmode() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10457 { |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10458 // 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
|
10459 // 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
|
10460 if (global_busy |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10461 || msg_silent != 0 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10462 || !redrawing() |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10463 || (char_avail() && !KeyTyped)) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10464 { |
|
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
|
10465 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
|
10466 return TRUE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10467 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10468 return FALSE; |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10469 } |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10470 |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10471 /* |
|
13308
ae312df8d0ab
patch 8.0.1528: dead code found
Christian Brabandt <cb@256bit.org>
parents:
13292
diff
changeset
|
10472 * Show the current mode and ruler. |
| 7 | 10473 * |
| 10474 * If clear_cmdline is TRUE, clear the rest of the cmdline. | |
| 10475 * If clear_cmdline is FALSE there may be a message there that needs to be | |
| 10476 * 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
|
10477 * If redraw_mode is TRUE show or clear the mode. |
| 7 | 10478 * Return the length of the message (0 if no message). |
| 10479 */ | |
| 10480 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10481 showmode(void) |
| 7 | 10482 { |
| 10483 int need_clear; | |
| 10484 int length = 0; | |
| 10485 int do_mode; | |
| 10486 int attr; | |
| 10487 int nwr_save; | |
| 10488 #ifdef FEAT_INS_EXPAND | |
| 10489 int sub_attr; | |
| 10490 #endif | |
| 10491 | |
| 642 | 10492 do_mode = ((p_smd && msg_silent == 0) |
| 10493 && ((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
|
10494 || restart_edit != NUL |
| 5735 | 10495 || 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
|
10496 if (do_mode || reg_recording != 0) |
| 7 | 10497 { |
|
15629
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10498 if (skip_showmode()) |
|
dd2e0b83a660
patch 8.1.0822: peeking and flushing output slows down execution
Bram Moolenaar <Bram@vim.org>
parents:
15609
diff
changeset
|
10499 return 0; // show mode later |
| 7 | 10500 |
| 10501 nwr_save = need_wait_return; | |
| 10502 | |
| 10503 /* wait a bit before overwriting an important message */ | |
| 10504 check_for_delay(FALSE); | |
| 10505 | |
| 10506 /* if the cmdline is more than one line high, erase top lines */ | |
| 10507 need_clear = clear_cmdline; | |
| 10508 if (clear_cmdline && cmdline_row < Rows - 1) | |
| 10509 msg_clr_cmdline(); /* will reset clear_cmdline */ | |
| 10510 | |
| 10511 /* Position on the last line in the window, column 0 */ | |
| 10512 msg_pos_mode(); | |
| 10513 cursor_off(); | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10514 attr = HL_ATTR(HLF_CM); /* Highlight mode */ |
| 7 | 10515 if (do_mode) |
| 10516 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10517 msg_puts_attr("--", attr); |
| 7 | 10518 #if defined(FEAT_XIM) |
| 2520 | 10519 if ( |
| 10520 # ifdef FEAT_GUI_GTK | |
| 10521 preedit_get_status() | |
| 1668 | 10522 # else |
| 10523 im_get_status() | |
| 2520 | 10524 # endif |
| 1668 | 10525 ) |
|
2277
f42e0b5ff9e9
Change remaining HAVE_GTK2 to FEAT_GUI_GTK.
Bram Moolenaar <bram@vim.org>
parents:
2269
diff
changeset
|
10526 # 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
|
10527 msg_puts_attr(" IM", attr); |
| 7 | 10528 # else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10529 msg_puts_attr(" XIM", attr); |
| 7 | 10530 # endif |
| 10531 #endif | |
| 10532 #if defined(FEAT_HANGULIN) && defined(FEAT_GUI) | |
| 10533 if (gui.in_use) | |
| 10534 { | |
| 10535 if (hangul_input_state_get()) | |
|
7208
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10536 { |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10537 /* HANGUL */ |
|
2c00f6b312bf
commit https://github.com/vim/vim/commit/72f4cc4a987d123c0ed909c85b9a05f65cef7202
Christian Brabandt <cb@256bit.org>
parents:
7007
diff
changeset
|
10538 if (enc_utf8) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10539 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
|
10540 else |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10541 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
|
10542 } |
| 7 | 10543 } |
| 10544 #endif | |
| 10545 #ifdef FEAT_INS_EXPAND | |
| 5946 | 10546 /* CTRL-X in Insert mode */ |
| 10547 if (edit_submode != NULL && !shortmess(SHM_COMPLETIONMENU)) | |
| 7 | 10548 { |
| 10549 /* These messages can get long, avoid a wrap in a narrow | |
| 10550 * window. Prefer showing edit_submode_extra. */ | |
| 10551 length = (Rows - msg_row) * Columns - 3; | |
| 10552 if (edit_submode_extra != NULL) | |
| 10553 length -= vim_strsize(edit_submode_extra); | |
| 10554 if (length > 0) | |
| 10555 { | |
| 10556 if (edit_submode_pre != NULL) | |
| 10557 length -= vim_strsize(edit_submode_pre); | |
| 10558 if (length - vim_strsize(edit_submode) > 0) | |
| 10559 { | |
| 10560 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
|
10561 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
|
10562 msg_puts_attr((char *)edit_submode, attr); |
| 7 | 10563 } |
| 10564 if (edit_submode_extra != NULL) | |
| 10565 { | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10566 msg_puts_attr(" ", attr); /* add a space in between */ |
| 7 | 10567 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
|
10568 sub_attr = HL_ATTR(edit_submode_highl); |
| 7 | 10569 else |
| 10570 sub_attr = attr; | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10571 msg_puts_attr((char *)edit_submode_extra, sub_attr); |
| 7 | 10572 } |
| 10573 } | |
| 10574 } | |
| 10575 else | |
| 10576 #endif | |
| 10577 { | |
| 10578 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
|
10579 msg_puts_attr(_(" VREPLACE"), attr); |
|
14424
0a69e6e708f9
patch 8.1.0226: too many #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
14218
diff
changeset
|
10580 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
|
10581 msg_puts_attr(_(" REPLACE"), attr); |
| 7 | 10582 else if (State & INSERT) |
| 10583 { | |
| 10584 #ifdef FEAT_RIGHTLEFT | |
| 10585 if (p_ri) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10586 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
|
10587 #endif |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10588 msg_puts_attr(_(" INSERT"), attr); |
| 7 | 10589 } |
|
14093
a9d94f10ecef
patch 8.1.0064: typing CTRL-W in a prompt buffer shows mode "-- --"
Christian Brabandt <cb@256bit.org>
parents:
14089
diff
changeset
|
10590 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
|
10591 msg_puts_attr(_(" (insert)"), attr); |
| 7 | 10592 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
|
10593 msg_puts_attr(_(" (replace)"), attr); |
| 7 | 10594 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
|
10595 msg_puts_attr(_(" (vreplace)"), attr); |
| 7 | 10596 #ifdef FEAT_RIGHTLEFT |
| 10597 if (p_hkmap) | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10598 msg_puts_attr(_(" Hebrew"), attr); |
| 7 | 10599 #endif |
| 10600 #ifdef FEAT_KEYMAP | |
| 10601 if (State & LANGMAP) | |
| 10602 { | |
| 10603 # ifdef FEAT_ARABIC | |
| 10604 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
|
10605 msg_puts_attr(_(" Arabic"), attr); |
| 7 | 10606 else |
| 10607 # endif | |
|
9645
123d3c102035
commit https://github.com/vim/vim/commit/73ac0c4281a3606651604a3cbcc334bfb3859a87
Christian Brabandt <cb@256bit.org>
parents:
9489
diff
changeset
|
10608 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
|
10609 NameBuff, MAXPATHL)) |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10610 msg_puts_attr((char *)NameBuff, attr); |
| 7 | 10611 } |
| 10612 #endif | |
| 10613 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
|
10614 msg_puts_attr(_(" (paste)"), attr); |
| 7 | 10615 |
| 10616 if (VIsual_active) | |
| 10617 { | |
| 10618 char *p; | |
| 10619 | |
| 10620 /* Don't concatenate separate words to avoid translation | |
| 10621 * problems. */ | |
| 10622 switch ((VIsual_select ? 4 : 0) | |
| 10623 + (VIsual_mode == Ctrl_V) * 2 | |
| 10624 + (VIsual_mode == 'V')) | |
| 10625 { | |
| 10626 case 0: p = N_(" VISUAL"); break; | |
| 10627 case 1: p = N_(" VISUAL LINE"); break; | |
| 10628 case 2: p = N_(" VISUAL BLOCK"); break; | |
| 10629 case 4: p = N_(" SELECT"); break; | |
| 10630 case 5: p = N_(" SELECT LINE"); break; | |
| 10631 default: p = N_(" SELECT BLOCK"); break; | |
| 10632 } | |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10633 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
|
10634 } |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10635 msg_puts_attr(" --", attr); |
| 7 | 10636 } |
| 644 | 10637 |
| 7 | 10638 need_clear = TRUE; |
| 10639 } | |
|
14004
e124262d435e
patch 8.1.0020: cannot tell whether a register is executing or recording
Christian Brabandt <cb@256bit.org>
parents:
13968
diff
changeset
|
10640 if (reg_recording != 0 |
| 7 | 10641 #ifdef FEAT_INS_EXPAND |
| 10642 && edit_submode == NULL /* otherwise it gets too long */ | |
| 10643 #endif | |
| 10644 ) | |
| 10645 { | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10646 recording_mode(attr); |
| 7 | 10647 need_clear = TRUE; |
| 10648 } | |
| 644 | 10649 |
| 10650 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
|
10651 if (need_clear || clear_cmdline || redraw_mode) |
| 7 | 10652 msg_clr_eos(); |
| 10653 msg_didout = FALSE; /* overwrite this message */ | |
| 10654 length = msg_col; | |
| 10655 msg_col = 0; | |
| 10656 need_wait_return = nwr_save; /* never ask for hit-return for this */ | |
| 10657 } | |
| 10658 else if (clear_cmdline && msg_silent == 0) | |
| 10659 /* Clear the whole command line. Will reset "clear_cmdline". */ | |
| 10660 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
|
10661 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
|
10662 { |
|
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
|
10663 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
|
10664 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
|
10665 } |
| 7 | 10666 |
| 10667 #ifdef FEAT_CMDL_INFO | |
| 10668 /* In Visual mode the size of the selected area must be redrawn. */ | |
| 10669 if (VIsual_active) | |
| 10670 clear_showcmd(); | |
| 10671 | |
| 10672 /* If the last window has no status line, the ruler is after the mode | |
| 10673 * 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
|
10674 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
|
10675 win_redr_ruler(lastwin, TRUE, FALSE); |
| 7 | 10676 #endif |
| 10677 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
|
10678 redraw_mode = FALSE; |
| 7 | 10679 clear_cmdline = FALSE; |
| 10680 | |
| 10681 return length; | |
| 10682 } | |
| 10683 | |
| 10684 /* | |
| 10685 * Position for a mode message. | |
| 10686 */ | |
| 10687 static void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10688 msg_pos_mode(void) |
| 7 | 10689 { |
| 10690 msg_col = 0; | |
| 10691 msg_row = Rows - 1; | |
| 10692 } | |
| 10693 | |
| 10694 /* | |
| 10695 * Delete mode message. Used when ESC is typed which is expected to end | |
| 10696 * Insert mode (but Insert mode didn't end yet!). | |
| 644 | 10697 * Caller should check "mode_displayed". |
| 7 | 10698 */ |
| 10699 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10700 unshowmode(int force) |
| 7 | 10701 { |
| 10702 /* | |
|
2055
4aa4510d548c
updated for version 7.2.341
Bram Moolenaar <bram@zimbu.org>
parents:
2008
diff
changeset
|
10703 * Don't delete it right now, when not redrawing or inside a mapping. |
| 7 | 10704 */ |
| 10705 if (!redrawing() || (!force && char_avail() && !KeyTyped)) | |
| 10706 redraw_cmdline = TRUE; /* delete mode later */ | |
| 10707 else | |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10708 clearmode(); |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10709 } |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10710 |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10711 /* |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10712 * Clear the mode message. |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10713 */ |
|
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10714 void |
|
9282
9f97a6290c63
commit https://github.com/vim/vim/commit/cf089463492fab53b2a5d81517829d22f882f82e
Christian Brabandt <cb@256bit.org>
parents:
9213
diff
changeset
|
10715 clearmode(void) |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10716 { |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10717 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
|
10718 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
|
10719 |
|
8817
b7eb7bbd71d0
commit https://github.com/vim/vim/commit/fd773e9e88add7d1ffef890fb9f3a00d613b4326
Christian Brabandt <cb@256bit.org>
parents:
8643
diff
changeset
|
10720 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
|
10721 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
|
10722 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
|
10723 msg_clr_eos(); |
|
13968
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10724 |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10725 msg_col = save_msg_col; |
|
d111462e0173
patch 8.1.0002: :stopinsert changes the message position
Christian Brabandt <cb@256bit.org>
parents:
13888
diff
changeset
|
10726 msg_row = save_msg_row; |
| 7 | 10727 } |
| 10728 | |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10729 static void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10730 recording_mode(int attr) |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10731 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10732 msg_puts_attr(_("recording"), attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10733 if (!shortmess(SHM_RECORDING)) |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10734 { |
|
15543
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10735 char s[4]; |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10736 |
|
dd725a8ab112
patch 8.1.0779: argument for message functions is inconsistent
Bram Moolenaar <Bram@vim.org>
parents:
15521
diff
changeset
|
10737 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
|
10738 msg_puts_attr(s, attr); |
|
7233
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10739 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10740 } |
|
9487ea110214
commit https://github.com/vim/vim/commit/a0ed84a26897c994512873a895b9fc54e90c6845
Christian Brabandt <cb@256bit.org>
parents:
7208
diff
changeset
|
10741 |
| 667 | 10742 /* |
| 10743 * Draw the tab pages line at the top of the Vim window. | |
| 10744 */ | |
|
15396
325e4a8ba1b6
patch 8.1.0706: tabline is not always redrawn
Bram Moolenaar <Bram@vim.org>
parents:
15384
diff
changeset
|
10745 void |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10746 draw_tabline(void) |
| 667 | 10747 { |
| 10748 int tabcount = 0; | |
| 10749 tabpage_T *tp; | |
| 10750 int tabwidth; | |
| 10751 int col = 0; | |
| 673 | 10752 int scol = 0; |
| 667 | 10753 int attr; |
| 10754 win_T *wp; | |
| 671 | 10755 win_T *cwp; |
| 10756 int wincount; | |
| 10757 int modified; | |
| 667 | 10758 int c; |
| 10759 int len; | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10760 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
|
10761 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
|
10762 int attr_fill = HL_ATTR(HLF_TPF); |
| 673 | 10763 char_u *p; |
| 677 | 10764 int room; |
| 10765 int use_sep_chars = (t_colors < 8 | |
| 10766 #ifdef FEAT_GUI | |
| 10767 && !gui.in_use | |
| 10768 #endif | |
|
9027
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10769 #ifdef FEAT_TERMGUICOLORS |
|
773d627cac0b
commit https://github.com/vim/vim/commit/61be73bb0f965a895bfb064ea3e55476ac175162
Christian Brabandt <cb@256bit.org>
parents:
8977
diff
changeset
|
10770 && !p_tgc |
|
8969
c83e2c1e7f2b
commit https://github.com/vim/vim/commit/8a633e3427b47286869aa4b96f2bfc1fe65b25cd
Christian Brabandt <cb@256bit.org>
parents:
8907
diff
changeset
|
10771 #endif |
| 677 | 10772 ); |
| 673 | 10773 |
|
10538
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10774 if (ScreenLines == NULL) |
|
c7f671dfd735
patch 8.0.0159: crash on startup when updating tabline
Christian Brabandt <cb@256bit.org>
parents:
10466
diff
changeset
|
10775 return; |
| 673 | 10776 redraw_tabline = FALSE; |
| 667 | 10777 |
| 685 | 10778 #ifdef FEAT_GUI_TABLINE |
| 798 | 10779 /* Take care of a GUI tabline. */ |
| 685 | 10780 if (gui_use_tabline()) |
| 10781 { | |
| 10782 gui_update_tabline(); | |
| 10783 return; | |
| 10784 } | |
| 10785 #endif | |
| 10786 | |
| 10787 if (tabline_height() < 1) | |
| 667 | 10788 return; |
| 10789 | |
| 677 | 10790 #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
|
10791 clear_TabPageIdxs(); |
| 681 | 10792 |
| 677 | 10793 /* Use the 'tabline' option if it's set. */ |
| 10794 if (*p_tal != NUL) | |
| 10795 { | |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10796 int saved_did_emsg = did_emsg; |
| 680 | 10797 |
| 10798 /* Check for an error. If there is one we would loop in redrawing the | |
| 10799 * 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
|
10800 did_emsg = FALSE; |
| 677 | 10801 win_redr_custom(NULL, FALSE); |
|
8872
4d4de770f970
commit https://github.com/vim/vim/commit/f73d3bc253fa79ad220f52f04b93e782e95a9d43
Christian Brabandt <cb@256bit.org>
parents:
8847
diff
changeset
|
10802 if (did_emsg) |
| 680 | 10803 set_string_option_direct((char_u *)"tabline", -1, |
| 694 | 10804 (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
|
10805 did_emsg |= saved_did_emsg; |
| 680 | 10806 } |
| 10807 else | |
| 10808 #endif | |
| 10809 { | |
|
9649
fd9727ae3c49
commit https://github.com/vim/vim/commit/2932359000b2f918d5fade79ea4d124d5943cd07
Christian Brabandt <cb@256bit.org>
parents:
9645
diff
changeset
|
10810 FOR_ALL_TABPAGES(tp) |
| 680 | 10811 ++tabcount; |
| 10812 | |
| 10813 tabwidth = (Columns - 1 + tabcount / 2) / tabcount; | |
| 10814 if (tabwidth < 6) | |
| 10815 tabwidth = 6; | |
| 10816 | |
| 10817 attr = attr_nosel; | |
| 10818 tabcount = 0; | |
| 699 | 10819 for (tp = first_tabpage; tp != NULL && col < Columns - 4; |
| 10820 tp = tp->tp_next) | |
| 680 | 10821 { |
| 10822 scol = col; | |
| 10823 | |
| 10824 if (tp->tp_topframe == topframe) | |
| 10825 attr = attr_sel; | |
| 10826 if (use_sep_chars && col > 0) | |
| 10827 screen_putchar('|', 0, col++, attr); | |
| 10828 | |
| 10829 if (tp->tp_topframe != topframe) | |
| 10830 attr = attr_nosel; | |
| 10831 | |
| 10832 screen_putchar(' ', 0, col++, attr); | |
| 10833 | |
| 10834 if (tp == curtab) | |
| 10835 { | |
| 10836 cwp = curwin; | |
| 10837 wp = firstwin; | |
| 10838 } | |
| 10839 else | |
| 10840 { | |
| 10841 cwp = tp->tp_curwin; | |
| 10842 wp = tp->tp_firstwin; | |
| 10843 } | |
| 10844 | |
| 10845 modified = FALSE; | |
| 10846 for (wincount = 0; wp != NULL; wp = wp->w_next, ++wincount) | |
| 10847 if (bufIsChanged(wp->w_buffer)) | |
| 10848 modified = TRUE; | |
| 10849 if (modified || wincount > 1) | |
| 10850 { | |
| 10851 if (wincount > 1) | |
| 10852 { | |
| 10853 vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount); | |
| 835 | 10854 len = (int)STRLEN(NameBuff); |
| 699 | 10855 if (col + len >= Columns - 3) |
| 10856 break; | |
| 680 | 10857 screen_puts_len(NameBuff, len, 0, col, |
| 677 | 10858 #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
|
10859 hl_combine_attr(attr, HL_ATTR(HLF_T)) |
| 677 | 10860 #else |
| 6106 | 10861 attr |
| 680 | 10862 #endif |
| 10863 ); | |
| 10864 col += len; | |
| 10865 } | |
| 10866 if (modified) | |
| 10867 screen_puts_len((char_u *)"+", 1, 0, col++, attr); | |
| 10868 screen_putchar(' ', 0, col++, attr); | |
| 10869 } | |
| 10870 | |
| 10871 room = scol - col + tabwidth - 1; | |
| 10872 if (room > 0) | |
| 10873 { | |
| 685 | 10874 /* Get buffer name in NameBuff[] */ |
| 10875 get_trans_bufname(cwp->w_buffer); | |
| 819 | 10876 shorten_dir(NameBuff); |
| 680 | 10877 len = vim_strsize(NameBuff); |
| 10878 p = NameBuff; | |
| 10879 if (has_mbyte) | |
| 10880 while (len > room) | |
| 10881 { | |
| 10882 len -= ptr2cells(p); | |
|
11127
506f5d8b7d8b
patch 8.0.0451: some macros are in lower case
Christian Brabandt <cb@256bit.org>
parents:
11121
diff
changeset
|
10883 MB_PTR_ADV(p); |
| 680 | 10884 } |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
10885 else if (len > room) |
| 677 | 10886 { |
| 680 | 10887 p += len - room; |
| 10888 len = room; | |
| 677 | 10889 } |
| 699 | 10890 if (len > Columns - col - 1) |
| 10891 len = Columns - col - 1; | |
| 680 | 10892 |
| 835 | 10893 screen_puts_len(p, (int)STRLEN(p), 0, col, attr); |
| 680 | 10894 col += len; |
| 10895 } | |
| 10896 screen_putchar(' ', 0, col++, attr); | |
| 10897 | |
| 10898 /* Store the tab page number in TabPageIdxs[], so that | |
| 10899 * jump_to_mouse() knows where each one is. */ | |
| 10900 ++tabcount; | |
| 10901 while (scol < col) | |
| 10902 TabPageIdxs[scol++] = tabcount; | |
| 10903 } | |
| 10904 | |
| 10905 if (use_sep_chars) | |
| 10906 c = '_'; | |
| 10907 else | |
| 10908 c = ' '; | |
| 10909 screen_fill(0, 1, col, (int)Columns, c, c, attr_fill); | |
| 681 | 10910 |
| 10911 /* Put an "X" for closing the current tab if there are several. */ | |
| 10912 if (first_tabpage->tp_next != NULL) | |
| 10913 { | |
| 10914 screen_putchar('X', 0, (int)Columns - 1, attr_nosel); | |
| 10915 TabPageIdxs[Columns - 1] = -999; | |
| 10916 } | |
| 10917 } | |
| 834 | 10918 |
| 10919 /* Reset the flag here again, in case evaluating 'tabline' causes it to be | |
| 10920 * set. */ | |
| 10921 redraw_tabline = FALSE; | |
| 667 | 10922 } |
| 685 | 10923 |
| 10924 /* | |
| 10925 * Get buffer name for "buf" into NameBuff[]. | |
| 10926 * Takes care of special buffer names and translates special characters. | |
| 10927 */ | |
| 10928 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10929 get_trans_bufname(buf_T *buf) |
| 685 | 10930 { |
| 10931 if (buf_spname(buf) != NULL) | |
| 3839 | 10932 vim_strncpy(NameBuff, buf_spname(buf), MAXPATHL - 1); |
| 685 | 10933 else |
| 10934 home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); | |
| 10935 trans_characters(NameBuff, MAXPATHL); | |
| 10936 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10937 |
| 7 | 10938 /* |
| 10939 * Get the character to use in a status line. Get its attributes in "*attr". | |
| 10940 */ | |
| 10941 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
|
10942 fillchar_status(int *attr, win_T *wp) |
| 7 | 10943 { |
| 10944 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
|
10945 |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10946 #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
|
10947 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
|
10948 { |
|
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
|
10949 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
|
10950 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10951 *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
|
10952 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
|
10953 } |
|
11890
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10954 else |
|
12122
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10955 { |
|
68c593f649d1
patch 8.0.0941: existing color schemes don't like StatusLineTerm
Christian Brabandt <cb@256bit.org>
parents:
12114
diff
changeset
|
10956 *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
|
10957 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
|
10958 } |
|
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
|
10959 } |
|
318ae82d8ba4
patch 8.0.0825: not easy to see that a window is a terminal window
Christian Brabandt <cb@256bit.org>
parents:
11866
diff
changeset
|
10960 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
|
10961 #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
|
10962 if (wp == curwin) |
| 7 | 10963 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10964 *attr = HL_ATTR(HLF_S); |
| 7 | 10965 fill = fill_stl; |
| 10966 } | |
| 10967 else | |
| 10968 { | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10969 *attr = HL_ATTR(HLF_SNC); |
| 7 | 10970 fill = fill_stlnc; |
| 10971 } | |
| 10972 /* Use fill when there is highlighting, and highlighting of current | |
| 10973 * window differs, or the fillchars differ, or this is not the | |
| 10974 * current window */ | |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10975 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
|
10976 || wp != curwin || ONE_WINDOW) |
| 7 | 10977 || (fill_stl != fill_stlnc))) |
| 10978 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
|
10979 if (wp == curwin) |
| 7 | 10980 return '^'; |
| 10981 return '='; | |
| 10982 } | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
10983 |
| 7 | 10984 /* |
| 10985 * Get the character to use in a separator between vertically split windows. | |
| 10986 * Get its attributes in "*attr". | |
| 10987 */ | |
| 10988 static int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
10989 fillchar_vsep(int *attr) |
| 7 | 10990 { |
|
11158
501f46f7644c
patch 8.0.0466: still macros that should be all-caps
Christian Brabandt <cb@256bit.org>
parents:
11133
diff
changeset
|
10991 *attr = HL_ATTR(HLF_C); |
| 7 | 10992 if (*attr == 0 && fill_vert == ' ') |
| 10993 return '|'; | |
| 10994 else | |
| 10995 return fill_vert; | |
| 10996 } | |
| 10997 | |
| 10998 /* | |
| 10999 * Return TRUE if redrawing should currently be done. | |
| 11000 */ | |
| 11001 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11002 redrawing(void) |
| 7 | 11003 { |
|
11105
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11004 #ifdef FEAT_EVAL |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11005 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
|
11006 return 0; |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11007 else |
|
7c7e496e625d
patch 8.0.0440: not enough test coverage in Insert mode
Christian Brabandt <cb@256bit.org>
parents:
11010
diff
changeset
|
11008 #endif |
|
14673
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11009 return ((!RedrawingDisabled |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11010 #ifdef FEAT_EVAL |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11011 || 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
|
11012 #endif |
|
f1b7d308de2f
patch 8.1.0349: crash when wiping buffer in a callback
Christian Brabandt <cb@256bit.org>
parents:
14662
diff
changeset
|
11013 ) && !(p_lz && char_avail() && !KeyTyped && !do_redraw)); |
| 7 | 11014 } |
| 11015 | |
| 11016 /* | |
| 11017 * Return TRUE if printing messages should currently be done. | |
| 11018 */ | |
| 11019 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11020 messaging(void) |
| 7 | 11021 { |
| 11022 return (!(p_lz && char_avail() && !KeyTyped)); | |
| 11023 } | |
| 11024 | |
|
12487
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11025 #ifdef FEAT_MENU |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11026 /* |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11027 * 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
|
11028 */ |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11029 static void |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11030 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
|
11031 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11032 vimmenu_T *menu; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11033 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
|
11034 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
|
11035 int col = 0; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11036 int next_col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11037 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
|
11038 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
|
11039 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
|
11040 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11041 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
|
11042 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
|
11043 ++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
|
11044 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
|
11045 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11046 /* 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
|
11047 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
|
11048 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
|
11049 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11050 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
|
11051 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
|
11052 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11053 if (col > 1) |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11054 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11055 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
|
11056 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
|
11057 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11058 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11059 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11060 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
|
11061 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
|
11062 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
|
11063 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11064 |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11065 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
|
11066 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
|
11067 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11068 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
|
11069 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11070 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11071 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
|
11072 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
|
11073 ++item_idx; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11074 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11075 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
|
11076 break; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11077 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
|
11078 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11079 } |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11080 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
|
11081 { |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11082 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
|
11083 ++col; |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11084 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11085 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
|
11086 |
|
12515
972ea22c946f
patch 8.0.1136: W_WIDTH() is always the same
Christian Brabandt <cb@256bit.org>
parents:
12513
diff
changeset
|
11087 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
|
11088 (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
|
11089 } |
|
3f16cf18386c
patch 8.0.1123: cannot define a toolbar for a window
Christian Brabandt <cb@256bit.org>
parents:
12477
diff
changeset
|
11090 #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
|
11091 |
| 7 | 11092 /* |
| 11093 * Show current status info in ruler and various other places | |
| 11094 * If always is FALSE, only show ruler if position has changed. | |
| 11095 */ | |
| 11096 void | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11097 showruler(int always) |
| 7 | 11098 { |
| 11099 if (!always && !redrawing()) | |
| 11100 return; | |
| 574 | 11101 #ifdef FEAT_INS_EXPAND |
| 11102 if (pum_visible()) | |
| 11103 { | |
| 11104 /* Don't redraw right now, do it later. */ | |
| 11105 curwin->w_redr_status = TRUE; | |
| 11106 return; | |
| 11107 } | |
| 11108 #endif | |
|
12477
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11109 #if defined(FEAT_STL_OPT) |
| 40 | 11110 if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) |
| 1983 | 11111 redraw_custom_statusline(curwin); |
| 7 | 11112 else |
| 11113 #endif | |
| 11114 #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
|
11115 win_redr_ruler(curwin, always, FALSE); |
| 7 | 11116 #endif |
| 11117 | |
| 11118 #ifdef FEAT_TITLE | |
| 11119 if (need_maketitle | |
| 11120 # ifdef FEAT_STL_OPT | |
| 11121 || (p_icon && (stl_syntax & STL_IN_ICON)) | |
| 11122 || (p_title && (stl_syntax & STL_IN_TITLE)) | |
| 11123 # endif | |
| 11124 ) | |
| 11125 maketitle(); | |
| 11126 #endif | |
| 1588 | 11127 /* Redraw the tab pages line if needed. */ |
| 11128 if (redraw_tabline) | |
| 11129 draw_tabline(); | |
|
16894
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11130 |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11131 #ifdef FEAT_TEXT_PROP |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11132 // Display popup windows on top of everything. |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11133 update_popups(); |
|
236c182c6300
patch 8.1.1448: statusline is sometimes drawn on top of popup
Bram Moolenaar <Bram@vim.org>
parents:
16888
diff
changeset
|
11134 #endif |
| 7 | 11135 } |
| 11136 | |
| 11137 #ifdef FEAT_CMDL_INFO | |
| 11138 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
|
11139 win_redr_ruler(win_T *wp, int always, int ignore_pum) |
| 7 | 11140 { |
| 1869 | 11141 #define RULER_BUF_LEN 70 |
| 11142 char_u buffer[RULER_BUF_LEN]; | |
| 7 | 11143 int row; |
| 11144 int fillchar; | |
| 11145 int attr; | |
| 11146 int empty_line = FALSE; | |
| 11147 colnr_T virtcol; | |
| 11148 int i; | |
| 1869 | 11149 size_t len; |
| 7 | 11150 int o; |
| 11151 int this_ru_col; | |
| 11152 int off = 0; | |
|
16054
78faa25f9698
patch 8.1.1032: warnings from clang static analyzer
Bram Moolenaar <Bram@vim.org>
parents:
15991
diff
changeset
|
11153 int width; |
| 7 | 11154 |
| 11155 /* If 'ruler' off or redrawing disabled, don't do anything */ | |
| 11156 if (!p_ru) | |
| 11157 return; | |
| 11158 | |
| 11159 /* | |
| 11160 * Check if cursor.lnum is valid, since win_redr_ruler() may be called | |
| 11161 * after deleting lines, before cursor.lnum is corrected. | |
| 11162 */ | |
| 11163 if (wp->w_cursor.lnum > wp->w_buffer->b_ml.ml_line_count) | |
| 11164 return; | |
| 11165 | |
| 11166 #ifdef FEAT_INS_EXPAND | |
| 11167 /* Don't draw the ruler while doing insert-completion, it might overwrite | |
| 11168 * the (long) mode message. */ | |
| 11169 if (wp == lastwin && lastwin->w_status_height == 0) | |
| 11170 if (edit_submode != NULL) | |
| 11171 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
|
11172 // 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
|
11173 // 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
|
11174 if (!ignore_pum && pum_visible()) |
| 540 | 11175 return; |
| 7 | 11176 #endif |
| 11177 | |
| 11178 #ifdef FEAT_STL_OPT | |
| 11179 if (*p_ruf) | |
| 11180 { | |
| 680 | 11181 int save_called_emsg = called_emsg; |
| 11182 | |
| 11183 called_emsg = FALSE; | |
| 7 | 11184 win_redr_custom(wp, TRUE); |
| 680 | 11185 if (called_emsg) |
| 11186 set_string_option_direct((char_u *)"rulerformat", -1, | |
| 694 | 11187 (char_u *)"", OPT_FREE, SID_ERROR); |
| 680 | 11188 called_emsg |= save_called_emsg; |
| 7 | 11189 return; |
| 11190 } | |
| 11191 #endif | |
| 11192 | |
| 11193 /* | |
| 11194 * Check if not in Insert mode and the line is empty (will show "0-1"). | |
| 11195 */ | |
| 11196 if (!(State & INSERT) | |
| 11197 && *ml_get_buf(wp->w_buffer, wp->w_cursor.lnum, FALSE) == NUL) | |
| 11198 empty_line = TRUE; | |
| 11199 | |
| 11200 /* | |
| 11201 * Only draw the ruler when something changed. | |
| 11202 */ | |
| 11203 validate_virtcol_win(wp); | |
| 11204 if ( redraw_cmdline | |
| 11205 || always | |
| 11206 || wp->w_cursor.lnum != wp->w_ru_cursor.lnum | |
| 11207 || wp->w_cursor.col != wp->w_ru_cursor.col | |
| 11208 || wp->w_virtcol != wp->w_ru_virtcol | |
| 11209 || wp->w_cursor.coladd != wp->w_ru_cursor.coladd | |
| 11210 || wp->w_topline != wp->w_ru_topline | |
| 11211 || wp->w_buffer->b_ml.ml_line_count != wp->w_ru_line_count | |
| 11212 #ifdef FEAT_DIFF | |
| 11213 || wp->w_topfill != wp->w_ru_topfill | |
| 11214 #endif | |
| 11215 || empty_line != wp->w_ru_empty) | |
| 11216 { | |
| 11217 cursor_off(); | |
| 11218 if (wp->w_status_height) | |
| 11219 { | |
| 11220 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
|
11221 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
|
11222 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
|
11223 width = wp->w_width; |
| 7 | 11224 } |
| 11225 else | |
| 11226 { | |
| 11227 row = Rows - 1; | |
| 11228 fillchar = ' '; | |
| 11229 attr = 0; | |
| 11230 width = Columns; | |
| 11231 off = 0; | |
| 11232 } | |
| 11233 | |
| 11234 /* In list mode virtcol needs to be recomputed */ | |
| 11235 virtcol = wp->w_virtcol; | |
| 11236 if (wp->w_p_list && lcs_tab1 == NUL) | |
| 11237 { | |
| 11238 wp->w_p_list = FALSE; | |
| 11239 getvvcol(wp, &wp->w_cursor, NULL, &virtcol, NULL); | |
| 11240 wp->w_p_list = TRUE; | |
| 11241 } | |
| 11242 | |
| 11243 /* | |
| 11244 * Some sprintfs return the length, some return a pointer. | |
| 11245 * To avoid portability problems we use strlen() here. | |
| 11246 */ | |
| 1869 | 11247 vim_snprintf((char *)buffer, RULER_BUF_LEN, "%ld,", |
| 7 | 11248 (wp->w_buffer->b_ml.ml_flags & ML_EMPTY) |
| 11249 ? 0L | |
| 11250 : (long)(wp->w_cursor.lnum)); | |
| 1869 | 11251 len = STRLEN(buffer); |
| 11252 col_print(buffer + len, RULER_BUF_LEN - len, | |
| 7 | 11253 empty_line ? 0 : (int)wp->w_cursor.col + 1, |
| 11254 (int)virtcol + 1); | |
| 11255 | |
| 11256 /* | |
| 11257 * Add a "50%" if there is room for it. | |
| 11258 * On the last line, don't print in the last column (scrolls the | |
| 11259 * screen up on some terminals). | |
| 11260 */ | |
| 11261 i = (int)STRLEN(buffer); | |
| 1869 | 11262 get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); |
| 7 | 11263 o = i + vim_strsize(buffer + i + 1); |
| 11264 if (wp->w_status_height == 0) /* can't use last char of screen */ | |
| 11265 ++o; | |
| 11266 this_ru_col = ru_col - (Columns - width); | |
| 11267 if (this_ru_col < 0) | |
| 11268 this_ru_col = 0; | |
| 11269 /* Never use more than half the window/screen width, leave the other | |
| 11270 * 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
|
11271 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
|
11272 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
|
11273 if (this_ru_col + o < width) |
| 7 | 11274 { |
| 6466 | 11275 /* 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
|
11276 while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) |
| 7 | 11277 { |
| 11278 if (has_mbyte) | |
| 11279 i += (*mb_char2bytes)(fillchar, buffer + i); | |
| 11280 else | |
| 11281 buffer[i++] = fillchar; | |
| 11282 ++o; | |
| 11283 } | |
| 1869 | 11284 get_rel_pos(wp, buffer + i, RULER_BUF_LEN - i); |
| 7 | 11285 } |
| 11286 /* Truncate at window boundary. */ | |
| 11287 if (has_mbyte) | |
| 11288 { | |
| 11289 o = 0; | |
| 474 | 11290 for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) |
| 7 | 11291 { |
| 11292 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
|
11293 if (this_ru_col + o > width) |
| 7 | 11294 { |
| 11295 buffer[i] = NUL; | |
| 11296 break; | |
| 11297 } | |
| 11298 } | |
| 11299 } | |
|
15603
639b8318472c
patch 8.1.0809: too many #ifdefs
Bram Moolenaar <Bram@vim.org>
parents:
15555
diff
changeset
|
11300 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
|
11301 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
|
11302 |
|
68d7bc045dbe
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Christian Brabandt <cb@256bit.org>
parents:
12441
diff
changeset
|
11303 screen_puts(buffer, row, this_ru_col + off, attr); |
| 7 | 11304 i = redraw_cmdline; |
| 11305 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
|
11306 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
|
11307 (int)(off + width), |
| 7 | 11308 fillchar, fillchar, attr); |
| 11309 /* don't redraw the cmdline because of showing the ruler */ | |
| 11310 redraw_cmdline = i; | |
| 11311 wp->w_ru_cursor = wp->w_cursor; | |
| 11312 wp->w_ru_virtcol = wp->w_virtcol; | |
| 11313 wp->w_ru_empty = empty_line; | |
| 11314 wp->w_ru_topline = wp->w_topline; | |
| 11315 wp->w_ru_line_count = wp->w_buffer->b_ml.ml_line_count; | |
| 11316 #ifdef FEAT_DIFF | |
| 11317 wp->w_ru_topfill = wp->w_topfill; | |
| 11318 #endif | |
| 11319 } | |
| 11320 } | |
| 11321 #endif | |
| 13 | 11322 |
| 11323 #if defined(FEAT_LINEBREAK) || defined(PROTO) | |
| 11324 /* | |
|
2178
c6f1aa1e9f32
Add 'relativenumber' patch from Markus Heidelberg.
Bram Moolenaar <bram@vim.org>
parents:
2124
diff
changeset
|
11325 * 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
|
11326 * Caller may need to check if 'number' or 'relativenumber' is set. |
| 13 | 11327 * Otherwise it depends on 'numberwidth' and the line count. |
| 11328 */ | |
| 11329 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11330 number_width(win_T *wp) |
| 13 | 11331 { |
| 11332 int n; | |
| 11333 linenr_T lnum; | |
| 11334 | |
|
4736
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11335 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
|
11336 /* cursor line shows "0" */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11337 lnum = wp->w_height; |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11338 else |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11339 /* cursor line shows absolute line number */ |
|
3f2319a953b3
updated for version 7.3.1115
Bram Moolenaar <bram@vim.org>
parents:
4352
diff
changeset
|
11340 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
|
11341 |
| 6679 | 11342 if (lnum == wp->w_nrwidth_line_count && wp->w_nuw_cached == wp->w_p_nuw) |
| 13 | 11343 return wp->w_nrwidth_width; |
| 11344 wp->w_nrwidth_line_count = lnum; | |
| 11345 | |
| 11346 n = 0; | |
| 11347 do | |
| 11348 { | |
| 856 | 11349 lnum /= 10; |
| 11350 ++n; | |
| 13 | 11351 } while (lnum > 0); |
| 11352 | |
| 11353 /* 'numberwidth' gives the minimal width plus one */ | |
| 11354 if (n < wp->w_p_nuw - 1) | |
| 11355 n = wp->w_p_nuw - 1; | |
| 11356 | |
| 11357 wp->w_nrwidth_width = n; | |
| 6679 | 11358 wp->w_nuw_cached = wp->w_p_nuw; |
| 13 | 11359 return n; |
| 11360 } | |
| 11361 #endif | |
| 3986 | 11362 |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11363 #if defined(FEAT_EVAL) || defined(PROTO) |
| 3986 | 11364 /* |
| 11365 * Return the current cursor column. This is the actual position on the | |
| 11366 * screen. First column is 0. | |
| 11367 */ | |
| 11368 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11369 screen_screencol(void) |
| 3986 | 11370 { |
| 11371 return screen_cur_col; | |
| 11372 } | |
| 11373 | |
| 11374 /* | |
| 11375 * Return the current cursor row. This is the actual position on the screen. | |
| 11376 * First row is 0. | |
| 11377 */ | |
| 11378 int | |
|
7833
c079097365f3
commit https://github.com/vim/vim/commit/055409764ca5f7978d4c399d2c440af0ce971c4f
Christian Brabandt <cb@256bit.org>
parents:
7805
diff
changeset
|
11379 screen_screenrow(void) |
| 3986 | 11380 { |
| 11381 return screen_cur_row; | |
| 11382 } | |
|
15555
d89c5b339c2a
patch 8.1.0785: depending on the configuration some functions are unused
Bram Moolenaar <Bram@vim.org>
parents:
15543
diff
changeset
|
11383 #endif |