Mercurial > vim
diff src/screen.c @ 12477:68d7bc045dbe v8.0.1118
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
commit https://github.com/vim/vim/commit/4033c55eca575777718c0701e26635a0cc47d907
Author: Bram Moolenaar <Bram@vim.org>
Date: Sat Sep 16 20:54:51 2017 +0200
patch 8.0.1118: FEAT_WINDOWS adds a lot of #ifdefs
Problem: FEAT_WINDOWS adds a lot of #ifdefs while it is nearly always
enabled and only adds 7% to the binary size of the tiny build.
Solution: Graduate FEAT_WINDOWS.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sat, 16 Sep 2017 21:00:06 +0200 |
| parents | 854f49cf0abe |
| children | 3f16cf18386c |
line wrap: on
line diff
--- a/src/screen.c +++ b/src/screen.c @@ -130,9 +130,7 @@ static void copy_text_attr(int off, char #endif static int win_line(win_T *, linenr_T, int, int, int nochange, proftime_T *syntax_tm); static int char_needs_redraw(int off_from, int off_to, int cols); -#ifdef FEAT_WINDOWS static void draw_vsep_win(win_T *wp, int row); -#endif #ifdef FEAT_STL_OPT static void redraw_custom_statusline(win_T *wp); #endif @@ -153,23 +151,15 @@ static void screen_char_2(unsigned off, static void screenclear2(void); static void lineclear(unsigned off, int width, int attr); static void lineinvalid(unsigned off, int width); -#ifdef FEAT_WINDOWS static void linecopy(int to, int from, win_T *wp); static void redraw_block(int row, int end, win_T *wp); -#endif static int win_do_lines(win_T *wp, int row, int line_count, int mayclear, int del, int clear_attr); static void win_rest_invalid(win_T *wp); static void msg_pos_mode(void); static void recording_mode(int attr); -#if defined(FEAT_WINDOWS) static void draw_tabline(void); -#endif -#if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) static int fillchar_status(int *attr, win_T *wp); -#endif -#ifdef FEAT_WINDOWS static int fillchar_vsep(int *attr); -#endif #ifdef FEAT_STL_OPT static void win_redr_custom(win_T *wp, int draw_ruler); #endif @@ -177,10 +167,8 @@ static void win_redr_custom(win_T *wp, i static void win_redr_ruler(win_T *wp, int always); #endif -#if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) /* Ugly global: overrule attribute used by screen_char() */ static int screen_char_attr = 0; -#endif #if defined(FEAT_SYN_HL) && defined(FEAT_RELTIME) /* Can limit syntax highlight time to 'redrawtime'. */ @@ -289,9 +277,7 @@ redraw_buf_and_status_later(buf_T *buf, if (wp->w_buffer == buf) { redraw_win_later(wp, type); -#ifdef FEAT_WINDOWS wp->w_redr_status = TRUE; -#endif } } } @@ -630,19 +616,15 @@ update_screen(int type_arg) else { wp->w_redr_type = NOT_VALID; -#ifdef FEAT_WINDOWS if (W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp) <= msg_scrolled) wp->w_redr_status = TRUE; -#endif } } } if (!no_update) redraw_cmdline = TRUE; -#ifdef FEAT_WINDOWS redraw_tabline = TRUE; -#endif } msg_scrolled = 0; need_wait_return = FALSE; @@ -697,11 +679,9 @@ update_screen(int type_arg) )) curwin->w_redr_type = type; -#ifdef FEAT_WINDOWS /* Redraw the tab pages line if needed. */ if (redraw_tabline || type >= NOT_VALID) draw_tabline(); -#endif #ifdef FEAT_SYN_HL /* @@ -712,19 +692,13 @@ update_screen(int type_arg) { if (wp->w_buffer->b_mod_set) { -# ifdef FEAT_WINDOWS win_T *wwp; /* Check if we already did this buffer. */ for (wwp = firstwin; wwp != wp; wwp = wwp->w_next) if (wwp->w_buffer == wp->w_buffer) break; -# endif - if ( -# ifdef FEAT_WINDOWS - wwp == wp && -# endif - syntax_present(wp)) + if (wwp == wp && syntax_present(wp)) syn_stack_apply_changes(wp->w_buffer); } } @@ -776,14 +750,12 @@ update_screen(int type_arg) win_update(wp); } -#ifdef FEAT_WINDOWS /* redraw status line after the window to minimize cursor movement */ if (wp->w_redr_status) { cursor_off(); win_redr_status(wp); } -#endif } #if defined(FEAT_SEARCH_EXTRA) end_search_hl(); @@ -794,14 +766,10 @@ update_screen(int type_arg) pum_redraw(); #endif -#ifdef FEAT_WINDOWS /* Reset b_mod_set flags. Going through all windows is probably faster * than going through all buffers (there could be many buffers). */ FOR_ALL_WINDOWS(wp) wp->w_buffer->b_mod_set = FALSE; -#else - curbuf->b_mod_set = FALSE; -#endif updating_screen = FALSE; #ifdef FEAT_GUI @@ -1038,7 +1006,6 @@ update_debug_sign(buf_T *buf, linenr_T l /* update all windows that need updating */ update_prepare(); -# ifdef FEAT_WINDOWS FOR_ALL_WINDOWS(wp) { if (wp->w_redr_type != 0) @@ -1046,10 +1013,6 @@ update_debug_sign(buf_T *buf, linenr_T l if (wp->w_redr_status) win_redr_status(wp); } -# else - if (curwin->w_redr_type != 0) - win_update(curwin); -# endif update_finish(); } @@ -1080,7 +1043,6 @@ updateWindow(win_T *wp) win_update(wp); -#ifdef FEAT_WINDOWS /* When the screen was cleared redraw the tab pages line. */ if (redraw_tabline) draw_tabline(); @@ -1094,7 +1056,6 @@ updateWindow(win_T *wp) # endif ) win_redr_status(wp); -#endif update_finish(); } @@ -1183,9 +1144,7 @@ win_update(win_T *wp) if (type == NOT_VALID) { -#ifdef FEAT_WINDOWS wp->w_redr_status = TRUE; -#endif wp->w_lines_valid = 0; } @@ -1196,7 +1155,6 @@ win_update(win_T *wp) return; } -#ifdef FEAT_WINDOWS /* Window is zero-width: Only need to draw the separator. */ if (wp->w_width == 0) { @@ -1205,7 +1163,6 @@ win_update(win_T *wp) wp->w_redr_type = 0; return; } -#endif #ifdef FEAT_TERMINAL /* If this window contains a terminal, redraw works completely differently. @@ -1603,11 +1560,9 @@ win_update(win_T *wp) * then. */ if (screen_cleared != TRUE) screenclear(); -#ifdef FEAT_WINDOWS /* The screen was cleared, redraw the tab pages line. */ if (redraw_tabline) draw_tabline(); -#endif } } @@ -2275,9 +2230,7 @@ win_update(win_T *wp) } else { -#ifdef FEAT_WINDOWS draw_vsep_win(wp, row); -#endif if (eof) /* we hit the end of the file */ { wp->w_botline = buf->b_ml.ml_line_count + 1; @@ -3116,7 +3069,7 @@ win_line( int need_showbreak = FALSE; /* overlong line, skipping first x chars */ #endif -#if defined(FEAT_SIGNS) || (defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS)) \ +#if defined(FEAT_SIGNS) || defined(FEAT_QUICKFIX) \ || defined(FEAT_SYN_HL) || defined(FEAT_DIFF) # define LINE_ATTR int line_attr = 0; /* attribute for the whole line */ @@ -3450,7 +3403,7 @@ win_line( if (v != 0) line_attr = sign_get_attr((int)v, TRUE); # endif -# if defined(FEAT_QUICKFIX) && defined(FEAT_WINDOWS) +# if defined(FEAT_QUICKFIX) /* Highlight the current line in the quickfix window. */ if (bt_quickfix(wp->w_buffer) && qf_current_entry(wp) == lnum) line_attr = HL_ATTR(HLF_QFL); @@ -5840,9 +5793,7 @@ win_line( ) { win_draw_end(wp, '@', ' ', row, wp->w_height, HLF_AT); -#ifdef FEAT_WINDOWS draw_vsep_win(wp, row); -#endif row = endrow; } @@ -5857,10 +5808,7 @@ win_line( #ifdef FEAT_DIFF && filler_todo <= 0 #endif -#ifdef FEAT_WINDOWS - && W_WIDTH(wp) == Columns -#endif - ) + && W_WIDTH(wp) == Columns) { /* Remember that the line wraps, used for modeless copy. */ LineWraps[screen_row - 1] = TRUE; @@ -6060,9 +6008,7 @@ screen_line( unsigned max_off_to; #endif int col = 0; -#if defined(FEAT_GUI) || defined(UNIX) || defined(FEAT_WINDOWS) int hl; -#endif int force = FALSE; /* force update rest of the line */ int redraw_this /* bool: does character need redraw? */ #ifdef FEAT_GUI @@ -6399,16 +6345,13 @@ screen_line( #endif screen_fill(row, row + 1, col + coloff, clear_width + coloff, ' ', ' ', 0); -#ifdef FEAT_WINDOWS off_to += clear_width - col; col = clear_width; -#endif } } if (clear_width > 0) { -#ifdef FEAT_WINDOWS /* For a window that's left of another, draw the separator char. */ if (col + coloff < Columns) { @@ -6416,15 +6359,15 @@ screen_line( c = fillchar_vsep(&hl); if (ScreenLines[off_to] != (schar_T)c -# ifdef FEAT_MBYTE +#ifdef FEAT_MBYTE || (enc_utf8 && (int)ScreenLinesUC[off_to] != (c >= 0x80 ? c : 0)) -# endif +#endif || ScreenAttrs[off_to] != hl) { ScreenLines[off_to] = c; ScreenAttrs[off_to] = hl; -# ifdef FEAT_MBYTE +#ifdef FEAT_MBYTE if (enc_utf8) { if (c >= 0x80) @@ -6435,12 +6378,11 @@ screen_line( else ScreenLinesUC[off_to] = 0; } -# endif +#endif screen_char(off_to, row, col + coloff); } } else -#endif LineWraps[row] = FALSE; } } @@ -6465,7 +6407,6 @@ rl_mirror(char_u *str) } #endif -#if defined(FEAT_WINDOWS) || defined(PROTO) /* * mark all status lines for redraw; used after first :cd */ @@ -6512,9 +6453,8 @@ redraw_statuslines(void) if (redraw_tabline) draw_tabline(); } -#endif - -#if (defined(FEAT_WILDMENU) && defined(FEAT_WINDOWS)) || defined(PROTO) + +#if defined(FEAT_WILDMENU) || defined(PROTO) /* * Redraw all status lines at the bottom of frame "frp". */ @@ -6538,7 +6478,6 @@ win_redraw_last_status(frame_T *frp) } #endif -#ifdef FEAT_WINDOWS /* * Draw the verticap separator right of window "wp" starting with line "row". */ @@ -6557,7 +6496,6 @@ draw_vsep_win(win_T *wp, int row) c, ' ', hl); } } -#endif #ifdef FEAT_WILDMENU static int status_match_len(expand_T *xp, char_u *s); @@ -6831,16 +6769,11 @@ win_redr_status_matches( screen_fill(row, row + 1, clen, (int)Columns, fillchar, fillchar, attr); } -#ifdef FEAT_WINDOWS win_redraw_last_status(topframe); -#else - lastwin->w_redr_status = TRUE; -#endif vim_free(buf); } #endif -#if defined(FEAT_WINDOWS) || defined(PROTO) /* * Redraw the status line of window wp. * @@ -7060,9 +6993,7 @@ stl_connected(win_T *wp) return FALSE; } -#endif /* FEAT_WINDOWS */ - -#if defined(FEAT_WINDOWS) || defined(FEAT_STL_OPT) || defined(PROTO) + /* * Get the value to show for the language mappings, active 'keymap'. */ @@ -7110,7 +7041,6 @@ get_keymap_str( } return buf[0] != NUL; } -#endif #if defined(FEAT_STL_OPT) || defined(PROTO) /* @@ -7181,19 +7111,11 @@ win_redr_custom( if (*stl++ != '(') stl = p_ruf; } -#ifdef FEAT_WINDOWS col = ru_col - (Columns - W_WIDTH(wp)); if (col < (W_WIDTH(wp) + 1) / 2) col = (W_WIDTH(wp) + 1) / 2; -#else - col = ru_col; - if (col > (Columns + 1) / 2) - col = (Columns + 1) / 2; -#endif maxwidth = W_WIDTH(wp) - col; -#ifdef FEAT_WINDOWS if (!wp->w_status_height) -#endif { row = Rows - 1; --maxwidth; /* writing in last column may cause scrolling */ @@ -7217,9 +7139,7 @@ win_redr_custom( # endif } -#ifdef FEAT_WINDOWS col += W_WINCOL(wp); -#endif } if (maxwidth <= 0) @@ -7277,18 +7197,16 @@ win_redr_custom( curattr = attr; else if (hltab[n].userhl < 0) curattr = syn_id2attr(-hltab[n].userhl); -#ifdef FEAT_WINDOWS -# ifdef FEAT_TERMINAL +#ifdef FEAT_TERMINAL else if (wp != NULL && wp != curwin && bt_terminal(wp->w_buffer) && wp->w_status_height != 0) curattr = highlight_stltermnc[hltab[n].userhl - 1]; else if (wp != NULL && bt_terminal(wp->w_buffer) && wp->w_status_height != 0) curattr = highlight_stlterm[hltab[n].userhl - 1]; -# endif +#endif else if (wp != NULL && wp != curwin && wp->w_status_height != 0) curattr = highlight_stlnc[hltab[n].userhl - 1]; -#endif else curattr = highlight_user[hltab[n].userhl - 1]; } @@ -8326,11 +8244,9 @@ screen_char(unsigned off, int row, int c /* * Stop highlighting first, so it's easier to move the cursor. */ -#if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) if (screen_char_attr != 0) attr = screen_char_attr; else -#endif attr = ScreenAttrs[off]; if (screen_attr != attr) screen_stop_highlight(); @@ -8403,7 +8319,6 @@ screen_char_2(unsigned off, int row, int } #endif -#if defined(FEAT_CLIPBOARD) || defined(FEAT_WINDOWS) || defined(PROTO) /* * Draw a rectangle of the screen, inverted when "invert" is TRUE. * This uses the contents of ScreenLines[] and doesn't change it. @@ -8455,9 +8370,7 @@ screen_draw_rectangle( } screen_char_attr = 0; } -#endif - -#ifdef FEAT_WINDOWS + /* * Redraw the characters for a vertically split window. */ @@ -8483,7 +8396,6 @@ redraw_block(int row, int end, win_T *wp } screen_draw_rectangle(row, col, end - row, width, FALSE); } -#endif /* * Fill the screen from 'start_row' to 'end_row', from 'start_col' to 'end_col' @@ -8742,10 +8654,8 @@ screenalloc(int doclear) sattr_T *new_ScreenAttrs; unsigned *new_LineOffset; char_u *new_LineWraps; -#ifdef FEAT_WINDOWS short *new_TabPageIdxs; tabpage_T *tp; -#endif static int entered = FALSE; /* avoid recursiveness */ static int done_outofmem_msg = FALSE; /* did outofmem message */ #ifdef FEAT_AUTOCMD @@ -8830,18 +8740,14 @@ retry: new_LineOffset = (unsigned *)lalloc((long_u)( Rows * sizeof(unsigned)), FALSE); new_LineWraps = (char_u *)lalloc((long_u)(Rows * sizeof(char_u)), FALSE); -#ifdef FEAT_WINDOWS new_TabPageIdxs = (short *)lalloc((long_u)(Columns * sizeof(short)), FALSE); -#endif FOR_ALL_TAB_WINDOWS(tp, wp) { if (win_alloc_lines(wp) == FAIL) { outofmem = TRUE; -#ifdef FEAT_WINDOWS goto give_up; -#endif } } #ifdef FEAT_AUTOCMD @@ -8849,9 +8755,7 @@ retry: && win_alloc_lines(aucmd_win) == FAIL) outofmem = TRUE; #endif -#ifdef FEAT_WINDOWS give_up: -#endif #ifdef FEAT_MBYTE for (i = 0; i < p_mco; ++i) @@ -8866,9 +8770,7 @@ give_up: || new_ScreenAttrs == NULL || new_LineOffset == NULL || new_LineWraps == NULL -#ifdef FEAT_WINDOWS || new_TabPageIdxs == NULL -#endif || outofmem) { if (ScreenLines != NULL || !done_outofmem_msg) @@ -8899,10 +8801,8 @@ give_up: new_LineOffset = NULL; vim_free(new_LineWraps); new_LineWraps = NULL; -#ifdef FEAT_WINDOWS vim_free(new_TabPageIdxs); new_TabPageIdxs = NULL; -#endif } else { @@ -8996,9 +8896,7 @@ give_up: ScreenAttrs = new_ScreenAttrs; LineOffset = new_LineOffset; LineWraps = new_LineWraps; -#ifdef FEAT_WINDOWS TabPageIdxs = new_TabPageIdxs; -#endif /* It's important that screen_Rows and screen_Columns reflect the actual * size of ScreenLines[]. Set them before calling anything. */ @@ -9065,9 +8963,7 @@ free_screenlines(void) vim_free(ScreenAttrs); vim_free(LineOffset); vim_free(LineWraps); -#ifdef FEAT_WINDOWS vim_free(TabPageIdxs); -#endif } void @@ -9126,9 +9022,7 @@ screenclear2(void) win_rest_invalid(firstwin); redraw_cmdline = TRUE; -#ifdef FEAT_WINDOWS redraw_tabline = TRUE; -#endif if (must_redraw == CLEAR) /* no need to clear again */ must_redraw = NOT_VALID; compute_cmdrow(); @@ -9165,7 +9059,6 @@ lineinvalid(unsigned off, int width) (void)vim_memset(ScreenAttrs + off, -1, (size_t)width * sizeof(sattr_T)); } -#ifdef FEAT_WINDOWS /* * Copy part of a Screenline for vertically split window "wp". */ @@ -9177,7 +9070,7 @@ linecopy(int to, int from, win_T *wp) mch_memmove(ScreenLines + off_to, ScreenLines + off_from, wp->w_width * sizeof(schar_T)); -# ifdef FEAT_MBYTE +#ifdef FEAT_MBYTE if (enc_utf8) { int i; @@ -9191,11 +9084,10 @@ linecopy(int to, int from, win_T *wp) if (enc_dbcs == DBCS_JPNU) mch_memmove(ScreenLines2 + off_to, ScreenLines2 + off_from, wp->w_width * sizeof(schar_T)); -# endif +#endif mch_memmove(ScreenAttrs + off_to, ScreenAttrs + off_from, wp->w_width * sizeof(sattr_T)); } -#endif /* * Return TRUE if clearing with term string "p" would work. @@ -9549,7 +9441,6 @@ win_ins_lines( * messing up those windows, better just redraw. */ did_delete = FALSE; -#ifdef FEAT_WINDOWS if (wp->w_next != NULL || wp->w_status_height) { if (screen_del_lines(0, W_WINROW(wp) + wp->w_height - line_count, @@ -9558,15 +9449,12 @@ win_ins_lines( else if (wp->w_next) return FAIL; } -#endif /* * if no lines deleted, blank the lines that will end up below the window */ if (!did_delete) { -#ifdef FEAT_WINDOWS wp->w_redr_status = TRUE; -#endif redraw_cmdline = TRUE; nextrow = W_WINROW(wp) + wp->w_height + W_STATUS_HEIGHT(wp); lastrow = nextrow + line_count; @@ -9583,9 +9471,7 @@ win_ins_lines( /* deletion will have messed up other windows */ if (did_delete) { -#ifdef FEAT_WINDOWS wp->w_redr_status = TRUE; -#endif win_rest_invalid(W_NEXT(wp)); } return FAIL; @@ -9626,7 +9512,6 @@ win_del_lines( (int)Rows, FALSE, clear_attr, NULL) == FAIL) return FAIL; -#ifdef FEAT_WINDOWS /* * If there are windows or status lines below, try to put them at the * correct place. If we can't do that, they have to be redrawn. @@ -9645,7 +9530,6 @@ win_del_lines( * command line later. */ else -#endif redraw_cmdline = TRUE; return OK; } @@ -9675,11 +9559,7 @@ win_do_lines( return FAIL; /* only a few lines left: redraw is faster */ - if (mayclear && Rows - line_count < 5 -#ifdef FEAT_WINDOWS - && wp->w_width == Columns -#endif - ) + if (mayclear && Rows - line_count < 5 && wp->w_width == Columns) { if (!no_win_do_lines_ins) screenclear(); /* will set wp->w_lines_valid to 0 */ @@ -9714,15 +9594,9 @@ win_do_lines( * a character in the lower right corner of the scroll region may cause a * scroll-up . */ - if (scroll_region -#ifdef FEAT_WINDOWS - || W_WIDTH(wp) != Columns -#endif - ) - { -#ifdef FEAT_WINDOWS + if (scroll_region || W_WIDTH(wp) != Columns) + { if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) -#endif scroll_region_set(wp, row); if (del) retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count, @@ -9730,17 +9604,13 @@ win_do_lines( else retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count, wp->w_height - row, clear_attr, wp); -#ifdef FEAT_WINDOWS if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL)) -#endif scroll_region_reset(); return retval; } -#ifdef FEAT_WINDOWS if (wp->w_next != NULL && p_tf) /* don't delete/insert on fast terminal */ return FAIL; -#endif return MAYBE; } @@ -9751,17 +9621,11 @@ win_do_lines( static void win_rest_invalid(win_T *wp) { -#ifdef FEAT_WINDOWS while (wp != NULL) -#else - if (wp != NULL) -#endif { redraw_win_later(wp, NOT_VALID); -#ifdef FEAT_WINDOWS wp->w_redr_status = TRUE; wp = wp->w_next; -#endif } redraw_cmdline = TRUE; } @@ -9856,12 +9720,9 @@ screen_ins_lines( * exists. */ result_empty = (row + line_count >= end); -#ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; - else -#endif - if (can_clear(T_CD) && result_empty) + else if (can_clear(T_CD) && result_empty) type = USE_T_CD; else if (*T_CAL != NUL && (line_count > 1 || *T_AL == NUL)) type = USE_T_CAL; @@ -9897,11 +9758,7 @@ screen_ins_lines( #ifdef FEAT_CLIPBOARD /* Remove a modeless selection when inserting lines halfway the screen * or not the full width of the screen. */ - if (off + row > 0 -# ifdef FEAT_WINDOWS - || (wp != NULL && wp->w_width != Columns) -# endif - ) + if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) clip_clear_selection(&clip_star); else clip_scroll_selection(-line_count); @@ -9926,7 +9783,6 @@ screen_ins_lines( end += off; for (i = 0; i < line_count; ++i) { -#ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ @@ -9942,7 +9798,6 @@ screen_ins_lines( LineWraps[j] = FALSE; } else -#endif { j = end - 1 - i; temp = LineOffset[j]; @@ -9965,13 +9820,10 @@ screen_ins_lines( if (clear_attr != 0) screen_start_highlight(clear_attr); -#ifdef FEAT_WINDOWS /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); - else -#endif - if (type == USE_T_CAL) + else if (type == USE_T_CAL) { term_append_lines(line_count); screen_start(); /* don't know where cursor is now */ @@ -10081,12 +9933,9 @@ screen_del_lines( * 5. Use T_DL (delete line) if it exists. * 6. redraw the characters from ScreenLines[]. */ -#ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL) type = USE_REDRAW; - else -#endif - if (can_clear(T_CD) && result_empty) + else if (can_clear(T_CD) && result_empty) type = USE_T_CD; #if defined(__BEOS__) && defined(BEOS_DR8) /* @@ -10113,10 +9962,7 @@ screen_del_lines( else if (*T_CDL != NUL && line_count > 1 && can_delete) type = USE_T_CDL; else if (can_clear(T_CE) && result_empty -#ifdef FEAT_WINDOWS - && (wp == NULL || wp->w_width == Columns) -#endif - ) + && (wp == NULL || wp->w_width == Columns)) type = USE_T_CE; else if (*T_DL != NUL && can_delete) type = USE_T_DL; @@ -10128,11 +9974,7 @@ screen_del_lines( #ifdef FEAT_CLIPBOARD /* Remove a modeless selection when deleting lines halfway the screen or * not the full width of the screen. */ - if (off + row > 0 -# ifdef FEAT_WINDOWS - || (wp != NULL && wp->w_width != Columns) -# endif - ) + if (off + row > 0 || (wp != NULL && wp->w_width != Columns)) clip_clear_selection(&clip_star); else clip_scroll_selection(line_count); @@ -10164,7 +10006,6 @@ screen_del_lines( end += off; for (i = 0; i < line_count; ++i) { -#ifdef FEAT_WINDOWS if (wp != NULL && wp->w_width != Columns) { /* need to copy part of a line */ @@ -10180,7 +10021,6 @@ screen_del_lines( LineWraps[j] = FALSE; } else -#endif { /* whole width, moving the line pointers is faster */ j = row + i; @@ -10204,13 +10044,10 @@ screen_del_lines( if (clear_attr != 0) screen_start_highlight(clear_attr); -#ifdef FEAT_WINDOWS /* redraw the characters */ if (type == USE_REDRAW) redraw_block(row, end, wp); - else -#endif - if (type == USE_T_CD) /* delete the lines */ + else if (type == USE_T_CD) /* delete the lines */ { windgoto(cursor_row, 0); out_str(T_CD); @@ -10487,11 +10324,7 @@ showmode(void) /* If the last window has no status line, the ruler is after the mode * message and must be redrawn */ - if (redrawing() -# ifdef FEAT_WINDOWS - && lastwin->w_status_height == 0 -# endif - ) + if (redrawing() && lastwin->w_status_height == 0) win_redr_ruler(lastwin, TRUE); #endif redraw_cmdline = FALSE; @@ -10551,7 +10384,6 @@ recording_mode(int attr) } } -#if defined(FEAT_WINDOWS) /* * Draw the tab pages line at the top of the Vim window. */ @@ -10754,9 +10586,7 @@ get_trans_bufname(buf_T *buf) home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE); trans_characters(NameBuff, MAXPATHL); } -#endif - -#if defined(FEAT_WINDOWS) || defined(FEAT_WILDMENU) || defined(FEAT_STL_OPT) + /* * Get the character to use in a status line. Get its attributes in "*attr". */ @@ -10802,9 +10632,7 @@ fillchar_status(int *attr, win_T *wp) return '^'; return '='; } -#endif - -#ifdef FEAT_WINDOWS + /* * Get the character to use in a separator between vertically split windows. * Get its attributes in "*attr". @@ -10818,7 +10646,6 @@ fillchar_vsep(int *attr) else return fill_vert; } -#endif /* * Return TRUE if redrawing should currently be done. @@ -10856,14 +10683,12 @@ showruler(int always) #ifdef FEAT_INS_EXPAND if (pum_visible()) { -# ifdef FEAT_WINDOWS /* Don't redraw right now, do it later. */ curwin->w_redr_status = TRUE; -# endif return; } #endif -#if defined(FEAT_STL_OPT) && defined(FEAT_WINDOWS) +#if defined(FEAT_STL_OPT) if ((*p_stl != NUL || *curwin->w_p_stl != NUL) && curwin->w_status_height) { redraw_custom_statusline(curwin); @@ -10883,11 +10708,9 @@ showruler(int always) ) maketitle(); #endif -#ifdef FEAT_WINDOWS /* Redraw the tab pages line if needed. */ if (redraw_tabline) draw_tabline(); -#endif } #ifdef FEAT_CMDL_INFO @@ -10904,17 +10727,9 @@ win_redr_ruler(win_T *wp, int always) int i; size_t len; int o; -#ifdef FEAT_WINDOWS int this_ru_col; int off = 0; int width = Columns; -# define WITH_OFF(x) x -# define WITH_WIDTH(x) x -#else -# define WITH_OFF(x) 0 -# define WITH_WIDTH(x) Columns -# define this_ru_col ru_col -#endif /* If 'ruler' off or redrawing disabled, don't do anything */ if (!p_ru) @@ -10930,9 +10745,7 @@ win_redr_ruler(win_T *wp, int always) #ifdef FEAT_INS_EXPAND /* Don't draw the ruler while doing insert-completion, it might overwrite * the (long) mode message. */ -# ifdef FEAT_WINDOWS if (wp == lastwin && lastwin->w_status_height == 0) -# endif if (edit_submode != NULL) return; /* Don't draw the ruler when the popup menu is visible, it may overlap. */ @@ -10982,7 +10795,6 @@ win_redr_ruler(win_T *wp, int always) || empty_line != wp->w_ru_empty) { cursor_off(); -#ifdef FEAT_WINDOWS if (wp->w_status_height) { row = W_WINROW(wp) + wp->w_height; @@ -10991,15 +10803,12 @@ win_redr_ruler(win_T *wp, int always) width = W_WIDTH(wp); } else -#endif { row = Rows - 1; fillchar = ' '; attr = 0; -#ifdef FEAT_WINDOWS width = Columns; off = 0; -#endif } /* In list mode virtcol needs to be recomputed */ @@ -11032,23 +10841,19 @@ win_redr_ruler(win_T *wp, int always) i = (int)STRLEN(buffer); get_rel_pos(wp, buffer + i + 1, RULER_BUF_LEN - i - 1); o = i + vim_strsize(buffer + i + 1); -#ifdef FEAT_WINDOWS if (wp->w_status_height == 0) /* can't use last char of screen */ -#endif ++o; -#ifdef FEAT_WINDOWS this_ru_col = ru_col - (Columns - width); if (this_ru_col < 0) this_ru_col = 0; -#endif /* Never use more than half the window/screen width, leave the other * half for the filename. */ - if (this_ru_col < (WITH_WIDTH(width) + 1) / 2) - this_ru_col = (WITH_WIDTH(width) + 1) / 2; - if (this_ru_col + o < WITH_WIDTH(width)) + if (this_ru_col < (width + 1) / 2) + this_ru_col = (width + 1) / 2; + if (this_ru_col + o < width) { /* need at least 3 chars left for get_rel_pos() + NUL */ - while (this_ru_col + o < WITH_WIDTH(width) && RULER_BUF_LEN > i + 4) + while (this_ru_col + o < width && RULER_BUF_LEN > i + 4) { #ifdef FEAT_MBYTE if (has_mbyte) @@ -11068,7 +10873,7 @@ win_redr_ruler(win_T *wp, int always) for (i = 0; buffer[i] != NUL; i += (*mb_ptr2len)(buffer + i)) { o += (*mb_ptr2cells)(buffer + i); - if (this_ru_col + o > WITH_WIDTH(width)) + if (this_ru_col + o > width) { buffer[i] = NUL; break; @@ -11077,14 +10882,14 @@ win_redr_ruler(win_T *wp, int always) } else #endif - if (this_ru_col + (int)STRLEN(buffer) > WITH_WIDTH(width)) - buffer[WITH_WIDTH(width) - this_ru_col] = NUL; - - screen_puts(buffer, row, this_ru_col + WITH_OFF(off), attr); + if (this_ru_col + (int)STRLEN(buffer) > width) + buffer[width - this_ru_col] = NUL; + + screen_puts(buffer, row, this_ru_col + off, attr); i = redraw_cmdline; screen_fill(row, row + 1, - this_ru_col + WITH_OFF(off) + (int)STRLEN(buffer), - (int)(WITH_OFF(off) + WITH_WIDTH(width)), + this_ru_col + off + (int)STRLEN(buffer), + (int)(off + width), fillchar, fillchar, attr); /* don't redraw the cmdline because of showing the ruler */ redraw_cmdline = i;