Mercurial > vim

comparison src/option.c @ 16778:eda4d65f232c v8.1.1391

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1391: no popup window support commit https://github.com/vim/vim/commit/4d784b21d14fc66e98a2b07f70343cdd4acd62aa Author: Bram Moolenaar <Bram@vim.org> Date: Sat May 25 19:51:39 2019 +0200 patch 8.1.1391: no popup window support Problem: No popup window support. Solution: Add initial code for popup windows. Add the 'wincolor' option.
author Bram Moolenaar <Bram@vim.org>
date Sat, 25 May 2019 20:00:08 +0200
parents ef00b6bc186b
children 306766ed0f70
comparison
equal deleted inserted replaced
16777:20d51e99dd6a 16778:eda4d65f232c
194 #endif 194 #endif
195 #ifdef FEAT_LINEBREAK 195 #ifdef FEAT_LINEBREAK
196 # define PV_BRI OPT_WIN(WV_BRI) 196 # define PV_BRI OPT_WIN(WV_BRI)
197 # define PV_BRIOPT OPT_WIN(WV_BRIOPT) 197 # define PV_BRIOPT OPT_WIN(WV_BRIOPT)
198 #endif 198 #endif
199 # define PV_WCR OPT_WIN(WV_WCR)
199 #ifdef FEAT_DIFF 200 #ifdef FEAT_DIFF
200 # define PV_DIFF OPT_WIN(WV_DIFF) 201 # define PV_DIFF OPT_WIN(WV_DIFF)
201 #endif 202 #endif
202 #ifdef FEAT_FOLDING 203 #ifdef FEAT_FOLDING
203 # define PV_FDC OPT_WIN(WV_FDC) 204 # define PV_FDC OPT_WIN(WV_FDC)
3030 {(char_u *)"menu", (char_u *)0L} 3031 {(char_u *)"menu", (char_u *)0L}
3031 #else 3032 #else
3032 (char_u *)NULL, PV_NONE, 3033 (char_u *)NULL, PV_NONE,
3033 {(char_u *)NULL, (char_u *)0L} 3034 {(char_u *)NULL, (char_u *)0L}
3034 #endif 3035 #endif
3036 SCTX_INIT},
3037 {"wincolor", "wcr", P_STRING|P_ALLOCED|P_VI_DEF|P_RWIN,
3038 (char_u *)VAR_WIN, PV_WCR,
3039 {(char_u *)"", (char_u *)NULL}
3035 SCTX_INIT}, 3040 SCTX_INIT},
3036 {"window", "wi", P_NUM|P_VI_DEF, 3041 {"window", "wi", P_NUM|P_VI_DEF,
3037 (char_u *)&p_window, PV_NONE, 3042 (char_u *)&p_window, PV_NONE,
3038 {(char_u *)0L, (char_u *)0L} SCTX_INIT}, 3043 {(char_u *)0L, (char_u *)0L} SCTX_INIT},
3039 {"winheight", "wh", P_NUM|P_VI_DEF, 3044 {"winheight", "wh", P_NUM|P_VI_DEF,
3209 static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL}; 3214 static char *(p_bsdir_values[]) = {"current", "last", "buffer", NULL};
3210 #endif 3215 #endif
3211 static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL}; 3216 static char *(p_scbopt_values[]) = {"ver", "hor", "jump", NULL};
3212 static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL}; 3217 static char *(p_debug_values[]) = {"msg", "throw", "beep", NULL};
3213 static char *(p_ead_values[]) = {"both", "ver", "hor", NULL}; 3218 static char *(p_ead_values[]) = {"both", "ver", "hor", NULL};
3214 static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", "terminal", "acwrite", "prompt", NULL}; 3219 static char *(p_buftype_values[]) = {"nofile", "nowrite", "quickfix", "help", "terminal", "acwrite", "prompt", "popup", NULL};
3215 static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", "wipe", NULL}; 3220 static char *(p_bufhidden_values[]) = {"hide", "unload", "delete", "wipe", NULL};
3216 static char *(p_bs_values[]) = {"indent", "eol", "start", NULL}; 3221 static char *(p_bs_values[]) = {"indent", "eol", "start", NULL};
3217 #ifdef FEAT_FOLDING 3222 #ifdef FEAT_FOLDING
3218 static char *(p_fdm_values[]) = {"manual", "expr", "marker", "indent", "syntax", 3223 static char *(p_fdm_values[]) = {"manual", "expr", "marker", "indent", "syntax",
3219 # ifdef FEAT_DIFF 3224 # ifdef FEAT_DIFF
10938 #ifdef FEAT_LINEBREAK 10943 #ifdef FEAT_LINEBREAK
10939 case PV_LBR: return (char_u *)&(curwin->w_p_lbr); 10944 case PV_LBR: return (char_u *)&(curwin->w_p_lbr);
10940 case PV_BRI: return (char_u *)&(curwin->w_p_bri); 10945 case PV_BRI: return (char_u *)&(curwin->w_p_bri);
10941 case PV_BRIOPT: return (char_u *)&(curwin->w_p_briopt); 10946 case PV_BRIOPT: return (char_u *)&(curwin->w_p_briopt);
10942 #endif 10947 #endif
10948 case PV_WCR: return (char_u *)&(curwin->w_p_wcr);
10943 case PV_SCBIND: return (char_u *)&(curwin->w_p_scb); 10949 case PV_SCBIND: return (char_u *)&(curwin->w_p_scb);
10944 case PV_CRBIND: return (char_u *)&(curwin->w_p_crb); 10950 case PV_CRBIND: return (char_u *)&(curwin->w_p_crb);
10945 #ifdef FEAT_CONCEAL 10951 #ifdef FEAT_CONCEAL
10946 case PV_COCU: return (char_u *)&(curwin->w_p_cocu); 10952 case PV_COCU: return (char_u *)&(curwin->w_p_cocu);
10947 case PV_COLE: return (char_u *)&(curwin->w_p_cole); 10953 case PV_COLE: return (char_u *)&(curwin->w_p_cole);
11122 #ifdef FEAT_LINEBREAK 11128 #ifdef FEAT_LINEBREAK
11123 to->wo_lbr = from->wo_lbr; 11129 to->wo_lbr = from->wo_lbr;
11124 to->wo_bri = from->wo_bri; 11130 to->wo_bri = from->wo_bri;
11125 to->wo_briopt = vim_strsave(from->wo_briopt); 11131 to->wo_briopt = vim_strsave(from->wo_briopt);
11126 #endif 11132 #endif
11133 to->wo_wcr = vim_strsave(from->wo_wcr);
11127 to->wo_scb = from->wo_scb; 11134 to->wo_scb = from->wo_scb;
11128 to->wo_scb_save = from->wo_scb_save; 11135 to->wo_scb_save = from->wo_scb_save;
11129 to->wo_crb = from->wo_crb; 11136 to->wo_crb = from->wo_crb;
11130 to->wo_crb_save = from->wo_crb_save; 11137 to->wo_crb_save = from->wo_crb_save;
11131 #ifdef FEAT_SPELL 11138 #ifdef FEAT_SPELL
11219 check_string_option(&wop->wo_tws); 11226 check_string_option(&wop->wo_tws);
11220 #endif 11227 #endif
11221 #ifdef FEAT_LINEBREAK 11228 #ifdef FEAT_LINEBREAK
11222 check_string_option(&wop->wo_briopt); 11229 check_string_option(&wop->wo_briopt);
11223 #endif 11230 #endif
11231 check_string_option(&wop->wo_wcr);
11224 } 11232 }
11225 11233
11226 /* 11234 /*
11227 * Free the allocated memory inside a winopt_T. 11235 * Free the allocated memory inside a winopt_T.
11228 */ 11236 */
11243 clear_string_option(&wop->wo_scl); 11251 clear_string_option(&wop->wo_scl);
11244 #endif 11252 #endif
11245 #ifdef FEAT_LINEBREAK 11253 #ifdef FEAT_LINEBREAK
11246 clear_string_option(&wop->wo_briopt); 11254 clear_string_option(&wop->wo_briopt);
11247 #endif 11255 #endif
11256 clear_string_option(&wop->wo_wcr);
11248 #ifdef FEAT_RIGHTLEFT 11257 #ifdef FEAT_RIGHTLEFT
11249 clear_string_option(&wop->wo_rlc); 11258 clear_string_option(&wop->wo_rlc);
11250 #endif 11259 #endif
11251 #ifdef FEAT_STL_OPT 11260 #ifdef FEAT_STL_OPT
11252 clear_string_option(&wop->wo_stl); 11261 clear_string_option(&wop->wo_stl);