src/strings.c \
src/structs.h \
src/syntax.c \
+ src/tabpanel.c \
src/tag.c \
src/term.c \
src/terminal.c \
src/proto/spellsuggest.pro \
src/proto/strings.pro \
src/proto/syntax.pro \
+ src/proto/tabpanel.pro \
src/proto/tag.pro \
src/proto/term.pro \
src/proto/terminal.pro \
-*builtin.txt* For Vim version 9.1. Last change: 2025 May 09
+*builtin.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
If not over a window, e.g. when in the command line, then only
"screenrow" and "screencol" are valid, the others are zero.
+ When on the |tabpanel|, "wincol" value is zero.
+
When on the status line below a window or the vertical
separator right of a window, the "line" and "column" values
are zero.
-*index.txt* For Vim version 9.1. Last change: 2025 Mar 18
+*index.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
|:redraw| :redr[aw] force a redraw of the display
|:redrawstatus| :redraws[tatus] force a redraw of the status line(s)
|:redrawtabline| :redrawt[abline] force a redraw of the tabline
+|:redrawtabpanel| :redrawtabp[anel] force a redraw of the tabpanel
|:registers| :reg[isters] display the contents of registers
|:resize| :res[ize] change current window height
|:retab| :ret[ab] change tab size
-*options.txt* For Vim version 9.1. Last change: 2025 May 10
+*options.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
trunc '>' truncated text in the
|ins-completion-menu|.
truncrl '<' same as "trunc" in 'rightleft' mode
+ tpl_vert '|' vertical separators of 'tabpanel'
Any one that is omitted will fall back to the default.
Example: >
- :set fillchars=stl:\ ,stlnc:\ ,vert:\|,fold:-,diff:-
+ :set fillchars=stl:\ ,stlnc:\ ,vert:\|,fold:-,diff:-,tpl_vert:\|
<
All items support single-byte and multibyte characters. But
double-width characters are not supported. |E1512|
line.
See |tab-page| for more information about tab pages.
+ *'showtabpanel'* *'stpl'*
+'showtabpanel' 'stpl' number (default 0)
+ global
+ {not in Vi}
+ {not available when compiled without the |+tabpanel|
+ feature}
+ The value of this option specifies when the |tabpanel| with tab page
+ labels will be displayed:
+ 0: never
+ 1: only if there are at least two tab pages
+ 2: always
+ This is for the non-GUI implementation of the tabpanel only.
+ See |tab-page| for more information about tab page labels.
+
*'sidescroll'* *'ss'*
'sidescroll' 'ss' number (default 0)
global
Maximum number of tab pages to be opened by the |-p| command line
argument or the ":tab all" command. |tabpage|
+ *'tabpanel'* *'tpl'* *g:actual_curtabpage*
+'tabpanel' 'tpl' string (default empty)
+ global
+ {not in Vi}
+ When non empty, this option determines the content of the |tabpanel|.
+ The option consists of printf style '%' items interspersed with
+ normal text, similar to the 'statusline' or 'tabline'.
+
+ When changing something that is used in 'tabpanel' that does not
+ trigger it to be updated, use |:redrawtabpanel|.
+ This option cannot be set in a modeline when 'modelineexpr' is off.
+
+ You can use |g:actual_curtabpage| within a function assigned to
+ tabpanel. |g:actual_curtabpage| represents current tab's label number.
+ This option can contain line breaks:
+>
+ set tabpanel=%!TabPanel()
+ function! TabPanel() abort
+ return printf("(%2d)\n %%f", g:actual_curtabpage)
+ endfunction
+<
+ The result is:
+>
+ +-----------+---------------------------------
+ |(1) |
+ | ~/aaa.txt|
+ |(2) |
+ | ~/.vimrc |
+ | |
+ | |
+ | |
+<
+
+ *'tabpanelopt'* *'tplo'*
+'tabpanelopt' 'tplo' string (default "")
+ global
+ {not in Vi}
+ Optional settings for the |tabpanel|, It can consist of the following
+ items. Items must be separated by a comma.
+
+ align:{text} Specified the position of tabpanel.
+ Currently supported positions are:
+
+ left left-aligned
+ right right-aligned
+
+ (default "left")
+
+ columns:{n} Use the size (in char) of tabpanel.
+ The tabpanel is never shown when using zero
+ or less than the size of Vim window.
+ (default 20)
+
+ vert Use a vertical separator for tabpanel.
+ This vertical separator is used "tpl_vert" of
+ 'fillchars'.
+ (default off)
+
+ Examples: >
+ :set tabpanelopt=columns:16,align:right
+ :set tabpanelopt=
+ :set tabpanelopt=vert,align:right
+ :set tabpanelopt=columns:16
+<
+
*'tabstop'* *'ts'*
'tabstop' 'ts' number (default 8)
local to buffer
-*syntax.txt* For Vim version 9.1. Last change: 2025 Apr 28
+*syntax.txt* For Vim version 9.1. Last change: 2025 May 10
VIM REFERENCE MANUAL by Bram Moolenaar
TabLineFill Tab pages line, where there are no labels.
*hl-TabLineSel*
TabLineSel Tab pages line, active tab page label.
+ *hl-TabPanel*
+TabPanel TabPanel, not active tab page label.
+ *hl-TabPanelFill*
+TabPanelFill TabPanel, where there are no labels.
+ *hl-TabPanelSel*
+TabPanelSel TabPanel, active tab page label.
*hl-Terminal*
Terminal |terminal| window (see |terminal-size-color|).
*hl-Title*
-*tabpage.txt* For Vim version 9.1. Last change: 2024 Jul 12
+*tabpage.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
2. Commands |tab-page-commands|
3. Other items |tab-page-other|
4. Setting 'tabline' |setting-tabline|
-5. Setting 'guitablabel' |setting-guitablabel|
+5. Setting 'tabpanel' |setting-tabpanel|
+6. Setting 'guitablabel' |setting-guitablabel|
{not able to use multiple tab pages when the |+windows| feature was disabled
at compile time}
labels. This isn't easy, thus an example will be given here.
For basics see the 'statusline' option. The same items can be used in the
-'tabline' option. Additionally, the |tabpagebuflist()|, |tabpagenr()| and
-|tabpagewinnr()| functions are useful.
+'tabline' and 'tabpanel' option. Additionally, the |tabpagebuflist()|,
+|tabpagenr()| and |tabpagewinnr()| functions are useful.
Since the number of tab labels will vary, you need to use an expression for
the whole option. Something like: >
space available.
==============================================================================
-5. Setting 'guitablabel' *setting-guitablabel*
+5. Setting 'tabpanel' *tabpanel* *setting-tabpanel*
+
+The tabpanel is a vertical sidebar that displays tab page labels along the
+side of the window. It looks like this:
+>
+ +-----------+----------------------------------
+ |(1) |text text text text text text text
+ | ~/aaa.txt|text text text text text text text
+ |(2) |text text text text text text text
+ | ~/.vimrc |text text text text text text text
+ |(3) |text text text text text text text
+ | ~/bbb.js |text text text text text text text
+ | ~/ccc.css|text text text text text text text
+ | |text text text text text text text
+ | |text text text text text text text
+ | |text text text text text text text
+<
+To configure the tabpanel, use following options: 'tabpanel',
+'showtabpanel', 'tabpanelopt'.
+The 'tabpanel' and 'showtabpanel' options are function similar to the
+'statusline' or 'tabline'.
+
+The "columns:" of 'tabpanelopt' option specifies the width of the tabpanel:
+>
+ +------ This width
+ |
+ <----+----->
+ +-----------+----------------------------------
+ |(1) |text text text text text text text
+ | ~/aaa.txt|text text text text text text text
+ |(2) |text text text text text text text
+<
+The "align:" of 'tabpanelopt' option determines whether the tabpanel is
+displayed on the right side of the window:
+>
+ +----------------------------------+-----------
+ |text text text text text text text|(1)
+ |text text text text text text text| ~/aaa.txt
+ |text text text text text text text|(2)
+<
+The "wrap" of 'tabpanelopt' option controls whether lines in tabpanel are
+wraped:
+>
+ +-----------+----------------------------------
+ |(1) |text text text text text text text
+ | ~/long_lo|text text text text text text text
+ |ng_file_nam|text text text text text text text
+ |e.txt |text text text text text text text
+ |(2) |text text text text text text text
+
+The "vert" of 'tabpanelopt' option defines whether a vertical separator is
+displayed between the tabpanel and the main window:
+>
+ +------ This is
+ |
+ v
+ +-----------+----------------------------------
+ |(1) |text text text text text text text
+ | ~/aaa.txt|text text text text text text text
+ |(2) |text text text text text text text
+<
+The vertical separator is used "tpl_vert" of 'fillchars'.
+
+You can customize the appearance of the tab page labels using the highlight
+groups: |hl-TabPanel| |hl-TabPanelSel| |hl-TabPanelFill|
+
+==============================================================================
+6. Setting 'guitablabel' *setting-guitablabel*
When the GUI tab pages line is displayed, 'guitablabel' can be used to
specify the label to display for each tab page. Unlike 'tabline', which
'showmatch' options.txt /*'showmatch'*
'showmode' options.txt /*'showmode'*
'showtabline' options.txt /*'showtabline'*
+'showtabpanel' options.txt /*'showtabpanel'*
'shq' options.txt /*'shq'*
'si' options.txt /*'si'*
'sidescroll' options.txt /*'sidescroll'*
'statusline' options.txt /*'statusline'*
'stl' options.txt /*'stl'*
'stmp' options.txt /*'stmp'*
+'stpl' options.txt /*'stpl'*
'sts' options.txt /*'sts'*
'su' options.txt /*'su'*
'sua' options.txt /*'sua'*
'tabclose' options.txt /*'tabclose'*
'tabline' options.txt /*'tabline'*
'tabpagemax' options.txt /*'tabpagemax'*
+'tabpanel' options.txt /*'tabpanel'*
+'tabpanelopt' options.txt /*'tabpanelopt'*
'tabstop' options.txt /*'tabstop'*
'tag' options.txt /*'tag'*
'tagbsearch' options.txt /*'tagbsearch'*
'toolbar' options.txt /*'toolbar'*
'toolbariconsize' options.txt /*'toolbariconsize'*
'top' options.txt /*'top'*
+'tpl' options.txt /*'tpl'*
+'tplo' options.txt /*'tplo'*
'tpm' options.txt /*'tpm'*
'tr' options.txt /*'tr'*
'ts' options.txt /*'ts'*
+sun_workshop various.txt /*+sun_workshop*
+syntax various.txt /*+syntax*
+system() various.txt /*+system()*
++tabpanel various.txt /*+tabpanel*
+tag_any_white various.txt /*+tag_any_white*
+tag_binary various.txt /*+tag_binary*
+tag_old_static various.txt /*+tag_old_static*
:redrawstatus various.txt /*:redrawstatus*
:redrawt various.txt /*:redrawt*
:redrawtabline various.txt /*:redrawtabline*
+:redrawtabp various.txt /*:redrawtabp*
+:redrawtabpanel various.txt /*:redrawtabpanel*
:reg change.txt /*:reg*
:registers change.txt /*:registers*
:res windows.txt /*:res*
E154 helphelp.txt /*E154*
E1540 eval.txt /*E1540*
E1541 vi_diff.txt /*E1541*
+E1547 various.txt /*E1547*
E155 sign.txt /*E155*
E156 sign.txt /*E156*
E157 sign.txt /*E157*
g:Netrw_funcref pi_netrw.txt /*g:Netrw_funcref*
g:Openprg eval.txt /*g:Openprg*
g:actual_curbuf options.txt /*g:actual_curbuf*
+g:actual_curtabpage options.txt /*g:actual_curtabpage*
g:actual_curwin options.txt /*g:actual_curwin*
g:ada#Comment ft_ada.txt /*g:ada#Comment*
g:ada#Ctags_Kinds ft_ada.txt /*g:ada#Ctags_Kinds*
hl-TabLine syntax.txt /*hl-TabLine*
hl-TabLineFill syntax.txt /*hl-TabLineFill*
hl-TabLineSel syntax.txt /*hl-TabLineSel*
+hl-TabPanel syntax.txt /*hl-TabPanel*
+hl-TabPanelFill syntax.txt /*hl-TabPanelFill*
+hl-TabPanelSel syntax.txt /*hl-TabPanelSel*
hl-Terminal syntax.txt /*hl-Terminal*
hl-Title syntax.txt /*hl-Title*
hl-ToolbarButton gui.txt /*hl-ToolbarButton*
setting-guifont gui.txt /*setting-guifont*
setting-guitablabel tabpage.txt /*setting-guitablabel*
setting-tabline tabpage.txt /*setting-tabline*
+setting-tabpanel tabpage.txt /*setting-tabpanel*
setuid change.txt /*setuid*
setwinvar() builtin.txt /*setwinvar()*
sftp pi_netrw.txt /*sftp*
tabpagebuflist() builtin.txt /*tabpagebuflist()*
tabpagenr() builtin.txt /*tabpagenr()*
tabpagewinnr() builtin.txt /*tabpagewinnr()*
+tabpanel tabpage.txt /*tabpanel*
tag tagsrch.txt /*tag*
tag-! tagsrch.txt /*tag-!*
tag-binary-search tagsrch.txt /*tag-binary-search*
-*various.txt* For Vim version 9.1. Last change: 2025 Apr 21
+*various.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
'tabline' includes an item that doesn't trigger
automatic updating.
+ *E1547* *:redrawtabp* *:redrawtabpanel*
+:redrawtabp[anel] Redraw the tabline. Useful to update the tabpanel
+ when 'tabpanel' includes an item that doesn't trigger
+ automatic updating.
+
+
*N<Del>*
<Del> When entering a number: Remove the last digit.
Note: if you like to use <BS> for this, add this
- *+sun_workshop* Removed: |workshop|
N *+syntax* Syntax highlighting |syntax|
*+system()* Unix only: opposite of |+fork|
+H *+tabpanel* Support for |tabpanel|
T *+tag_binary* binary searching in tags file |tag-binary-search|
- *+tag_old_static* Removed; method for static tags |tag-old-static|
- *+tag_any_white* Removed; was to allow any white space in tags files
-*version9.txt* For Vim version 9.1. Last change: 2025 May 08
+*version9.txt* For Vim version 9.1. Last change: 2025 May 14
VIM REFERENCE MANUAL by Bram Moolenaar
Support for the |Tuple| data type in Vim script and Vim9 script.
+Support for a vertical |tabpanel| window similar to the 'tabline'.
+
*changed-9.2*
Changed~
-------
|hl-PmenuMatch| Popup menu: highlighting of matched text
|hl-PmenuMatchSel| Popup menu: highlighting of matched text in selected
line
+|hl-TabPanel| |tabpanel|: not active tab page label
+|hl-TabPanelFill| |tabpanel|: filler space
+|hl-TabPanelSel| |tabpanel|: active tab page label
Commands: ~
|:iput| like |:put| but adjust indent
|:pbuffer| Edit buffer [N] from the buffer list in the preview
window
+|:redrawtabpanel| Force updating the 'tabpanel'.
Options: ~
'lhistory' Size of the location list stack |quickfix-stack|.
'messagesopt' configure |:messages| and |hit-enter| prompt
'pummaxwidth' maximum width for the completion popup menu
+'showtabpanel' When to show the |tabpanel|
'tabclose' Which tab page to focus after closing a tab page
+'tabpanel' Optional vertical panel for displaying tabpages
+ |tabpanel|
+'tabpanelopt' Optional settings for the |tabpanel|
't_xo' Terminal uses XON/XOFF handshaking (e.g. vt420)
't_CF' Support for alternate font highlighting terminal code
'winfixbuf' Keep buffer focused in a window
" These commands create the option window.
"
" Maintainer: The Vim Project <https://github.com/vim/vim>
-" Last Change: 2025 Apr 24
+" Last Change: 2025 May 14
" Former Maintainer: Bram Moolenaar <Bram@vim.org>
" If there already is an option window, jump to that one.
call <SID>AddOption("mzschemegcdll", gettext("name of the MzScheme GC dynamic library"))
call <SID>OptionG("mzschemegcdll", &mzschemegcdll)
endif
+if has("tabpanel")
+ call <SID>AddOption("showtabpanel", gettext("0, 1 or 2; when to use a tab pages in tabpanel"))
+ call <SID>AddOption("tabpanel", gettext("custom tab pages in tabpanel"))
+ call <SID>AddOption("tabpanelopt", gettext("options for using tabpanel"))
+endif
set cpo&vim
" Language: Vim script
" Maintainer: Hirohito Higashi <h.east.727 ATMARK gmail.com>
" Doug Kearns <dougkearns@gmail.com>
-" Last Change: 2025 May 04
+" Last Change: 2025 May 14
" Former Maintainer: Charles E. Campbell
" DO NOT CHANGE DIRECTLY.
syn keyword vimCommand contained abo[veleft] al[l] ar[gs] arga[dd] argd[elete] argdo argded[upe] arge[dit] argg[lobal] argl[ocal] argu[ment] as[cii] b[uffer] bN[ext] ba[ll] bad[d] balt bd[elete] bel[owright] bf[irst] bl[ast] bm[odified] bn[ext] bo[tright] bp[revious] br[ewind] brea[k] breaka[dd] breakd[el] breakl[ist] bro[wse] buffers bufd[o] bun[load] bw[ipeout] c[hange] cN[ext] cNf[ile] cabo[ve] cad[dbuffer] cadde[xpr] caddf[ile] caf[ter] cb[uffer] cbe[fore] cbel[ow] cbo[ttom] cc ccl[ose] cd cdo ce[nter] cex[pr] cf[ile] cfd[o] cfir[st] cg[etfile] cgetb[uffer] cgete[xpr] chd[ir] changes che[ckpath] checkt[ime] chi[story] cl[ist] cla[st] clo[se] cle[arjumps] cn[ext] cnew[er] cnf[ile] co[py] col[der] colo[rscheme] com[mand] comc[lear] comp[iler] con[tinue] conf[irm] nextgroup=vimBang
syn keyword vimCommand contained cons[t] cope[n] cp[revious] cpf[ile] cq[uit] cr[ewind] cs[cope] cst[ag] cw[indow] d[elete] delm[arks] deb[ug] defc[ompile] defe[r] delf[unction] di[splay] dif[fupdate] diffg[et] diffo[ff] diffp[atch] diffpu[t] diffs[plit] difft[his] dig[raphs] disa[ssemble] dj[ump] dli[st] dr[op] ds[earch] dsp[lit] e[dit] ea[rlier] em[enu] endfo[r] endt[ry] endw[hile] ene[w] ev[al] ex exi[t] exu[sage] f[ile] files filet[ype] fin[d] fina[lly] fini[sh] fir[st] fix[del] fo[ld] foldc[lose] foldd[oopen] folddoc[losed] foldo[pen] g[lobal] go[to] gu[i] gv[im] h[elp] helpc[lose] helpf[ind] helpt[ags] ha[rdcopy] hi[ghlight] hid[e] his[tory] hor[izontal] ij[ump] il[ist] imp[ort] int[ro] ip[ut] is[earch] isp[lit] j[oin] ju[mps] k kee[pmarks] keepj[umps] keepp[atterns] nextgroup=vimBang
syn keyword vimCommand contained keepa[lt] l[ist] lN[ext] lNf[ile] la[st] lab[ove] lan[guage] lad[dexpr] laddb[uffer] laddf[ile] laf[ter] lat[er] lb[uffer] lbe[fore] lbel[ow] lbo[ttom] lc[d] lch[dir] lcl[ose] lcs[cope] ld[o] le[ft] lefta[bove] lex[pr] leg[acy] lf[ile] lfd[o] lfir[st] lg[etfile] lgetb[uffer] lgete[xpr] lgr[ep] lgrepa[dd] lhi[story] ll lla[st] lli[st] lmak[e] lne[xt] lnew[er] lnf[ile] lo[adview] loc[kmarks] lockv[ar] lol[der] lop[en] lp[revious] lpf[ile] lr[ewind] lt[ag] lua luad[o] luaf[ile] lw[indow] ls m[ove] ma[rk] marks menut[ranslate] mes[sages] mk[exrc] mks[ession] mksp[ell] mkv[imrc] mkvie[w] mod[e] mz[scheme] mzf[ile] n[ext] nb[key] nbc[lose] nbs[tart] noa[utocmd] noh[lsearch] nos[wapfile] nu[mber] o[pen] ol[dfiles] on[ly] opt[ions] ow[nsyntax] nextgroup=vimBang
-syn keyword vimCommand contained p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] pe[rl] perld[o] ped[it] po[p] pp[op] pre[serve] prev[ious] pro[mptfind] promptr[epl] prof[ile] profd[el] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] py[thon] pyd[o] pyf[ile] py3 py3d[o] python3 py3f[ile] pyx pyxd[o] pythonx pyxf[ile] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] rightb[elow] ru[ntime] rub[y] rubyd[o] rubyf[ile] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] san[dbox] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] scr[iptnames] scripte[ncoding] scriptv[ersion] nextgroup=vimBang
-syn keyword vimCommand contained scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sil[ent] sla[st] sn[ext] so[urce] sp[lit] spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sre[wind] st[op] sta[g] star[tinsert] startg[replace] startr[eplace] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sw[apname] synti[me] sync[bind] smi[le] t tN[ext] ta[g] tags tab tabc[lose] tabd[o] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs tc[d] tch[dir] tcl tcld[o] tclf[ile] te[aroff] ter[minal] tf[irst] tj[ump] tl[ast] tn[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] unlo[ckvar] uns[ilent] nextgroup=vimBang
-syn keyword vimCommand contained up[date] v[global] ve[rsion] verb[ose] vert[ical] vi[sual] vie[w] vim9[cmd] viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wi[nsize] winc[md] wind[o] winp[os] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp deletep a i nextgroup=vimBang
+syn keyword vimCommand contained p[rint] pa[ckadd] packl[oadall] pb[uffer] pc[lose] pe[rl] perld[o] ped[it] po[p] pp[op] pre[serve] prev[ious] pro[mptfind] promptr[epl] prof[ile] profd[el] ps[earch] pt[ag] ptN[ext] ptf[irst] ptj[ump] ptl[ast] ptn[ext] ptp[revious] ptr[ewind] pts[elect] pu[t] pw[d] py[thon] pyd[o] pyf[ile] py3 py3d[o] python3 py3f[ile] pyx pyxd[o] pythonx pyxf[ile] q[uit] quita[ll] qa[ll] r[ead] rec[over] red[o] redr[aw] redraws[tatus] redrawt[abline] redrawtabp[anel] reg[isters] res[ize] ret[ab] rew[ind] ri[ght] rightb[elow] ru[ntime] rub[y] rubyd[o] rubyf[ile] rund[o] rv[iminfo] sN[ext] sa[rgument] sal[l] san[dbox] sav[eas] sb[uffer] sbN[ext] sba[ll] sbf[irst] sbl[ast] sbm[odified] sbn[ext] sbp[revious] sbr[ewind] scr[iptnames] scripte[ncoding] nextgroup=vimBang
+syn keyword vimCommand contained scriptv[ersion] scs[cope] setf[iletype] sf[ind] sfir[st] sh[ell] sim[alt] sig[n] sil[ent] sla[st] sn[ext] so[urce] sp[lit] spe[llgood] spelld[ump] spelli[nfo] spellr[epall] spellra[re] spellu[ndo] spellw[rong] spr[evious] sre[wind] st[op] sta[g] star[tinsert] startg[replace] startr[eplace] stopi[nsert] stj[ump] sts[elect] sun[hide] sus[pend] sv[iew] sw[apname] synti[me] sync[bind] smi[le] t tN[ext] ta[g] tags tab tabc[lose] tabd[o] tabe[dit] tabf[ind] tabfir[st] tabm[ove] tabl[ast] tabn[ext] tabnew tabo[nly] tabp[revious] tabN[ext] tabr[ewind] tabs tc[d] tch[dir] tcl tcld[o] tclf[ile] te[aroff] ter[minal] tf[irst] tj[ump] tl[ast] tn[ext] to[pleft] tp[revious] tr[ewind] try ts[elect] u[ndo] undoj[oin] undol[ist] unh[ide] unlo[ckvar] nextgroup=vimBang
+syn keyword vimCommand contained uns[ilent] up[date] v[global] ve[rsion] verb[ose] vert[ical] vi[sual] vie[w] vim9[cmd] viu[sage] vne[w] vs[plit] w[rite] wN[ext] wa[ll] wi[nsize] winc[md] wind[o] winp[os] wn[ext] wp[revious] wq wqa[ll] wu[ndo] wv[iminfo] x[it] xa[ll] xr[estore] y[ank] z dl dell delel deletl deletel dp dep delp delep deletp deletep a i nextgroup=vimBang
" Lower priority for _new_ to distinguish constructors from the command.
syn match vimCommand contained "\<new\>(\@!"
syn keyword vimOption contained fencs fileencodings ff fileformat ffs fileformats fic fileignorecase ft filetype fcs fillchars ffu findfunc fixeol fixendofline fcl foldclose fdc foldcolumn fen foldenable fde foldexpr fdi foldignore fdl foldlevel fdls foldlevelstart fmr foldmarker fdm foldmethod fml foldminlines fdn foldnestmax fdo foldopen fdt foldtext fex formatexpr flp formatlistpat fo formatoptions fp formatprg fs fsync gd gdefault gfm grepformat gp grepprg gcr guicursor gfn guifont gfs guifontset gfw guifontwide ghr guiheadroom gli guiligatures go guioptions guipty gtl guitablabel gtt guitabtooltip hf helpfile hh helpheight hlg helplang hid hidden hl highlight hi history hk hkmap hkp hkmapp hls hlsearch icon iconstring ic ignorecase imaf imactivatefunc imak imactivatekey skipwhite nextgroup=vimSetEqual,vimSetMod
syn keyword vimOption contained imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern mmt maxmemtot mis menuitems mopt messagesopt skipwhite nextgroup=vimSetEqual,vimSetMod
syn keyword vimOption contained msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt ph pumheight pmw pummaxwidth pw pumwidth pythondll pythonhome pythonthreedll pythonthreehome skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline ss sidescroll siso sidescrolloff skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight wmw winminwidth winptydll wiw winwidth wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay skipwhite nextgroup=vimSetEqual,vimSetMod
-syn keyword vimOption contained xtermcodes skipwhite nextgroup=vimSetEqual,vimSetMod
+syn keyword vimOption contained pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff skipwhite nextgroup=vimSetEqual,vimSetMod
+syn keyword vimOption contained scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout skipwhite nextgroup=vimSetEqual,vimSetMod
+syn keyword vimOption contained tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight wmw winminwidth winptydll wiw winwidth wrap wm wrapmargin ws wrapscan write wa writeany skipwhite nextgroup=vimSetEqual,vimSetMod
+syn keyword vimOption contained wb writebackup wd writedelay xtermcodes skipwhite nextgroup=vimSetEqual,vimSetMod
" vimOptions: These are the turn-off setting variants {{{2
" GEN_SYN_VIM: vimOption turn-off, START_STR='syn keyword vimOption contained', END_STR=''
syn keyword vimOptionVarName contained imaf imactivatefunc imak imactivatekey imc imcmdline imd imdisable imi iminsert ims imsearch imsf imstatusfunc imst imstyle inc include inex includeexpr is incsearch inde indentexpr indk indentkeys inf infercase im insertmode ise isexpand isf isfname isi isident isk iskeyword isp isprint js joinspaces jop jumpoptions key kmp keymap km keymodel kpc keyprotocol kp keywordprg lmap langmap lm langmenu lnr langnoremap lrm langremap ls laststatus lz lazyredraw lhi lhistory lbr linebreak lines lsp linespace lisp lop lispoptions lw lispwords list lcs listchars lpl loadplugins luadll magic mef makeef menc makeencoding mp makeprg mps matchpairs mat matchtime mco maxcombine mfd maxfuncdepth mmd maxmapdepth mm maxmem mmp maxmempattern
syn keyword vimOptionVarName contained mmt maxmemtot mis menuitems mopt messagesopt msm mkspellmem ml modeline mle modelineexpr mls modelines ma modifiable mod modified more mouse mousef mousefocus mh mousehide mousem mousemodel mousemev mousemoveevent mouses mouseshape mouset mousetime mzq mzquantum mzschemedll mzschemegcdll nf nrformats nu number nuw numberwidth ofu omnifunc odev opendevice opfunc operatorfunc pp packpath para paragraphs paste pt pastetoggle pex patchexpr pm patchmode pa path perldll pi preserveindent pvh previewheight pvp previewpopup pvw previewwindow pdev printdevice penc printencoding pexpr printexpr pfn printfont pheader printheader pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt ph pumheight pmw pummaxwidth pw pumwidth
syn keyword vimOptionVarName contained pythondll pythonhome pythonthreedll pythonthreehome pyx pyxversion qftf quickfixtextfunc qe quoteescape ro readonly rdt redrawtime re regexpengine rnu relativenumber remap rop renderoptions report rs restorescreen ri revins rl rightleft rlc rightleftcmd rubydll ru ruler ruf rulerformat rtp runtimepath scr scroll scb scrollbind scf scrollfocus sj scrolljump so scrolloff sbo scrollopt sect sections secure sel selection slm selectmode ssop sessionoptions sh shell shcf shellcmdflag sp shellpipe shq shellquote srr shellredir ssl shellslash stmp shelltemp st shelltype sxe shellxescape sxq shellxquote sr shiftround sw shiftwidth shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode
-syn keyword vimOptionVarName contained stal showtabline ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode tw textwidth tsr thesaurus tsrfu thesaurusfunc
-syn keyword vimOptionVarName contained top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight wmw winminwidth winptydll wiw winwidth wrap wm wrapmargin
-syn keyword vimOptionVarName contained ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes
+syn keyword vimOptionVarName contained stal showtabline stpl showtabpanel ss sidescroll siso sidescrolloff scl signcolumn scs smartcase si smartindent sta smarttab sms smoothscroll sts softtabstop spell spc spellcapcheck spf spellfile spl spelllang spo spelloptions sps spellsuggest sb splitbelow spk splitkeep spr splitright sol startofline stl statusline su suffixes sua suffixesadd swf swapfile sws swapsync swb switchbuf smc synmaxcol syn syntax tcl tabclose tal tabline tpm tabpagemax tpl tabpanel tplo tabpanelopt ts tabstop tbs tagbsearch tc tagcase tfu tagfunc tl taglength tr tagrelative tag tags tgst tagstack tcldll term tbidi termbidi tenc termencoding tgc termguicolors twk termwinkey twsl termwinscroll tws termwinsize twt termwintype terse ta textauto tx textmode
+syn keyword vimOptionVarName contained tw textwidth tsr thesaurus tsrfu thesaurusfunc top tildeop to timeout tm timeoutlen title titlelen titleold titlestring tb toolbar tbis toolbariconsize ttimeout ttm ttimeoutlen tbi ttybuiltin tf ttyfast ttym ttymouse tsl ttyscroll tty ttytype udir undodir udf undofile ul undolevels ur undoreload uc updatecount ut updatetime vsts varsofttabstop vts vartabstop vbs verbose vfile verbosefile vdir viewdir vop viewoptions vi viminfo vif viminfofile ve virtualedit vb visualbell warn wiv weirdinvert ww whichwrap wc wildchar wcm wildcharm wig wildignore wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight wmh winminheight wmw winminwidth
+syn keyword vimOptionVarName contained winptydll wiw winwidth wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes
" GEN_SYN_VIM: vimOption term output code variable, START_STR='syn keyword vimOptionVarName contained', END_STR=''
syn keyword vimOptionVarName contained t_AB t_AF t_AU t_AL t_al t_bc t_BE t_BD t_cd t_ce t_Ce t_CF t_cl t_cm t_Co t_CS t_Cs t_cs t_CV t_da t_db t_DL t_dl t_ds t_Ds t_EC t_EI t_fs t_fd t_fe t_GP t_IE t_IS t_ke t_ks t_le t_mb t_md t_me t_mr t_ms t_nd t_op t_RF t_RB t_RC t_RI t_Ri t_RK t_RS t_RT t_RV t_Sb t_SC t_se t_Sf t_SH t_SI t_Si t_so t_SR t_sr t_ST t_Te t_te t_TE t_ti t_TI t_Ts t_ts t_u7 t_ue t_us t_Us t_ut t_vb t_ve t_vi t_VS t_vs t_WP t_WS t_XM t_xn t_xs t_ZH t_ZR t_8f t_8b t_8u t_xo
syn keyword vimOptionVarName contained t_F1 t_F2 t_F3 t_F4 t_F5 t_F6 t_F7 t_F8 t_F9 t_k1 t_K1 t_k2 t_k3 t_K3 t_k4 t_K4 t_k5 t_K5 t_k6 t_K6 t_k7 t_K7 t_k8 t_K8 t_k9 t_K9 t_KA t_kb t_kB t_KB t_KC t_kd t_kD t_KD t_KE t_KF t_KG t_kh t_KH t_kI t_KI t_KJ t_KK t_kl t_KL t_kN t_kP t_kr t_ku
" Default highlighting groups {{{2
" GEN_SYN_VIM: vimHLGroup, START_STR='syn keyword vimHLGroup contained', END_STR=''
-syn keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit VisualNOS DiffText DiffTextAdd PmenuSbar TabLineSel TabLineFill Cursor lCursor QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel PopupSelected MessageWindow PopupNotification Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen StatusLineTerm StatusLineTermNC ToolbarLine ToolbarButton Menu Tooltip Scrollbar CursorIM LineNrAbove LineNrBelow
+syn keyword vimHLGroup contained ErrorMsg IncSearch ModeMsg NonText StatusLine StatusLineNC EndOfBuffer VertSplit VisualNOS DiffText DiffTextAdd PmenuSbar TabLineSel TabLineFill TabPanel TabPanelSel TabPanelFill Cursor lCursor QuickFixLine CursorLineSign CursorLineFold CurSearch PmenuKind PmenuKindSel PmenuMatch PmenuMatchSel PmenuExtra PmenuExtraSel PopupSelected MessageWindow PopupNotification Normal Directory LineNr CursorLineNr MoreMsg Question Search SpellBad SpellCap SpellRare SpellLocal PmenuThumb Pmenu PmenuSel SpecialKey Title WarningMsg WildMenu Folded FoldColumn SignColumn Visual DiffAdd DiffChange DiffDelete TabLine CursorColumn CursorLine ColorColumn MatchParen StatusLineTerm StatusLineTermNC ToolbarLine ToolbarButton Menu Tooltip Scrollbar CursorIM
+syn keyword vimHLGroup contained LineNrAbove LineNrBelow
syn match vimHLGroup contained "\<Conceal\>"
syn case match
strings.c \
syntax.c \
tag.c \
+ tabpanel.c \
term.c \
termlib.c \
testing.c \
$(OUTDIR)/spellsuggest.o \
$(OUTDIR)/strings.o \
$(OUTDIR)/syntax.o \
+ $(OUTDIR)/tabpanel.o \
$(OUTDIR)/tag.o \
$(OUTDIR)/term.o \
$(OUTDIR)/testing.o \
$(OUTDIR)\spellsuggest.obj \
$(OUTDIR)\strings.obj \
$(OUTDIR)\syntax.obj \
+ $(OUTDIR)\tabpanel.obj \
$(OUTDIR)\tag.obj \
$(OUTDIR)\term.obj \
$(OUTDIR)\testing.obj \
$(OUTDIR)/syntax.obj: $(OUTDIR) syntax.c $(INCL)
+$(OUTDIR)/tabpanel.obj: $(OUTDIR) tabpanel.c $(INCL)
+
$(OUTDIR)/tag.obj: $(OUTDIR) tag.c $(INCL)
$(OUTDIR)/term.obj: $(OUTDIR) term.c $(INCL)
proto/spellsuggest.pro \
proto/strings.pro \
proto/syntax.pro \
+ proto/tabpanel.pro \
proto/tag.pro \
proto/term.pro \
proto/testing.pro \
spellsuggest.c \
strings.c \
syntax.c \
+ tabpanel.c \
tag.c \
term.c \
terminal.c \
spellsuggest.obj \
strings.obj \
syntax.obj \
+ tabpanel.obj \
tag.obj \
term.obj \
terminal.obj \
ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
errors.h globals.h
+tabpanel.obj : tabpanel.c vim.h [.auto]config.h feature.h os_unix.h \
+ ascii.h keymap.h termdefs.h macros.h structs.h regexp.h \
+ gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
+ errors.h globals.h
tag.obj : tag.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h termdefs.h macros.h structs.h regexp.h gui.h beval.h \
[.proto]gui_beval.pro option.h ex_cmds.h proto.h errors.h globals.h
spellsuggest.c \
strings.c \
syntax.c \
+ tabpanel.c \
tag.c \
term.c \
terminal.c \
objects/spellsuggest.o \
objects/strings.o \
objects/syntax.o \
+ objects/tabpanel.o \
objects/tag.o \
objects/term.o \
objects/terminal.o \
spellsuggest.pro \
strings.pro \
syntax.pro \
+ tabpanel.pro \
tag.pro \
term.pro \
terminal.pro \
objects/syntax.o: syntax.c
$(CCC) -o $@ syntax.c
+objects/tabpanel.o: tabpanel.c
+ $(CCC) -o $@ tabpanel.c
+
objects/tag.o: tag.c
$(CCC) -o $@ tag.c
proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \
libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \
globals.h errors.h
+objects/tabpanel.o: tabpanel.c vim.h protodef.h auto/config.h feature.h os_unix.h \
+ auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \
+ proto/gui_beval.pro structs.h regexp.h gui.h \
+ libvterm/include/vterm_keycodes.h alloc.h ex_cmds.h spell.h proto.h \
+ globals.h errors.h
objects/tag.o: tag.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h termdefs.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h libvterm/include/vterm.h \
ml_setflags(curbuf);
check_status(curbuf);
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
need_maketitle = TRUE; // set window title later
}
save_file_ff(buf);
check_status(buf);
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
need_maketitle = TRUE; // set window title later
++CHANGEDTICK(buf);
}
gui_mch_invert_rectangle(row, col, height, width);
else
#endif
- screen_draw_rectangle(row, col, height, width, invert);
+ screen_draw_rectangle(row, col + TPL_LCOL(NULL), height, width, invert);
#ifdef FEAT_PROP_POPUP
screen_zindex = 0;
#endif
}
}
- screen_line(wp, wlv->screen_row, wp->w_wincol, wlv->col,
+ screen_line(wp, wlv->screen_row, wp->w_wincol + TPL_LCOL(wp), wlv->col,
clear_end ? wp->w_width : -wp->w_width,
wlv->vcol - 1, wlv->screen_line_flags);
}
#ifdef FEAT_PROP_POPUP
&& !text_prop_above && !text_prop_follows
#endif
- && wp->w_width == Columns)
+ && wp->w_width == COLUMNS_WITHOUT_TPL())
{
// Remember that the line wraps, used for modeless copy.
LineWraps[wlv.screen_row - 1] = TRUE;
== 2
|| (*mb_off2cells)(
LineOffset[wlv.screen_row - 1]
- + (int)Columns - 2,
+ + (int)COLUMNS_WITHOUT_TPL() - 2,
LineOffset[wlv.screen_row]
+ screen_Columns) == 2)))
{
// auto-wrap, we overwrite the character.
if (screen_cur_col != wp->w_width)
screen_char(LineOffset[wlv.screen_row - 1]
- + (unsigned)Columns - 1,
- wlv.screen_row - 1, (int)(Columns - 1));
+ + (unsigned)COLUMNS_WITHOUT_TPL() - 1,
+ wlv.screen_row - 1, (int)(COLUMNS_WITHOUT_TPL() - 1));
// When there is a multi-byte character, just output a
// space to keep it simple.
if (has_mbyte && MB_BYTE2LEN(ScreenLines[LineOffset[
- wlv.screen_row - 1] + (Columns - 1)]) > 1)
+ wlv.screen_row - 1] + (COLUMNS_WITHOUT_TPL() - 1)]) > 1)
out_char(' ');
else
out_char(ScreenLines[LineOffset[wlv.screen_row - 1]
- + (Columns - 1)]);
+ + (COLUMNS_WITHOUT_TPL() - 1)]);
// force a redraw of the first char on the next line
ScreenAttrs[LineOffset[wlv.screen_row]] = (sattr_T)-1;
screen_start(); // don't know where cursor is now
redraw_cmdline = TRUE;
redraw_tabline = TRUE;
}
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
}
msg_scrolled = 0;
need_wait_return = FALSE;
if (redraw_tabline || type >= UPD_NOT_VALID)
draw_tabline();
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel || type >= UPD_NOT_VALID)
+ draw_tabpanel();
+#endif
+
#ifdef FEAT_SYN_HL
// Correct stored syntax highlighting info for changes in each displayed
// buffer. Each buffer must only be done once.
win_redr_status(wp, TRUE); // any popup menu will be redrawn below
}
}
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
#if defined(FEAT_SEARCH_EXTRA)
end_search_hl();
#endif
plen = this_ru_col - 1;
}
- screen_puts(p, row, wp->w_wincol, attr);
- screen_fill(row, row + 1, plen + wp->w_wincol,
- this_ru_col + wp->w_wincol, fillchar, fillchar, attr);
-
+ screen_puts(p, row, wp->w_wincol + TPL_LCOL(wp), attr);
+ screen_fill(row, row + 1, plen + wp->w_wincol + TPL_LCOL(wp),
+ this_ru_col + wp->w_wincol + TPL_LCOL(wp), fillchar, fillchar, attr);
if ((NameBufflen = get_keymap_str(wp, (char_u *)"<%s>", NameBuff, MAXPATHL)) > 0
&& (this_ru_col - plen) > (NameBufflen + 1))
screen_puts(NameBuff, row, (int)(this_ru_col - NameBufflen
- - 1 + wp->w_wincol), attr);
+ - 1 + wp->w_wincol + TPL_LCOL(wp)), attr);
win_redr_ruler(wp, TRUE, ignore_pum);
fillchar = fillchar_status(&attr, wp);
else
fillchar = fillchar_vsep(&attr, wp);
- screen_putchar(fillchar, row, W_ENDCOL(wp), attr);
+ if (W_ENDCOL(wp) < COLUMNS_WITHOUT_TPL())
+ screen_putchar(fillchar, row, W_ENDCOL(wp) + TPL_LCOL(wp), attr);
}
busy = FALSE;
}
// Redraw the tab pages line if needed.
if (redraw_tabline)
draw_tabline();
+
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
}
void
buffer[bufferlen] = NUL;
}
- screen_puts(buffer, row, this_ru_col + off, attr);
+ screen_puts(buffer, row, this_ru_col + off + TPL_LCOL(wp), attr);
n1 = redraw_cmdline;
screen_fill(row, row + 1,
- this_ru_col + off + bufferlen,
- (off + width),
+ this_ru_col + off + bufferlen + TPL_LCOL(wp),
+ (off + width) + TPL_LCOL(wp),
fillchar, fillchar, attr);
// don't redraw the cmdline because of showing the ruler
redraw_cmdline = n1;
}
wp->w_winbar_items[item_idx].wb_menu = NULL; // end marker
- screen_line(wp, wp->w_winrow, wp->w_wincol, wp->w_width, wp->w_width, -1,
- 0);
+ screen_line(wp, wp->w_winrow, wp->w_wincol + TPL_LCOL(wp), wp->w_width,
+ wp->w_width, -1, 0);
}
#endif
}
#endif
- screen_line(wp, row + W_WINROW(wp), wp->w_wincol,
- wp->w_width, wp->w_width, -1, 0);
+ screen_line(wp, row + W_WINROW(wp), wp->w_wincol + TPL_LCOL(wp),
+ wp->w_width, wp->w_width, -1, 0);
// Update w_cline_height and w_cline_folded if the cursor line was
// updated (saves a call to plines() later).
// Last line isn't finished: Display "@@@" at the end.
screen_fill(W_WINROW(wp) + wp->w_height - 1,
W_WINROW(wp) + wp->w_height,
- start_col < wp->w_wincol ? wp->w_wincol : start_col,
- (int)W_ENDCOL(wp),
+ (start_col < wp->w_wincol ? wp->w_wincol : start_col) + TPL_LCOL(wp),
+ (int)W_ENDCOL(wp) + TPL_LCOL(wp),
symbol, symbol, HL_ATTR(HLF_AT));
set_empty_rows(wp, srow);
wp->w_botline = lnum;
win_redr_status(wp, FALSE);
}
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
+
update_finish();
}
#endif
if (redraw_tabline)
draw_tabline();
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
+
if (wp->w_redr_status || p_ru
# ifdef FEAT_STL_OPT
|| *p_stl != NUL || *wp->w_p_stl != NUL
win_redr_status(wp, FALSE);
if (redraw_tabline)
draw_tabline();
+
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
}
/*
if (fix_col != pc_col)
{
- screen_putchar(' ', pc_row, fix_col, attr);
+ screen_putchar(' ', pc_row, fix_col + TPL_LCOL(NULL), attr);
--curwin->w_wcol;
pc_status = PC_STATUS_RIGHT;
}
screen_getbytes(pc_row, pc_col, pc_bytes, &pc_attr);
pc_status = PC_STATUS_SET;
}
- screen_putchar(c, pc_row, pc_col, attr);
+ screen_putchar(c, pc_row, pc_col + TPL_LCOL(NULL), attr);
}
#if defined(FEAT_JOB_CHANNEL) || defined(PROTO)
#endif
EXTERN char e_cannot_switch_to_a_closing_buffer[]
INIT(= N_("E1546: Cannot switch to a closing buffer"));
+EXTERN char e_cannot_not_support_redrawtabpanel[]
+ INIT(= N_("E1547: This version of Vim does support :redrawtabpanel"));
0
#endif
},
+ {"tabpanel",
+#if defined(FEAT_TABPANEL)
+ 1,
+#else
+ 0,
+#endif
+ },
{"tag_binary", 1}, // graduated feature
{"tcl",
#if defined(FEAT_TCL) && !defined(DYNAMIC_TCL)
/* p */ 341,
/* q */ 382,
/* r */ 385,
- /* s */ 405,
- /* t */ 475,
- /* u */ 522,
- /* v */ 533,
- /* w */ 554,
- /* x */ 568,
- /* y */ 578,
- /* z */ 579
+ /* s */ 406,
+ /* t */ 476,
+ /* u */ 523,
+ /* v */ 534,
+ /* w */ 555,
+ /* x */ 569,
+ /* y */ 579,
+ /* z */ 580
};
/*
/* o */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 5, 0, 0, 0, 0, 0, 0, 9, 0, 11, 0, 0, 0 },
/* p */ { 1, 3, 4, 0, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 10, 0, 0, 17, 18, 27, 0, 29, 0, 30, 0 },
/* q */ { 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
- /* r */ { 0, 0, 0, 0, 0, 0, 0, 0, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 14, 19, 0, 0, 0, 0 },
+ /* r */ { 0, 0, 0, 0, 0, 0, 0, 0, 13, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 15, 20, 0, 0, 0, 0 },
/* s */ { 2, 6, 15, 0, 19, 23, 0, 25, 26, 0, 0, 29, 31, 35, 39, 41, 0, 50, 0, 51, 0, 64, 65, 0, 66, 0 },
/* t */ { 2, 0, 19, 0, 24, 26, 0, 27, 0, 29, 0, 30, 34, 37, 39, 40, 0, 41, 43, 0, 44, 0, 0, 0, 46, 0 },
/* u */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 10, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 },
/* z */ { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
};
-static const int command_count = 596;
+static const int command_count = 597;
if (rename_buffer(eap->arg) == FAIL)
return;
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
}
// print file name if no argument or 'F' is not in 'shortmess'
{
curbuf->b_p_ro = FALSE;
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
}
}
EXCMD(CMD_redrawtabline, "redrawtabline", ex_redrawtabline,
EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE),
+EXCMD(CMD_redrawtabpanel, "redrawtabpanel", ex_redrawtabpanel,
+ EX_TRLBAR|EX_CMDWIN|EX_LOCK_OK,
+ ADDR_NONE),
EXCMD(CMD_registers, "registers", ex_display,
EX_EXTRA|EX_NOTRLCOM|EX_TRLBAR|EX_SBOXOK|EX_CMDWIN|EX_LOCK_OK,
ADDR_NONE),
static void ex_redir(exarg_T *eap);
static void ex_redrawstatus(exarg_T *eap);
static void ex_redrawtabline(exarg_T *eap);
+static void ex_redrawtabpanel(exarg_T *eap);
static void close_redir(void);
static void ex_mark(exarg_T *eap);
static void ex_startinsert(exarg_T *eap);
{
n = W_WINROW(curwin) + curwin->w_wrow - msg_scrolled;
if (n >= 0)
- windgoto(n, curwin->w_wincol + curwin->w_wcol);
+ windgoto(n, curwin->w_wincol + curwin->w_wcol + TPL_LCOL(curwin));
}
len = eap->line2;
out_flush();
}
+/*
+ * ":redrawtabpanel": force redraw of the tabpanel
+ */
+ static void
+ex_redrawtabpanel(exarg_T *eap UNUSED)
+{
+ int save_RedrawingDisabled = RedrawingDisabled;
+ RedrawingDisabled = 0;
+
+ int save_p_lz = p_lz;
+ p_lz = FALSE;
+
+#if defined(FEAT_TABPANEL)
+ draw_tabpanel();
+#else
+ emsg(_(e_cannot_not_support_redrawtabpanel));
+#endif
+
+ RedrawingDisabled = save_RedrawingDisabled;
+ p_lz = save_p_lz;
+ out_flush();
+}
+
static void
close_redir(void)
{
# define FEAT_GUI_TABLINE
#endif
+/*
+ * +tabpanel Tab SideBar
+ */
+#ifdef FEAT_HUGE
+# define FEAT_TABPANEL
+#endif
+
/*
* +browse ":browse" command.
* or just the ":browse" command modifier
}
status_redraw_all();
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
#if defined(FEAT_PROP_POPUP) && defined(FEAT_QUICKFIX)
popup_update_preview_title();
#endif
EXTERN tabpage_T *lastused_tabpage;
EXTERN int redraw_tabline INIT(= FALSE); // need to redraw tabline
+#if defined(FEAT_TABPANEL)
+EXTERN int redraw_tabpanel INIT(= FALSE); // need to redraw tabpanel
+#endif
+
/*
* All buffers are linked in a list. 'firstbuf' points to the first entry,
* 'lastbuf' to the last entry and 'curbuf' to the currently active buffer.
row = Y_2_ROW(y);
col = X_2_COL(x);
+
+ col -= TPL_LCOL(NULL);
+
if (row < 0 || col < 0) // before first window
return NULL;
wp = mouse_find_win(&row, &col, popup);
int col = X_2_COL(x);
win_T *wp;
+ col -= TPL_LCOL(NULL);
+
if (row < 0 || col < 0)
return;
"TabLineSel term=bold cterm=bold gui=bold"),
CENT("TabLineFill term=reverse cterm=reverse",
"TabLineFill term=reverse cterm=reverse gui=reverse"),
+ "default link TabPanel TabLine",
+ "default link TabPanelSel TabLineSel",
+ "default link TabPanelFill TabLineFill",
#ifdef FEAT_GUI
"Cursor guibg=fg guifg=bg",
"lCursor guibg=fg guifg=bg", // should be different, but what?
// This may cause the buffer to become (un)modified.
check_status(curbuf);
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
need_maketitle = TRUE; // set window title later
}
int moved; // Has cursor moved?
int in_status_line; // mouse in status line
static int in_tab_line = FALSE; // mouse clicked in tab line
+#if defined(FEAT_TABPANEL)
+ static int in_tabpanel = FALSE; // mouse clicked in tabpanel
+#endif
int in_sep_line; // mouse in vertical separator line
int c1, c2;
#if defined(FEAT_FOLDING)
if (!is_drag) // release, reset got_click
{
got_click = FALSE;
- if (in_tab_line)
+ if (in_tab_line
+#if defined(FEAT_TABPANEL)
+ || in_tabpanel
+#endif
+ )
{
in_tab_line = FALSE;
+#if defined(FEAT_TABPANEL)
+ in_tabpanel = FALSE;
+#endif
return FALSE;
}
}
start_visual.lnum = 0;
+ // Check for clicking in the tab page line.
+#if defined(FEAT_TABPANEL)
+ if (mouse_col < TPL_LCOL(NULL))
+ {
+ if (is_drag)
+ {
+ if (in_tabpanel)
+ {
+ c1 = get_tabpagenr_on_tabpanel();
+ tabpage_move(c1 <= 0 ? 9999 : c1 < tabpage_index(curtab)
+ ? c1 - 1 : c1);
+ }
+ return FALSE;
+ }
+
+ // click in a tab selects that tab page
+ if (is_click
+# ifdef FEAT_CMDWIN
+ && cmdwin_type == 0
+# endif
+ && mouse_col < Columns)
+ {
+ in_tabpanel = TRUE;
+ c1 = get_tabpagenr_on_tabpanel();
+ if (c1 >= 0)
+ {
+ if ((mod_mask & MOD_MASK_MULTI_CLICK) == MOD_MASK_2CLICK)
+ {
+ // double click opens new page
+ end_visual_mode();
+ tabpage_new();
+ tabpage_move(c1 == 0 ? 9999 : c1 - 1);
+ }
+ else
+ {
+ // Go to specified tab page, or next one if not clicking
+ // on a label.
+ goto_tabpage(c1);
+
+ // It's like clicking on the status line of a window.
+ if (curwin != old_curwin)
+ end_visual_mode();
+ }
+ }
+ else
+ {
+ tabpage_T *tp;
+
+ // Close the current or specified tab page.
+ if (c1 == -999)
+ tp = curtab;
+ else
+ tp = find_tabpage(-c1);
+ if (tp == curtab)
+ {
+ if (first_tabpage->tp_next != NULL)
+ tabpage_close(FALSE);
+ }
+ else if (tp != NULL)
+ tabpage_close_other(tp, FALSE);
+ }
+ }
+ return TRUE;
+ }
+ else if (is_drag && in_tabpanel)
+ {
+ c1 = get_tabpagenr_on_tabpanel();
+ tabpage_move(c1 <= 0 ? 9999 : c1 - 1);
+ return FALSE;
+ }
+#endif
+
if (TabPageIdxs != NULL) // only when initialized
{
// Check for clicking in the tab page line.
int mouse_char = ' ';
#endif
+ col -= TPL_LCOL(NULL);
+ if (col < 0)
+ return IN_TABPANEL;
+
mouse_past_bottom = FALSE;
mouse_past_eol = FALSE;
if (!(flags & MOUSE_FOCUS))
{
- if (row < 0 || col < 0) // check if it makes sense
+ if (row < 0 || col + TPL_LCOL(NULL) < 0) // check if it makes sense
return IN_UNKNOWN;
// find the window where the row is in and adjust "row" and "col" to be
winid = wp->w_id;
winrow = row + 1;
wincol = col + 1;
+ wincol -= TPL_LCOL(NULL);
+ if (wincol < 0)
+ wincol = 0;
row -= top_off;
col -= left_off;
if (row >= 0 && row < wp->w_height && col >= 0 && col < wp->w_width)
{
check_status(buf->bufp);
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
maketitle();
update_screen(0);
}
{
need_maketitle = TRUE;
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
}
/*
#endif
}
+#if defined(FEAT_TABPANEL)
+/*
+ * Process the new 'showtabpanel' option value.
+ */
+ char *
+did_set_showtabpanel(optset_T *args)
+{
+ shell_new_columns();
+ return NULL;
+}
+#endif
+
#if defined(FEAT_EVAL) || defined(PROTO)
static void
didset_options_sctx(int opt_flags, char **buf)
#define SWB_NEWTAB 0x008
#define SWB_VSPLIT 0x010
#define SWB_USELAST 0x020
+
EXTERN char_u *p_spk; // 'splitkeep'
+
+#if defined(FEAT_TABPANEL)
+EXTERN char_u *p_tpl; // 'tabpanel'
+EXTERN long p_stpl; // 'showtabpanel'
+EXTERN char_u *p_tplo; // 'tabpanelopt'
+#endif
+
#ifdef FEAT_SYN_HL
EXTERN char_u *p_syn; // 'syntax'
#endif
# define ISP_LATIN1 (char_u *)"@,161-255"
#endif
-# define HIGHLIGHT_INIT "8:SpecialKey,~:EndOfBuffer,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,y:CurSearch,m:MoreMsg,M:ModeMsg,n:LineNr,a:LineNrAbove,b:LineNrBelow,N:CursorLineNr,G:CursorLineSign,O:CursorLineFold,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,E:DiffTextAdd,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,k:PmenuMatch,<:PmenuMatchSel,[:PmenuKind,]:PmenuKindSel,{:PmenuExtra,}:PmenuExtraSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn,q:QuickFixLine,z:StatusLineTerm,Z:StatusLineTermNC,g:MsgArea,h:ComplMatchIns"
+# define HIGHLIGHT_INIT "8:SpecialKey,~:EndOfBuffer,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,y:CurSearch,m:MoreMsg,M:ModeMsg,n:LineNr,a:LineNrAbove,b:LineNrBelow,N:CursorLineNr,G:CursorLineSign,O:CursorLineFold,r:Question,s:StatusLine,S:StatusLineNC,c:VertSplit,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu,f:Folded,F:FoldColumn,A:DiffAdd,C:DiffChange,D:DiffDelete,T:DiffText,E:DiffTextAdd,>:SignColumn,-:Conceal,B:SpellBad,P:SpellCap,R:SpellRare,L:SpellLocal,+:Pmenu,=:PmenuSel,k:PmenuMatch,<:PmenuMatchSel,[:PmenuKind,]:PmenuKindSel,{:PmenuExtra,}:PmenuExtraSel,x:PmenuSbar,X:PmenuThumb,*:TabLine,#:TabLineSel,_:TabLineFill,!:CursorColumn,.:CursorLine,o:ColorColumn,q:QuickFixLine,z:StatusLineTerm,Z:StatusLineTermNC,g:MsgArea,h:ComplMatchIns,%:TabPanel,^:TabPanelSel,&:TabPanelFill"
// Default python version for pyx* commands
#if defined(FEAT_PYTHON) && defined(FEAT_PYTHON3)
{"showtabline", "stal", P_NUM|P_VI_DEF|P_RALL,
(char_u *)&p_stal, PV_NONE, did_set_showtabline, NULL,
{(char_u *)1L, (char_u *)0L} SCTX_INIT},
+#if defined(FEAT_TABPANEL)
+ {"showtabpanel", "stpl", P_NUM|P_RALL,
+ (char_u *)&p_stpl, PV_NONE, did_set_showtabpanel, NULL,
+ {(char_u *)0L, (char_u *)0L} SCTX_INIT},
+#endif
{"sidescroll", "ss", P_NUM|P_VI_DEF,
(char_u *)&p_ss, PV_NONE, NULL, NULL,
{(char_u *)0L, (char_u *)0L} SCTX_INIT},
{"tabpagemax", "tpm", P_NUM|P_VI_DEF,
(char_u *)&p_tpm, PV_NONE, NULL, NULL,
{(char_u *)10L, (char_u *)0L} SCTX_INIT},
+#if defined(FEAT_TABPANEL)
+ {"tabpanel", "tpl", P_STRING|P_VI_DEF|P_RALL,
+ (char_u *)&p_tpl, PV_NONE, NULL, NULL,
+ {(char_u *)"", (char_u *)0L} SCTX_INIT},
+ {"tabpanelopt","tplo", P_STRING|P_VI_DEF|P_ONECOMMA|P_NODUP,
+ (char_u *)&p_tplo, PV_NONE, did_set_tabpanelopt,
+ expand_set_tabpanelopt,
+ {(char_u *)"", (char_u *)0L}
+ SCTX_INIT},
+#endif
{"tabstop", "ts", P_NUM|P_VI_DEF|P_RBUF,
(char_u *)&p_ts, PV_TS,
did_set_shiftwidth_tabstop, NULL,
// Note: Keep this in sync with briopt_check()
static char *(p_briopt_values[]) = {"shift:", "min:", "sbr", "list:", "column:", NULL};
#endif
+#if defined(FEAT_TABPANEL)
+static char *(p_tpl_values[]) = {"wrap", "align:", "columns:", "vert:", NULL};
+#endif
#if defined(FEAT_DIFF)
// Note: Keep this in sync with diffopt_changed()
static char *(p_dip_values[]) = {"filler", "context:", "iblank", "icase", "iwhite", "iwhiteall", "iwhiteeol", "horizontal", "vertical", "closeoff", "hiddenoff", "foldcolumn:", "followwrap", "internal", "indent-heuristic", "algorithm:", "inline:", "linematch:", NULL};
}
#endif
+#if defined(FEAT_TABPANEL)
+/*
+ * Process the new 'tabpanelopt' option value.
+ */
+ char *
+did_set_tabpanelopt(optset_T *args)
+{
+ if (tabpanelopt_changed() == FAIL)
+ return e_invalid_argument;
+
+ shell_new_columns();
+
+ return NULL;
+}
+
+ int
+expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches)
+{
+ return expand_set_opt_string(
+ args,
+ p_tpl_values,
+ ARRAY_LENGTH(p_tpl_values) - 1,
+ numMatches,
+ matches);
+}
+#endif
+
/*
* The 'scrollopt' option is changed.
*/
width = cells + over_cell + 1;
rt = orig_rt;
- screen_putchar(truncrl, row, col - width + 1, attr);
+ screen_putchar(truncrl, row, col - width + 1 + TPL_LCOL(NULL), attr);
if (over_cell > 0)
- screen_fill(row, row + 1, col - width + 2,
- col - width + 2 + over_cell, ' ', ' ', attr);
+ screen_fill(row, row + 1, col - width + 2 + TPL_LCOL(NULL),
+ col - width + 2 + over_cell + TPL_LCOL(NULL), ' ', ' ',
+ attr);
}
if (attrs == NULL)
- screen_puts_len(rt, (int)STRLEN(rt), row, col - cells + 1, attr);
+ screen_puts_len(rt, (int)STRLEN(rt), row,
+ col - cells + 1 + TPL_LCOL(NULL), attr);
else
- pum_screen_puts_with_attrs(row, col - cells + 1, cells, rt,
- (int)STRLEN(rt), attrs);
+ pum_screen_puts_with_attrs(row, col - cells + 1 + TPL_LCOL(NULL),
+ cells, rt, (int)STRLEN(rt), attrs);
vim_free(rt_start);
VIM_CLEAR(st);
- return col - width;
+ return col - width + TPL_LCOL(NULL);
}
#endif
}
if (attrs == NULL)
- screen_puts_len(st, size, row, col, attr);
+ screen_puts_len(st, size, row, col + TPL_LCOL(NULL), attr);
else
- pum_screen_puts_with_attrs(row, col, cells, st, size, attrs);
+ pum_screen_puts_with_attrs(row, col + TPL_LCOL(NULL), cells, st, size,
+ attrs);
if (truncated)
{
if (over_cell > 0)
- screen_fill(row, row + 1, col + cells,
- col + cells + over_cell, ' ', ' ', attr);
+ screen_fill(row, row + 1, col + cells + TPL_LCOL(NULL),
+ col + cells + over_cell + TPL_LCOL(NULL), ' ', ' ', attr);
- screen_putchar(trunc, row, col + cells + over_cell, attr);
+ screen_putchar(trunc, row, col + cells + over_cell + TPL_LCOL(NULL), attr);
}
VIM_CLEAR(st);
#ifdef FEAT_RIGHTLEFT
if (pum_rl)
- screen_putchar(' ', row, pum_col - pum_width, attr);
+ screen_putchar(' ', row, pum_col - pum_width + TPL_LCOL(NULL), attr);
else
#endif
- screen_putchar(' ', row, pum_col + pum_width, attr);
+ screen_putchar(' ', row, pum_col + pum_width + TPL_LCOL(NULL), attr);
}
/*
if (pum_rl)
{
if (pum_col < curwin->w_wincol + curwin->w_width - 1)
- screen_putchar(' ', row, pum_col + 1, attr);
+ screen_putchar(' ', row, pum_col + 1 + TPL_LCOL(NULL), attr);
}
else
#endif
if (pum_col > 0)
- screen_putchar(' ', row, pum_col - 1, attr);
+ screen_putchar(' ', row, pum_col - 1 + TPL_LCOL(NULL), attr);
// Display each entry, use two spaces for a Tab.
// Do this 3 times and order from p_cia
#ifdef FEAT_RIGHTLEFT
if (pum_rl)
{
- screen_fill(row, row + 1, pum_col - basic_width - n + 1,
- col + 1, ' ', ' ', orig_attr);
+ screen_fill(row, row + 1, pum_col - basic_width - n + 1 + TPL_LCOL(NULL),
+ col + 1 + TPL_LCOL(NULL), ' ', ' ', orig_attr);
col = pum_col - basic_width - n;
}
else
#endif
{
- screen_fill(row, row + 1, col, pum_col + basic_width + n,
- ' ', ' ', orig_attr);
+ screen_fill(row, row + 1, col + TPL_LCOL(NULL),
+ pum_col + basic_width + n + TPL_LCOL(NULL), ' ', ' ',
+ orig_attr);
col = pum_col + basic_width + n;
}
totwidth = basic_width + n;
#ifdef FEAT_RIGHTLEFT
if (pum_rl)
- screen_fill(row, row + 1, pum_col - pum_width + 1, col + 1, ' ',
- ' ', orig_attr);
+ screen_fill(row, row + 1,
+ pum_col - pum_width + 1 + TPL_LCOL(NULL),
+ col + 1 + TPL_LCOL(NULL), ' ', ' ', orig_attr);
else
#endif
- screen_fill(row, row + 1, col, pum_col + pum_width, ' ', ' ',
- orig_attr);
+ screen_fill(row, row + 1, col + TPL_LCOL(NULL),
+ pum_col + pum_width + TPL_LCOL(NULL),
+ ' ', ' ', orig_attr);
pum_draw_scrollbar(row, i, thumb_pos, thumb_height);
++row;
pum_array = NULL;
redraw_all_later(UPD_NOT_VALID);
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
if (pum_in_cmdline)
{
clear_cmdline = TRUE;
if (STRCMP(key, "line") == 0)
n = screen_screenrow() + 1 + n;
else // "col"
- n = screen_screencol() + 1 + n;
+ n = screen_screencol() + 1 + n - TPL_LCOL(NULL);
// Zero means "not set", use -1 instead.
if (n == 0)
}
if (center_hor)
{
- wp->w_wincol = (Columns - wp->w_width - extra_width) / 2;
+ wp->w_wincol = (Columns - wp->w_width - extra_width - TPL_LCOL(NULL)) / 2;
if (wp->w_wincol < 0)
wp->w_wincol = 0;
}
// win_update() doesn't handle them.
top_off = popup_top_extra(wp);
left_extra = wp->w_popup_padding[3] + wp->w_popup_border[3]
- - wp->w_popup_leftoff;
+ + TPL_LCOL(NULL) - wp->w_popup_leftoff;
if (wp->w_wincol + left_extra < 0)
left_extra = -wp->w_wincol;
wp->w_winrow += top_off;
}
// Title goes on top of border or padding.
- title_wincol = wp->w_wincol + 1;
+ title_wincol = wp->w_wincol + 1 + TPL_LCOL(NULL);
if (wp->w_popup_title != NULL)
{
title_len = vim_strsize(wp->w_popup_title);
wp->w_popup_border[0] > 0 ? border_attr[0] : popup_attr);
}
- wincol = wp->w_wincol - wp->w_popup_leftoff;
+ wincol = wp->w_wincol - wp->w_popup_leftoff + TPL_LCOL(NULL);
top_padding = wp->w_popup_padding[0];
if (wp->w_popup_border[0] > 0)
{
{
padcol = wincol + wp->w_popup_border[3];
padendcol = wp->w_wincol + total_width - wp->w_popup_border[1]
- - wp->w_has_scrollbar;
+ + TPL_LCOL(NULL) - wp->w_has_scrollbar;
if (padcol < 0)
{
padendcol += padcol;
if (wp->w_has_scrollbar)
{
int line = i - top_off;
- int scroll_col = wp->w_wincol + total_width - 1
+ int scroll_col = wp->w_wincol + total_width - 1 + TPL_LCOL(NULL)
- wp->w_popup_border[1];
if (line >= 0 && line < wp->w_height)
# ifdef FEAT_VIMINFO
# include "viminfo.pro"
# endif
+# ifdef FEAT_TABPANEL
+# include "tabpanel.pro"
+# endif
// These prototypes cannot be produced automatically.
int smsg(const char *, ...) ATTRIBUTE_COLD ATTRIBUTE_FORMAT_PRINTF(1, 2);
/* option.c */
+char *did_set_showtabpanel(optset_T *args);
void set_init_1(int clean_arg);
void set_fencs_unicode(void);
void set_string_default(char *name, char_u *val);
/* optionstr.c */
+char *did_set_tabpanelopt(optset_T *args);
+int expand_set_tabpanelopt(optexpand_T *args, int *numMatches, char_u ***matches);
void didset_string_options(void);
void trigger_optionset_string(int opt_idx, int opt_flags, char_u *oldval, char_u *oldval_l, char_u *oldval_g, char_u *newval);
void check_buf_options(buf_T *buf);
--- /dev/null
+/* tabpanel.c */
+int tabpanel_width(void);
+int tabpanel_leftcol(win_T *wp);
+int tabpanelopt_changed(void);
+void draw_tabpanel(void);
+int get_tabpagenr_on_tabpanel(void);
+/* vim: set ft=c : */
if (wp->w_p_rl)
{
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
- W_ENDCOL(wp) - nn, (int)W_ENDCOL(wp) - off,
+ W_ENDCOL(wp) - nn + TPL_LCOL(wp), (int)W_ENDCOL(wp) - off + TPL_LCOL(wp),
c1, c2, attr);
}
else
#endif
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
- wp->w_wincol + off, (int)wp->w_wincol + nn,
+ wp->w_wincol + off + TPL_LCOL(wp), (int)wp->w_wincol + nn + TPL_LCOL(wp),
c1, c2, attr);
return nn;
}
if (wp->w_p_rl)
{
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
- wp->w_wincol, W_ENDCOL(wp) - 1 - n,
- c2, c2, attr);
+ wp->w_wincol + TPL_LCOL(wp), W_ENDCOL(wp) - 1 - n +
+ TPL_LCOL(wp), c2, c2, attr);
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
- W_ENDCOL(wp) - 1 - n, W_ENDCOL(wp) - n,
- c1, c2, attr);
+ W_ENDCOL(wp) - 1 - n + TPL_LCOL(wp), W_ENDCOL(wp) - n +
+ TPL_LCOL(wp), c1, c2, attr);
}
else
#endif
{
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + endrow,
- wp->w_wincol + n, (int)W_ENDCOL(wp),
+ wp->w_wincol + n + TPL_LCOL(wp), (int)W_ENDCOL(wp) + TPL_LCOL(wp),
c1, c2, attr);
}
if (!popup_visible)
return FALSE;
- off = row * screen_Columns + col;
+ if (col < TPL_LCOL(NULL))
+ return FALSE;
+ off = row * screen_Columns + col - TPL_LCOL(NULL);
return popup_mask[off] > screen_zindex || popup_transparent[off];
}
#endif
{
// For a window that has a right neighbor, draw the separator char
// right of the window contents. But not on top of a popup window.
- if (coloff + col < Columns)
+ if (coloff + col < TPL_LCOL(NULL) + COLUMNS_WITHOUT_TPL())
{
if (!skip_for_popup(row, col + coloff))
{
if (!wp->w_vsep_width)
return;
+ if (COLUMNS_WITHOUT_TPL() <= W_ENDCOL(wp) + 1)
+ return;
+
// draw the vertical separator right of this window
c = fillchar_vsep(&hl, wp);
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height,
- W_ENDCOL(wp), W_ENDCOL(wp) + 1,
+ W_ENDCOL(wp) + TPL_LCOL(wp), W_ENDCOL(wp) + 1 + TPL_LCOL(wp),
c, ' ', hl);
}
row = 0;
fillchar = ' ';
attr = HL_ATTR(HLF_TPF);
- maxwidth = Columns;
+ maxwidth = COLUMNS_WITHOUT_TPL();
opt_name = (char_u *)"tabline";
}
else
for (n = 0; hltab[n].start != NULL; n++)
{
len = (int)(hltab[n].start - p);
- screen_puts_len(p, len, row, col, curattr);
+ screen_puts_len(p, len, row, col + TPL_LCOL(wp), curattr);
col += vim_strnsize(p, len);
p = hltab[n].start;
else
curattr = highlight_user[hltab[n].userhl - 1];
}
- screen_puts(p, row, col, curattr);
+ screen_puts(p, row, col + TPL_LCOL(wp), curattr);
if (wp == NULL)
{
p = tabtab[n].start;
fillchar = tabtab[n].userhl;
}
- while (col < Columns)
+ while (col < COLUMNS_WITHOUT_TPL())
TabPageIdxs[col++] = fillchar;
}
if (wp == NULL)
{
col = 0;
- width = Columns;
+ width = COLUMNS_WITHOUT_TPL();
}
else
{
col = wp->w_wincol;
width = wp->w_width;
}
- screen_draw_rectangle(row, col, end - row, width, FALSE);
+ screen_draw_rectangle(row, col + TPL_LCOL(wp), end - row, width, FALSE);
}
void
win_rest_invalid(firstwin); // redraw all regular windows
redraw_cmdline = TRUE;
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
if (must_redraw == UPD_CLEAR) // no need to clear again
must_redraw = UPD_NOT_VALID;
msg_scrolled = 0; // compute_cmdrow() uses this
unsigned off_to = LineOffset[to] + wp->w_wincol;
unsigned off_from = LineOffset[from] + wp->w_wincol;
+#if defined(FEAT_TABPANEL)
+ off_to += TPL_LCOL(wp);
+ off_from += TPL_LCOL(wp);
+#endif
+
mch_memmove(ScreenLines + off_to, ScreenLines + off_from,
wp->w_width * sizeof(schar_T));
if (enc_utf8)
&& (*mb_ptr2cells)(ml_get_cursor()) == 2
&& vim_isprintc(gchar_cursor())) ? 2 : 1)) :
#endif
- curwin->w_wcol));
+ curwin->w_wcol) + TPL_LCOL(NULL));
}
}
if (lastrow > Rows)
lastrow = Rows;
screen_fill(nextrow - line_count, lastrow - line_count,
- wp->w_wincol, (int)W_ENDCOL(wp),
+ wp->w_wincol + TPL_LCOL(wp), (int)W_ENDCOL(wp) + TPL_LCOL(wp),
' ', ' ', 0);
}
return FAIL;
// only a few lines left: redraw is faster
- if (mayclear && Rows - line_count < 5 && wp->w_width == Columns)
+ if (mayclear && Rows - line_count < 5
+ && wp->w_width == COLUMNS_WITHOUT_TPL())
{
if (!no_win_do_lines_ins)
screenclear(); // will set wp->w_lines_valid to 0
if (row + line_count >= wp->w_height)
{
screen_fill(W_WINROW(wp) + row, W_WINROW(wp) + wp->w_height,
- wp->w_wincol, (int)W_ENDCOL(wp),
+ wp->w_wincol + TPL_LCOL(wp), (int)W_ENDCOL(wp) + TPL_LCOL(wp),
' ', ' ', 0);
return OK;
}
* a character in the lower right corner of the scroll region may cause a
* scroll-up .
*/
- if (scroll_region || wp->w_width != Columns)
+ if (scroll_region || wp->w_width != COLUMNS_WITHOUT_TPL())
{
- if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL))
+ if (scroll_region && (wp->w_width == COLUMNS_WITHOUT_TPL()
+ || *T_CSV != NUL))
scroll_region_set(wp, row);
if (del)
retval = screen_del_lines(W_WINROW(wp) + row, 0, line_count,
else
retval = screen_ins_lines(W_WINROW(wp) + row, 0, line_count,
wp->w_height - row, clear_attr, wp);
- if (scroll_region && (wp->w_width == Columns || *T_CSV != NUL))
+ if (scroll_region && (wp->w_width == COLUMNS_WITHOUT_TPL()
+ || *T_CSV != NUL))
scroll_region_reset();
return retval;
}
* exists.
*/
result_empty = (row + line_count >= end);
- if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL)
+ if (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL() && *T_CSV == NUL)
{
// Avoid that lines are first cleared here and then redrawn, which
// results in many characters updated twice. This happens with CTRL-F
#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 || (wp != NULL && wp->w_width != Columns))
+ if (off + row > 0 || (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL()))
clip_clear_selection(&clip_star);
else
clip_scroll_selection(-line_count);
end += off;
for (i = 0; i < line_count; ++i)
{
- if (wp != NULL && wp->w_width != Columns)
+ if (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL())
{
// need to copy part of a line
j = end - 1 - i;
linecopy(j + line_count, j, wp);
j += line_count;
if (can_clear((char_u *)" "))
- lineclear(LineOffset[j] + wp->w_wincol, wp->w_width,
- clear_attr);
+ lineclear(LineOffset[j] + wp->w_wincol + TPL_LCOL(wp),
+ wp->w_width, clear_attr);
else
- lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width);
+ lineinvalid(LineOffset[j] + wp->w_wincol + TPL_LCOL(wp),
+ wp->w_width);
LineWraps[j] = FALSE;
}
else
LineOffset[j + line_count] = temp;
LineWraps[j + line_count] = FALSE;
if (can_clear((char_u *)" "))
- lineclear(temp, (int)Columns, clear_attr);
+ lineclear(temp + TPL_LCOL(wp), COLUMNS_WITHOUT_TPL(),
+ clear_attr);
else
- lineinvalid(temp, (int)Columns);
+ lineinvalid(temp + TPL_LCOL(wp), COLUMNS_WITHOUT_TPL());
}
}
}
}
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
+
#ifdef FEAT_GUI
gui_can_update_cursor();
if (gui.in_use)
* 5. Use T_DL (delete line) if it exists.
* 6. redraw the characters from ScreenLines[].
*/
- if (wp != NULL && wp->w_width != Columns && *T_CSV == NUL)
+ if (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL() && *T_CSV == NUL)
{
// Avoid that lines are first cleared here and then redrawn, which
// results in many characters updated twice. This happens with CTRL-F
else if (*T_CDL != NUL && line_count > 1 && can_delete)
type = USE_T_CDL;
else if (can_clear(T_CE) && result_empty
- && (wp == NULL || wp->w_width == Columns))
+ && (wp == NULL || wp->w_width == COLUMNS_WITHOUT_TPL()))
type = USE_T_CE;
else if (*T_DL != NUL && can_delete)
type = USE_T_DL;
#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 || (wp != NULL && wp->w_width != Columns))
+ if (off + row > 0 || (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL()))
clip_clear_selection(&clip_star);
else
clip_scroll_selection(line_count);
end += off;
for (i = 0; i < line_count; ++i)
{
- if (wp != NULL && wp->w_width != Columns)
+ if (wp != NULL && wp->w_width != COLUMNS_WITHOUT_TPL())
{
// need to copy part of a line
j = row + i;
linecopy(j - line_count, j, wp);
j -= line_count;
if (can_clear((char_u *)" "))
- lineclear(LineOffset[j] + wp->w_wincol, wp->w_width,
- clear_attr);
+ lineclear(LineOffset[j] + wp->w_wincol + TPL_LCOL(wp),
+ wp->w_width, clear_attr);
else
- lineinvalid(LineOffset[j] + wp->w_wincol, wp->w_width);
+ lineinvalid(LineOffset[j] + wp->w_wincol + TPL_LCOL(wp),
+ wp->w_width);
LineWraps[j] = FALSE;
}
else
LineOffset[j - line_count] = temp;
LineWraps[j - line_count] = FALSE;
if (can_clear((char_u *)" "))
- lineclear(temp, (int)Columns, clear_attr);
+ lineclear(temp + TPL_LCOL(NULL), COLUMNS_WITHOUT_TPL(),
+ clear_attr);
else
- lineinvalid(temp, (int)Columns);
+ lineinvalid(temp + TPL_LCOL(NULL), COLUMNS_WITHOUT_TPL());
}
}
}
}
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
+
#ifdef FEAT_GUI
gui_can_update_cursor();
if (gui.in_use)
#endif
);
+#if defined(FEAT_TABPANEL)
+ col = TPL_LCOL(NULL);
+#endif
+
if (ScreenLines == NULL)
return;
redraw_tabline = FALSE;
FOR_ALL_TABPAGES(tp)
++tabcount;
- tabwidth = (Columns - 1 + tabcount / 2) / tabcount;
+ tabwidth = (COLUMNS_WITHOUT_TPL() - 1 + tabcount / 2) / tabcount;
if (tabwidth < 6)
tabwidth = 6;
CHARSTAB_ENTRY(&fill_chars.diff, "diff"),
CHARSTAB_ENTRY(&fill_chars.eob, "eob"),
CHARSTAB_ENTRY(&fill_chars.lastline, "lastline"),
+#if defined(FEAT_TABPANEL)
+ CHARSTAB_ENTRY(&fill_chars.tpl_vert, "tpl_vert"),
+#endif
CHARSTAB_ENTRY(&fill_chars.trunc, "trunc"),
CHARSTAB_ENTRY(&fill_chars.truncrl, "truncrl"),
};
fill_chars.diff = '-';
fill_chars.eob = '~';
fill_chars.lastline = '@';
+#if defined(FEAT_TABPANEL)
+ fill_chars.tpl_vert = '|';
+#endif
fill_chars.trunc = '>';
fill_chars.truncrl = '<';
}
int diff;
int eob;
int lastline;
+#if defined(FEAT_TABPANEL)
+ int tpl_vert;
+#endif
int trunc;
int truncrl;
} fill_chars_T;
--- /dev/null
+/* vi:set ts=8 sts=4 sw=4 noet:
+ *
+ * VIM - Vi IMproved by Bram Moolenaar
+ *
+ * Do ":help uganda" in Vim to read copying and usage conditions.
+ * Do ":help credits" in Vim to see a list of people who contributed.
+ * See README.txt for an overview of the Vim source code.
+ */
+
+/*
+ * tabpanel.c:
+ */
+
+#include "vim.h"
+
+#if defined(FEAT_TABPANEL) || defined(PROTO)
+
+static void do_by_tplmode(int tplmode, int col_start, int col_end,
+ int* pcurtab_row, int* ptabpagenr);
+
+// set pcurtab_row. don't redraw tabpanel.
+#define TPLMODE_GET_CURTAB_ROW 0
+// set ptabpagenr. don't redraw tabpanel.
+#define TPLMODE_GET_TABPAGENR 1
+// redraw tabpanel.
+#define TPLMODE_REDRAW 2
+
+#define TPL_FILLCHAR ' '
+
+#define VERT_LEN 1
+
+// tpl_vert's values
+#define VERT_OFF 0
+#define VERT_ON 1
+
+// tpl_align's values
+#define ALIGN_LEFT 0
+#define ALIGN_RIGHT 1
+
+static char_u *opt_name = (char_u *)"tabpanel";
+static int opt_scope = OPT_LOCAL;
+static int tpl_align = ALIGN_LEFT;
+static int tpl_columns = 20;
+static int tpl_vert = VERT_OFF;
+
+typedef struct {
+ win_T *wp;
+ win_T *cwp;
+ char_u *user_defined;
+ int maxrow;
+ int offsetrow;
+ int *prow;
+ int *pcol;
+ int attr;
+ int col_start;
+ int col_end;
+} tabpanel_T;
+
+ int
+tabpanelopt_changed(void)
+{
+ char_u *p;
+ int new_align = ALIGN_LEFT;
+ int new_columns = 20;
+ int new_vert = VERT_OFF;
+
+ p = p_tplo;
+ while (*p != NUL)
+ {
+ if (STRNCMP(p, "align:left", 10) == 0)
+ {
+ p += 10;
+ new_align = ALIGN_LEFT;
+ }
+ else if (STRNCMP(p, "align:right", 11) == 0)
+ {
+ p += 11;
+ new_align = ALIGN_RIGHT;
+ }
+ else if (STRNCMP(p, "columns:", 8) == 0 && VIM_ISDIGIT(p[8]))
+ {
+ p += 8;
+ new_columns = getdigits(&p);
+ }
+ else if (STRNCMP(p, "vert", 4) == 0)
+ {
+ p += 4;
+ new_vert = VERT_ON;
+ }
+
+ if (*p != ',' && *p != NUL)
+ return FAIL;
+ if (*p == ',')
+ ++p;
+ }
+
+ tpl_align = new_align;
+ tpl_columns = new_columns;
+ tpl_vert = new_vert;
+
+ return OK;
+}
+
+/*
+ * Return the width of tabpanel.
+ */
+ int
+tabpanel_width(void)
+{
+ if (msg_scrolled != 0)
+ return 0;
+
+ switch (p_stpl)
+ {
+ case 0:
+ return 0;
+ case 1:
+ if (first_tabpage->tp_next == NULL)
+ return 0;
+ }
+ if (Columns < tpl_columns)
+ return 0;
+ else
+ return tpl_columns;
+}
+
+/*
+ * Return the offset of a window considering the width of tabpanel.
+ */
+ int
+tabpanel_leftcol(win_T *wp)
+{
+ if (cmdline_pum_active())
+ return 0;
+ else if (wp != NULL && WIN_IS_POPUP(wp))
+ return 0;
+ else
+ return tpl_align == ALIGN_RIGHT ? 0 : tabpanel_width();
+}
+
+/*
+ * draw the tabpanel.
+ */
+ void
+draw_tabpanel(void)
+{
+ int saved_KeyTyped = KeyTyped;
+ int saved_got_int = got_int;
+ int maxwidth = tabpanel_width();
+ int vs_attr = HL_ATTR(HLF_C);
+ int curtab_row = 0;
+#ifndef MSWIN
+ int row = 0;
+ int off = 0;
+#endif
+int vsrow = 0;
+ int is_right = tpl_align == ALIGN_RIGHT;
+
+ if (0 == maxwidth)
+ return;
+
+#ifndef MSWIN
+ // We need this section only for the Vim running on WSL.
+ for (row = 0; row < cmdline_row; row++)
+ {
+ if (is_right)
+ off = LineOffset[row] + Columns - maxwidth;
+ else
+ off = LineOffset[row];
+
+ vim_memset(ScreenLines + off, ' ',
+ (size_t)maxwidth * sizeof(schar_T));
+ if (enc_utf8)
+ vim_memset(ScreenLinesUC + off, -1,
+ (size_t)maxwidth * sizeof(u8char_T));
+ }
+#endif
+
+ // Reset got_int to avoid build_stl_str_hl() isn't evaluted.
+ got_int = FALSE;
+
+ if (tpl_vert == VERT_ON)
+ {
+ if (is_right)
+ {
+ // draw main contents in tabpanel
+ do_by_tplmode(TPLMODE_GET_CURTAB_ROW, VERT_LEN,
+ maxwidth - VERT_LEN, &curtab_row, NULL);
+ do_by_tplmode(TPLMODE_REDRAW, VERT_LEN, maxwidth, &curtab_row,
+ NULL);
+ // clear for multi-byte vert separater
+ screen_fill(0, cmdline_row, COLUMNS_WITHOUT_TPL(),
+ COLUMNS_WITHOUT_TPL() + VERT_LEN,
+ TPL_FILLCHAR, TPL_FILLCHAR, vs_attr);
+ // draw vert separater in tabpanel
+ for (vsrow = 0; vsrow < cmdline_row; vsrow++)
+ screen_putchar(curwin->w_fill_chars.tpl_vert, vsrow,
+ COLUMNS_WITHOUT_TPL(), vs_attr);
+ }
+ else
+ {
+ // draw main contents in tabpanel
+ do_by_tplmode(TPLMODE_GET_CURTAB_ROW, 0, maxwidth - VERT_LEN,
+ &curtab_row, NULL);
+ do_by_tplmode(TPLMODE_REDRAW, 0, maxwidth - VERT_LEN,
+ &curtab_row, NULL);
+ // clear for multi-byte vert separater
+ screen_fill(0, cmdline_row, maxwidth - VERT_LEN,
+ maxwidth, TPL_FILLCHAR, TPL_FILLCHAR, vs_attr);
+ // draw vert separater in tabpanel
+ for (vsrow = 0; vsrow < cmdline_row; vsrow++)
+ screen_putchar(curwin->w_fill_chars.tpl_vert, vsrow,
+ maxwidth - VERT_LEN, vs_attr);
+ }
+ }
+ else
+ {
+ do_by_tplmode(TPLMODE_GET_CURTAB_ROW, 0, maxwidth, &curtab_row, NULL);
+ do_by_tplmode(TPLMODE_REDRAW, 0, maxwidth, &curtab_row, NULL);
+ }
+
+ got_int |= saved_got_int;
+
+ // A user function may reset KeyTyped, restore it.
+ KeyTyped = saved_KeyTyped;
+
+ redraw_tabpanel = FALSE;
+}
+
+/*
+ * Return tabpagenr when clicking and dragging in tabpanel.
+ */
+ int
+get_tabpagenr_on_tabpanel(void)
+{
+ int maxwidth = tabpanel_width();
+ int curtab_row = 0;
+ int tabpagenr = 0;
+
+ if (0 == maxwidth)
+ return -1;
+
+ do_by_tplmode(TPLMODE_GET_CURTAB_ROW, 0, maxwidth, &curtab_row, NULL);
+ do_by_tplmode(TPLMODE_GET_TABPAGENR, 0, maxwidth, &curtab_row,
+ &tabpagenr);
+
+ return tabpagenr;
+}
+
+/*
+ * Fill tailing area between {start_row} and {end_row - 1}.
+ */
+ static void
+screen_fill_tailing_area(
+ int tplmode,
+ int row_start,
+ int row_end,
+ int col_start,
+ int col_end,
+ int attr)
+{
+ int is_right = tpl_align == ALIGN_RIGHT;
+ if (TPLMODE_REDRAW == tplmode)
+ screen_fill(row_start, row_end,
+ (is_right ? COLUMNS_WITHOUT_TPL() : 0) + col_start,
+ (is_right ? COLUMNS_WITHOUT_TPL() : 0) + col_end,
+ TPL_FILLCHAR, TPL_FILLCHAR, attr);
+}
+
+/*
+ * screen_puts_len() for tabpanel.
+ */
+ static void
+screen_puts_len_for_tabpanel(
+ int tplmode,
+ char_u *p,
+ int len,
+ int attr,
+ tabpanel_T *pargs)
+{
+ int j, k;
+ int chlen;
+ int chcells;
+ char_u buf[IOSIZE];
+ char_u* temp;
+
+ for (j = 0; j < len;)
+ {
+ if ((TPLMODE_GET_CURTAB_ROW != tplmode)
+ && (pargs->maxrow <= (*pargs->prow - pargs->offsetrow)))
+ break;
+
+ if ((p[j] == '\n') || (p[j] == '\r'))
+ {
+ // fill the tailing area of current row.
+ if (0 <= (*pargs->prow - pargs->offsetrow)
+ && (*pargs->prow - pargs->offsetrow) < pargs->maxrow)
+ screen_fill_tailing_area(tplmode,
+ *pargs->prow - pargs->offsetrow,
+ *pargs->prow - pargs->offsetrow + 1,
+ *pargs->pcol, pargs->col_end, attr);
+ (*pargs->prow)++;
+ *pargs->pcol = pargs->col_start;
+ j++;
+ }
+ else
+ {
+ if (has_mbyte)
+ chlen = (*mb_ptr2len)(p + j);
+ else
+ chlen = (int)STRLEN(p + j);
+
+ for (k = 0; k < chlen; k++)
+ buf[k] = p[j + k];
+ buf[chlen] = NUL;
+ j += chlen;
+
+ // Make all characters printable.
+ temp = transstr(buf);
+ if (temp != NULL)
+ {
+ vim_strncpy(buf, temp, sizeof(buf) - 1);
+ vim_free(temp);
+ }
+
+ if (has_mbyte)
+ chcells = (*mb_ptr2cells)(buf);
+ else
+ chcells = 1;
+
+ if (pargs->col_end < (*pargs->pcol) + chcells)
+ {
+ // fill the tailing area of current row.
+ if (0 <= (*pargs->prow - pargs->offsetrow)
+ && (*pargs->prow - pargs->offsetrow) < pargs->maxrow)
+ screen_fill_tailing_area(tplmode,
+ *pargs->prow - pargs->offsetrow,
+ *pargs->prow - pargs->offsetrow + 1,
+ *pargs->pcol, pargs->col_end, attr);
+ *pargs->pcol = pargs->col_end;
+
+ if (pargs->col_end < chcells)
+ break;
+ }
+
+ if ((*pargs->pcol) + chcells <= pargs->col_end)
+ {
+ int off = (tpl_align == ALIGN_RIGHT)
+ ? COLUMNS_WITHOUT_TPL()
+ : 0;
+ if ((TPLMODE_REDRAW == tplmode)
+ && (0 <= (*pargs->prow - pargs->offsetrow)
+ && (*pargs->prow - pargs->offsetrow) < pargs->maxrow))
+ screen_puts(buf, *pargs->prow - pargs->offsetrow,
+ *pargs->pcol + off, attr);
+ (*pargs->pcol) += chcells;
+ }
+ }
+ }
+}
+
+/*
+ * default tabpanel drawing behavior if 'tabpanel' option is empty.
+ */
+ static void
+draw_tabpanel_default(int tplmode, tabpanel_T *pargs)
+{
+ int modified;
+ int wincount;
+ int len = 0;
+ char_u buf[2] = { NUL, NUL };
+
+ modified = FALSE;
+ for (wincount = 0; pargs->wp != NULL;
+ pargs->wp = pargs->wp->w_next, ++wincount)
+ if (bufIsChanged(pargs->wp->w_buffer))
+ modified = TRUE;
+
+ if (modified || 1 < wincount)
+ {
+ if (1 < wincount)
+ {
+ vim_snprintf((char *)NameBuff, MAXPATHL, "%d", wincount);
+ len = (int)STRLEN(NameBuff);
+ screen_puts_len_for_tabpanel(tplmode, NameBuff, len,
+#if defined(FEAT_SYN_HL)
+ hl_combine_attr(pargs->attr, HL_ATTR(HLF_T)),
+#else
+ pargs->attr,
+#endif
+ pargs);
+ }
+ if (modified)
+ {
+ buf[0] = '+';
+ screen_puts_len_for_tabpanel(tplmode, buf, 1, pargs->attr, pargs);
+ }
+
+ buf[0] = TPL_FILLCHAR;
+ screen_puts_len_for_tabpanel(tplmode, buf, 1, pargs->attr, pargs);
+ }
+
+ get_trans_bufname(pargs->cwp->w_buffer);
+ shorten_dir(NameBuff);
+ len = (int)STRLEN(NameBuff);
+ screen_puts_len_for_tabpanel(tplmode, NameBuff, len, pargs->attr, pargs);
+
+ // fill the tailing area of current row.
+ if (0 <= (*pargs->prow - pargs->offsetrow)
+ && (*pargs->prow - pargs->offsetrow) < pargs->maxrow)
+ screen_fill_tailing_area(tplmode, *pargs->prow - pargs->offsetrow,
+ *pargs->prow - pargs->offsetrow + 1,
+ *pargs->pcol, pargs->col_end, pargs->attr);
+ *pargs->pcol = pargs->col_end;
+}
+
+/*
+ * default tabpanel drawing behavior if 'tabpanel' option is NOT empty.
+ */
+ static void
+draw_tabpanel_userdefined(int tplmode, tabpanel_T *pargs)
+{
+ char_u *p;
+ int p_crb_save;
+ char_u buf[IOSIZE];
+ stl_hlrec_T *hltab;
+ stl_hlrec_T *tabtab;
+ int curattr;
+ int n;
+
+ // Temporarily reset 'cursorbind', we don't want a side effect from moving
+ // the cursor away and back.
+ p_crb_save = pargs->cwp->w_p_crb;
+ pargs->cwp->w_p_crb = FALSE;
+
+ // Make a copy, because the statusline may include a function call that
+ // might change the option value and free the memory.
+ p = vim_strsave(pargs->user_defined);
+
+ build_stl_str_hl(pargs->cwp, buf, sizeof(buf),
+ p, opt_name, opt_scope,
+ TPL_FILLCHAR, pargs->col_end - pargs->col_start, &hltab, &tabtab);
+
+ vim_free(p);
+ pargs->cwp->w_p_crb = p_crb_save;
+
+ curattr = pargs->attr;
+ p = buf;
+ for (n = 0; hltab[n].start != NULL; n++)
+ {
+ screen_puts_len_for_tabpanel(tplmode, p, (int)(hltab[n].start - p),
+ curattr, pargs);
+ p = hltab[n].start;
+ if (hltab[n].userhl == 0)
+ curattr = pargs->attr;
+ else if (hltab[n].userhl < 0)
+ curattr = syn_id2attr(-hltab[n].userhl);
+#ifdef FEAT_TERMINAL
+ else if (pargs->wp != NULL && pargs->wp != curwin
+ && bt_terminal(pargs->wp->w_buffer)
+ && pargs->wp->w_status_height != 0)
+ curattr = highlight_stltermnc[hltab[n].userhl - 1];
+ else if (pargs->wp != NULL && bt_terminal(pargs->wp->w_buffer)
+ && pargs->wp->w_status_height != 0)
+ curattr = highlight_stlterm[hltab[n].userhl - 1];
+#endif
+ else if (pargs->wp != NULL && pargs->wp != curwin
+ && pargs->wp->w_status_height != 0)
+ curattr = highlight_stlnc[hltab[n].userhl - 1];
+ else
+ curattr = highlight_user[hltab[n].userhl - 1];
+ }
+ screen_puts_len_for_tabpanel(tplmode, p, (int)STRLEN(p), curattr, pargs);
+
+ // fill the tailing area of current row.
+ if (0 <= (*pargs->prow - pargs->offsetrow)
+ && (*pargs->prow - pargs->offsetrow) < pargs->maxrow)
+ screen_fill_tailing_area(tplmode, *pargs->prow - pargs->offsetrow,
+ *pargs->prow - pargs->offsetrow + 1, *pargs->pcol,
+ pargs->col_end, curattr);
+ *pargs->pcol = pargs->col_end;
+}
+
+ static char_u *
+starts_with_percent_and_bang(tabpanel_T *pargs)
+{
+ int len = 0;
+ char_u *usefmt = p_tpl;
+
+ if (usefmt == NULL)
+ return NULL;
+
+ len = (int)STRLEN(usefmt);
+
+ if (len == 0)
+ return NULL;
+
+#ifdef FEAT_EVAL
+ // if "fmt" was set insecurely it needs to be evaluated in the sandbox
+ int use_sandbox = was_set_insecurely(opt_name, opt_scope);
+
+ // When the format starts with "%!" then evaluate it as an expression and
+ // use the result as the actual format string.
+ if (1 < len && usefmt[0] == '%' && usefmt[1] == '!')
+ {
+ typval_T tv;
+ char_u *p = NULL;
+
+ tv.v_type = VAR_NUMBER;
+ tv.vval.v_number = pargs->cwp->w_id;
+ set_var((char_u *)"g:tabpanel_winid", &tv, FALSE);
+
+ p = eval_to_string_safe(usefmt + 2, use_sandbox, FALSE, FALSE);
+ if (p != NULL)
+ usefmt = p;
+
+ do_unlet((char_u *)"g:tabpanel_winid", TRUE);
+ }
+#endif
+
+ return usefmt;
+}
+
+/*
+ * do something by tplmode for drawing tabpanel.
+ */
+ static void
+do_by_tplmode(
+ int tplmode,
+ int col_start,
+ int col_end,
+ int *pcurtab_row,
+ int *ptabpagenr)
+{
+ int attr_tplf = HL_ATTR(HLF_TPLF);
+ int attr_tpls = HL_ATTR(HLF_TPLS);
+ int attr_tpl = HL_ATTR(HLF_TPL);
+ int col = col_start;
+ int row = 0;
+ tabpage_T *tp = NULL;
+ typval_T v;
+ tabpanel_T args;
+
+ args.maxrow = cmdline_row;
+ args.offsetrow = 0;
+ args.col_start = col_start;
+ args.col_end = col_end;
+
+ if (TPLMODE_GET_CURTAB_ROW != tplmode)
+ if (0 < args.maxrow)
+ while (args.offsetrow + args.maxrow <= *pcurtab_row)
+ args.offsetrow += args.maxrow;
+
+ tp = first_tabpage;
+
+ for (row = 0; tp != NULL; row++)
+ {
+ if ((TPLMODE_GET_CURTAB_ROW != tplmode)
+ && (args.maxrow <= (row - args.offsetrow)))
+ break;
+
+ col = col_start;
+
+ v.v_type = VAR_NUMBER;
+ v.vval.v_number = tabpage_index(tp);
+ set_var((char_u *)"g:actual_curtabpage", &v, TRUE);
+
+ if (tp->tp_topframe == topframe)
+ {
+ args.attr = attr_tpls;
+ if (TPLMODE_GET_CURTAB_ROW == tplmode)
+ {
+ *pcurtab_row = row;
+ break;
+ }
+ }
+ else
+ args.attr = attr_tpl;
+
+ if (tp == curtab)
+ {
+ args.cwp = curwin;
+ args.wp = firstwin;
+ }
+ else
+ {
+ args.cwp = tp->tp_curwin;
+ args.wp = tp->tp_firstwin;
+ }
+
+ char_u* usefmt = starts_with_percent_and_bang(&args);
+ if (usefmt != NULL)
+ {
+ char_u buf[IOSIZE];
+ char_u *p = usefmt;
+ size_t i = 0;
+
+ while (p[i] != '\0')
+ {
+ while ((p[i] == '\n') || (p[i] == '\r'))
+ {
+ // fill the tailing area of current row.
+ if (0 <= (row - args.offsetrow)
+ && (row - args.offsetrow) < args.maxrow)
+ screen_fill_tailing_area(tplmode,
+ row - args.offsetrow,
+ row - args.offsetrow + 1,
+ col, args.col_end, args.attr);
+ row++;
+ col = col_start;
+ p++;
+ }
+
+ while ((p[i] != '\n') && (p[i] != '\r')
+ && (p[i] != '\0'))
+ {
+ if (i + 1 >= sizeof(buf))
+ break;
+ buf[i] = p[i];
+ i++;
+ }
+ buf[i] = '\0';
+
+ args.user_defined = buf;
+ args.prow = &row;
+ args.pcol = &col;
+ draw_tabpanel_userdefined(tplmode, &args);
+
+ p += i;
+ i = 0;
+ }
+ if (usefmt != p_tpl)
+ VIM_CLEAR(usefmt);
+ }
+ else
+ {
+ args.user_defined = NULL;
+ args.prow = &row;
+ args.pcol = &col;
+ draw_tabpanel_default(tplmode, &args);
+ }
+
+ do_unlet((char_u *)"g:actual_curtabpage", TRUE);
+
+ tp = tp->tp_next;
+
+ if ((TPLMODE_GET_TABPAGENR == tplmode)
+ && (mouse_row <= (row - args.offsetrow)))
+ {
+ *ptabpagenr = v.vval.v_number;
+ break;
+ }
+ }
+
+ // fill the area of TabPanelFill.
+ screen_fill_tailing_area(tplmode, row - args.offsetrow, args.maxrow,
+ args.col_start, args.col_end, attr_tplf);
+}
+
+#endif // FEAT_TABPANEL
{
OUT_STR(tgoto((char *)T_CS, W_WINROW(wp) + wp->w_height - 1,
W_WINROW(wp) + off));
+#if defined(FEAT_TABPANEL)
+ if (*T_CSV != NUL)
+ OUT_STR(tgoto((char *)T_CSV,
+ wp->w_wincol + wp->w_width - 1 + TPL_LCOL(NULL),
+ wp->w_wincol + TPL_LCOL(NULL)));
+#else
if (*T_CSV != NUL && wp->w_width != Columns)
OUT_STR(tgoto((char *)T_CSV, wp->w_wincol + wp->w_width - 1,
wp->w_wincol));
+#endif
screen_start(); // don't know where cursor is now
}
{
OUT_STR(tgoto((char *)T_CS, (int)Rows - 1, 0));
if (*T_CSV != NUL)
- OUT_STR(tgoto((char *)T_CSV, (int)Columns - 1, 0));
+ OUT_STR(tgoto((char *)T_CSV, COLUMNS_WITHOUT_TPL() - 1, 0));
screen_start(); // don't know where cursor is now
}
// do not use the window cursor position
position_cursor(curwin, &curbuf->b_term->tl_cursor_pos);
windgoto(W_WINROW(curwin) + curwin->w_wrow,
- curwin->w_wincol + curwin->w_wcol);
+ curwin->w_wincol + curwin->w_wcol + TPL_LCOL(NULL));
}
if (redraw)
{
if (buffer == curbuf && (State & MODE_CMDLINE) == 0)
{
update_screen(UPD_VALID_NO_UPDATE);
+#if defined(FEAT_TABPANEL)
+ if (redraw_tabpanel)
+ draw_tabpanel();
+#endif
// update_screen() can be slow, check the terminal wasn't closed
// already
if (buffer == curbuf && curbuf->b_term != NULL)
#ifdef FEAT_MENU
+ winbar_height(wp)
#endif
- , wp->w_wincol, pos.col, wp->w_width, -1,
+ , wp->w_wincol + TPL_LCOL(wp), pos.col,
+ wp->w_width, -1,
#ifdef FEAT_PROP_POPUP
popup_is_popup(wp) ? SLF_POPUP :
#endif
test_tab \
test_tabline \
test_tabpage \
+ test_tabpanel \
test_tagcase \
test_tagfunc \
test_tagjump \
test_system.res \
test_tab.res \
test_tabpage.res \
+ test_tabpanel.res \
test_tagjump.res \
test_taglist.res \
test_tcl.res \
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| | +0#0000000#ffffff0@34
+|[+2&&|N|o| |N|a|m|e|]| |~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+|a+0#0000001#ffff4012|b@1|r|e|v|i|a|t|e| +3#0000000#ffffff0@1|a|b|c|l|e|a|r| @1|a|b|o|v|e|l|e|f|t| @1|a|b|s|t|r|a|c|t| @4
+|:+0&&|a|b@1|r|e|v|i|a|t|e> @33
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| | +0#0000000#ffffff0@34
+|[+2&&|N|o| |N|a|m|e|]| |~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +0#0000001#e0e0e08|a|b@1|r|e|v|i|a|t|e| @4| +0#4040ff13#ffffff0@28
+| +0#0000001#ffd7ff255|a|b|c|l|e|a|r| @7| +0#4040ff13#ffffff0@28
+| +0#0000001#ffd7ff255|a|b|o|v|e|l|e|f|t| @5| +0#4040ff13#ffffff0@28
+| +0#0000001#ffd7ff255|a|b|s|t|r|a|c|t| @6| +0#4040ff13#ffffff0@28
+|:+0#0000000&|a|b@1|r|e|v|i|a|t|e> @33
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| @1|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|+| |[|N|o| |N|a|m|e|]| | +1&&@9|X+8#0000001#e0e0e08
+|++2#0000000#ffffff0| |[|N|o| |N|a|m|e>x+0&&@34
+| +1&&@9|x+0&&@34
+| +1&&@9|x+0&&@29| @4
+| +1&&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +0#0000000&@36|1|,|1| @4
--- /dev/null
+> +0&#ffffff0@44
+|~+0#4040ff13&| @43
+|~| @43
+|~| @43
+|~| @43
+| +0#0000000&@26|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+|X+2&#ffffff0|t|a|b|p|a|n|e|l|1| @5> +0&&@28
+| +1&&@15|~+0#4040ff13&| @27
+| +1#0000000&@15|~+0#4040ff13&| @27
+| +1#0000000&@15|~+0#4040ff13&| @27
+| +1#0000000&@15|~+0#4040ff13&| @27
+| +0#0000000&@26|0|,|0|-|1| @8|A|l|0|,
--- /dev/null
+|2+2#e000e06#ffffff0| +2#0000000&|X|t|a|b|p|a|n|e|l|1| @3> +0&&@19||+1&&| +0&&@7
+| +1&&@15|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @6
+| +1#0000000&@15|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @6
+| +1#0000000&@15|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @6
+| +1#0000000&@15|<+3&&|a|b|p|a|n|e|l|1| |0|,|0|-|1| @1|A|l@1| |<+1&&|l|1| |0|,|0|-
+| +0&&@44
--- /dev/null
+|2+2#e000e06#ffffff0|++2#0000000&| |X|t|a|b|p|a|n|e|l|1| @2>a+0&&| @18||+1&&|a+0&&| @6
+| +1&&@15|b+0&&| @18||+1&&|b+0&&| @6
+| +1&&@15|c+0&&| @18||+1&&|c+0&&| @6
+| +1&&@15|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @6
+| +1#0000000&@15|<+3&&|n|e|l|1| |[|+|]| |1|,|1| @3|A|l@1| |<+1&&|+|]| |1|,|1|
+| +0&&@44
--- /dev/null
+|2+8#e000e06#e0e0e08|++8#0000001&| |X|t|a|b|p|a|n|e|l|1| @2>d+0#0000000#ffffff0| @27
+|++2&&| |X|t|a|b|p|a|n|e|l|2| @3|e+0&&| @27
+| +1&&@15|f+0&&| @27
+| +1&&@15|~+0#4040ff13&| @27
+| +1#0000000&@15|~+0#4040ff13&| @27
+| +0#0000000&@42|1|,
--- /dev/null
+| +8#0000001#e0e0e08@15>d+0#0000000#ffffff0| @27
+|1+8#0000001#e0e0e08|:|X+2#4040ff13#ffffff0|t|a|b|p|a|n|e|l|1| +8#0000001#e0e0e08@3|e+0#0000000#ffffff0| @27
+| +2&&@15|f+0&&| @27
+|2+2&&|:|X+0#4040ff13&|t|a|b|p|a|n|e|l|2| +2#0000000&@3|~+0#4040ff13&| @27
+| +1#0000000&@15|~+0#4040ff13&| @27
+| +0#0000000&@42|1|,
--- /dev/null
+>d+0&#ffffff0| @27| +8#0000001#e0e0e08@15
+|e+0#0000000#ffffff0| @27|1+8#0000001#e0e0e08|:|X+2#4040ff13#ffffff0|t|a|b|p|a|n|e|l|1| +8#0000001#e0e0e08@3
+|f+0#0000000#ffffff0| @27| +2&&@15
+|~+0#4040ff13&| @27|2+2#0000000&|:|X+0#4040ff13&|t|a|b|p|a|n|e|l|2| +2#0000000&@3
+|~+0#4040ff13&| @27| +1#0000000&@15
+| +0&&@26|1|,|1| @10|A|l@1|
--- /dev/null
+> +0&#ffffff0@28| +8#0000001#e0e0e08@15
+|~+0#4040ff13#ffffff0| @27|1+8#0000001#e0e0e08|:|X+2#4040ff13#ffffff0|t|a|b|p|a|n|e|l|1| +8#0000001#e0e0e08@3
+|~+0#4040ff13#ffffff0| @27| +8#0000001#e0e0e08@15
+|~+0#4040ff13#ffffff0| @27|2+8#0000001#e0e0e08|:|X+0#4040ff13#ffffff0|t|a|b|p|a|n|e|l|2| +8#0000001#e0e0e08@3
+|~+0#4040ff13#ffffff0| @27| +2#0000000&@15
+| +0&&@26|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+>a+0&#ffffff0| @18||+1&&|a+0&&| @6| +2&&@15
+|b+0&&| @18||+1&&|b+0&&| @6|1+2&&|:|X+0#4040ff13&|t|a|b|p|a|n|e|l|1| +2#0000000&@3
+|c+0&&| @18||+1&&|c+0&&| @6| +1&&@15
+|~+0#4040ff13&| @18||+1#0000000&|~+0#4040ff13&| @6| +1#0000000&@15
+|<+3&&|n|e|l|1| |[|+|]| |1|,|1| @3|A|l@1| |<+1&&|+|]| |1|,|1| @16
+| +0&&@26|1|,|1| @10|A|l@1|
--- /dev/null
+| +8#0000001#e0e0e08@19> +0#0000000#ffffff0@24
+|T+8#0000001#e0e0e08|O|P| @16|~+0#4040ff13#ffffff0| @23
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12|~+0#4040ff13#ffffff0| @23
+|B+8#0000001#e0e0e08|O|T@1|O|M| @13|~+0#4040ff13#ffffff0| @23
+| +2#0000000&@19|~+0#4040ff13&| @23
+|T+2#0000000&|O|P| @16|~+0#4040ff13&| @23
+|b+2#0000000&@2|.|t|x|t| @12|~+0#4040ff13&| @23
+|B+2#0000000&|O|T@1|O|M| @13|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +0#0000000&@44
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12|!+0#0000000#ffffff0> @23
+|b+2&&@2|.|t|x|t| @12|!+0#0000001#e0e0e08| @14| +0#0000000#0000001| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|#+0#0000001#ffd7ff255| @14| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|&+0#0000001#ffd7ff255| @14| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|*+0#0000001#ffd7ff255| @14| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|++0#0000001#ffd7ff255@1| @13| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|-+0#0000001#ffd7ff255@1| @13| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|<+0#0000001#ffd7ff255| @14| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|=+0#0000001#ffd7ff255| @14| +0#0000000#a8a8a8255| +0#4040ff13#ffffff0@7
+|-+2#0000000&@1| |m+0#00e0003&|a|t|c|h| |1| |o|f| |5|9|6| +0#0000000&@27
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12|!+0#0000000#ffffff0| @23
+|++2&&| |b@2|.|t|x|t| @10| +0&&@1|a|b@1|r|e|v|i|a|t|e> @12
+| +1&&@19|~+0#4040ff13&| +0#0000001#e0e0e08|a|b@1|r|e|v|i|a|t|e| @4| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|~+0#4040ff13&| +0#0000001#ffd7ff255|a|b|c|l|e|a|r| @7| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|~+0#4040ff13&| +0#0000001#ffd7ff255|a|b|o|v|e|l|e|f|t| @5| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|~+0#4040ff13&| +0#0000001#ffd7ff255|a|b|s|t|r|a|c|t| @6| +0#4040ff13#ffffff0@7
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+| +1#0000000&@19|~+0#4040ff13&| @23
+|-+2#0000000&@1| |m+0#00e0003&|a|t|c|h| |1| |o|f| |4| +0#0000000&@29
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12| +0#af5f00255#ffffff0@1|9| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|1|
+|2+2#e000e06&|++2#0000000&| |b@2|.|t|x|t| @9| +0#af5f00255&|1|0| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|2|
+| +1#0000000&@19| +0#af5f00255&|1@1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|3|
+| +1#0000000&@19| +0#af5f00255&|1|2| >@+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|4|
+| +1#0000000&@19| +0#af5f00255&|1|3| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|5|
+| +1#0000000&@19| +0#af5f00255&|1|4| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|6|
+| +1#0000000&@19| +0#af5f00255&|1|5| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|7|
+| +1#0000000&@19| +0#af5f00255&|1|6| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t||+1&&| +0#af5f00255&@1|8|
+| +1#0000000&@19|<+3&&|.|t|x|t| |[|+|]| |1|2|,|1| @3|8|%| |<+1&&| |1|,
+| +0&&@44
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12| +0#af5f00255#ffffff0@1|1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+|2+2#e000e06&|++2#0000000&| |b@2|.|t|x|t| @9| +0#af5f00255&@1|2| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&@1|3| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19|b@2|.|t|x|t| |[|+|]| @1|1|,|1| @5|T|o|p
+| @19| +0#af5f00255&|1|5| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&|1|6| >@+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&|1|7| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&|1|8| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19|b+3&&@2|.|t|x|t| |[|+|]| @1|1|6|,|1| @4|1|4|%
+| +0&&@44
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12| +0#af5f00255#ffffff0|1|9| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+|2+2#e000e06&|++2#0000000&| |b@2|.|t|x|t| @9| +0#af5f00255&|2|0| >@+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&|2|1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&|2@1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19|b+3&&@2|.|t|x|t| |[|+|]| @1|2|0|,|1| @4|1|8|%
+| +1&&@19| +0#af5f00255&@1|1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&@1|2| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19| +0#af5f00255&@1|3| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t|e|x|t| @1
+| +1&&@19|b@2|.|t|x|t| |[|+|]| @1|1|,|1| @5|T|o|p
+| +0&&@44
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @12| +0#af5f00255#ffffff0@1|1| ||+1#0000000&| +0#af5f00255&|2|5| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+|2+2#e000e06&|++2#0000000&| |b@2|.|t|x|t| @9| +0#af5f00255&@1|2| ||+1#0000000&| +0#af5f00255&|2|6| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|3| ||+1#0000000&| +0#af5f00255&|2|7| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|4| ||+1#0000000&| +0#af5f00255&|2|8| >@+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|5| ||+1#0000000&| +0#af5f00255&|2|9| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|6| ||+1#0000000&| +0#af5f00255&|3|0| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|7| ||+1#0000000&| +0#af5f00255&|3|1| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19| +0#af5f00255&@1|8| ||+1#0000000&| +0#af5f00255&|3|2| |t+0#0000000&|e|x|t| |t|e|x|t| |t|e|x|t| |t
+| +1&&@19|<| |1|,| |<+3&&|.|t|x|t| |[|+|]| |2|8|,|1| @2|2|6|%
+| +0&&@44
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| @10|╔+0#0000000#ffffff0|═|╗|.@18|╔|═|╗
+|[+2&&|S|c|r|a|t|c|h|]| @10|║+0&&|@|║|.@18|║|@|║
+| +1&&@19|╚+0&&|═|╝|.@5|a|t|c|u|r|s|o|r|.@4|╚|═|╝
+| +1&&@19|.+0&&@8>.@15
+| +1&&@19|.+0&&@24
+| +1&&@19|╔+0&&|═|╗|.@18|╔|═|╗
+| +1&&@19|║+0&&|@|║|.@18|║|@|║
+| +1&&@19|╚+0&&|═|╝|.@18|╚|═|╝
+| +1&&@19|.+0&&@24
+| @44
--- /dev/null
+|$+8#0000001#e0e0e08| |[|a@2|]| |$|│+1#0000000#ffffff0|$| @13|[|c@2|]| @13|$
+|$+8#0000001#e0e0e08| |[|b@2|]| |$|│+1#0000000#ffffff0> +0&&@34
+|$+2&&| |[|c@2|]| |$|│+1&&|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|$+3&&| @13|[|c@2|]| @13|$
+|"+0&&|c@2|"| |[|N|e|w|]| @33
--- /dev/null
+|$+1&#ffffff0| @13|[|c@2|]| @13|$|│|$+8#0000001#e0e0e08| |[|a@2|]| |$
+> +0#0000000#ffffff0@34|│+1&&|$+8#0000001#e0e0e08| |[|b@2|]| |$
+|~+0#4040ff13#ffffff0| @33|│+1#0000000&|$+2&&| |[|c@2|]| |$
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|$+3&&| @13|[|c@2|]| @13|$|│+1&&| @8
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|+|=|a|l|i|g|n|:|r|i|g|h|t| @15
--- /dev/null
+|t+8#0000001#e0e0e08|o|p| @7|a@2| @1|b@2| | +2#0000000#ffffff0|c@2| | +1&&@18|X+8#0000001#e0e0e08
+|$| |[|a@2|]| @1|$> +0#0000000#ffffff0@34
+|b+8#0000001#e0e0e08|o|t@1|o|m| @3|~+0#4040ff13#ffffff0| @33
+|t+8#0000001#e0e0e08|o|p| @6|~+0#4040ff13#ffffff0| @33
+|$+8#0000001#e0e0e08| |[|b@2|]| @1|$|~+0#4040ff13#ffffff0| @33
+|b+8#0000001#e0e0e08|o|t@1|o|m| @3|~+0#4040ff13#ffffff0| @33
+|t+2#0000000&|o|p| @6|~+0#4040ff13&| @33
+|$+2#0000000&| |[|c@2|]| @1|$|~+0#4040ff13&| @33
+|b+2#0000000&|o|t@1|o|m| @3|~+0#4040ff13&| @33
+|"+0#0000000&|c@2|"| |[|N|e|w|]| @25|0|,|0|-|1| @2
--- /dev/null
+| +8#0000001#e0e0e08|a@2| @1|b@2| | +2#0000000#ffffff0|c@2| | +1&&@19|t+8#0000001#e0e0e08|o|p| @6
+> +0#0000000#ffffff0@34|$+8#0000001#e0e0e08| |[|a@2|]| @1|$
+|~+0#4040ff13#ffffff0| @33|b+8#0000001#e0e0e08|o|t@1|o|m| @3
+|~+0#4040ff13#ffffff0| @33|t+8#0000001#e0e0e08|o|p| @6
+|~+0#4040ff13#ffffff0| @33|$+8#0000001#e0e0e08| |[|b@2|]| @1|$
+|~+0#4040ff13#ffffff0| @33|b+8#0000001#e0e0e08|o|t@1|o|m| @3
+|~+0#4040ff13#ffffff0| @33|t+2#0000000&|o|p| @6
+|~+0#4040ff13&| @33|$+2#0000000&| |[|c@2|]| @1|$
+|~+0#4040ff13&| @33|b+2#0000000&|o|t@1|o|m| @3
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|+|=|a|l|i|g|n|:|r|i|g|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+|1+2&#ffffff0|:|t|a|b| @4> +0&&@34
+|2+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|3+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|4+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|5+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|6+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|7+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|8+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|9+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+| +0#0000000&@36|0|,|0|-|1| @2
--- /dev/null
+|1+8#0000001#e0e0e08|:|t|a|b| @4> +0#0000000#ffffff0@34
+|2+2&&|:|t|a|b| @4|~+0#4040ff13&| @33
+|3+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|4+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|5+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|6+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|7+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|8+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|9+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+| +0#0000000&@36|0|,|0|-|1| @2
--- /dev/null
+|1+8#0000001#e0e0e08|:|t|a|b| @4> +0#0000000#ffffff0@34
+|2+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|3+2#0000000&|:|t|a|b| @4|~+0#4040ff13&| @33
+|4+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|5+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|6+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|7+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|8+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|9+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+| +0#0000000&@36|0|,|0|-|1| @2
--- /dev/null
+|1+8#0000001#e0e0e08|:|t|a|b| @4> +0#0000000#ffffff0@34
+|2+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|3+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|4+2#0000000&|:|t|a|b| @4|~+0#4040ff13&| @33
+|5+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|6+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|7+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|8+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+|9+8#0000001#e0e0e08|:|t|a|b| @4|~+0#4040ff13#ffffff0| @33
+| +0#0000000&@36|0|,|0|-|1| @2
--- /dev/null
+|1+8#0000001#e0e0e08|0|:|t|a|b| @3> +0#0000000#ffffff0@34
+|1+2&&@1|:|t|a|b| @3|~+0#4040ff13&| @33
+|1+8#0000001#e0e0e08|2|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|3|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|4|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|5|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|6|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|7|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|1+8#0000001#e0e0e08|8|:|t|a|b| @3|~+0#4040ff13#ffffff0| @33
+|:+0#0000000&|t|a|b|n|e|x|t| |-|3| @25|0|,|0|-|1| @2
--- /dev/null
+|$+8#0000001#e0e0e08| |[|a@2|]| |$|│+1#0000000#ffffff0|$| @13|[|c@2|]| @13|$
+|$+8#0000001#e0e0e08| |[|b@2|]| |$|│+1#0000000#ffffff0> +0&&@34
+|$+2&&| |[|c@2|]| |$|│+1&&|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|$+3&&| @13|[|c@2|]| @13|$
+|"+0&&|c@2|"| |[|N|e|w|]| @33
--- /dev/null
+|$+1&#ffffff0| @13|[|c@2|]| @13|$|│|$+8#0000001#e0e0e08| |[|a@2|]| |$
+> +0#0000000#ffffff0@34|│+1&&|$+8#0000001#e0e0e08| |[|b@2|]| |$
+|~+0#4040ff13#ffffff0| @33|│+1#0000000&|$+2&&| |[|c@2|]| |$
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|$+3&&| @13|[|c@2|]| @13|$|│+1&&| @8
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|+|=|a|l|i|g|n|:|r|i|g|h|t| @15
--- /dev/null
+|a+8#0000001#e0e0e08@2|.|t|x|t| @1|│+1#0000000#ffffff0| +8#0000001#e0e0e08|a@2|.|t|x|t| @1|b@2|.|t|x|t| | +2#0000000#ffffff0|c@2|.|t|x|t| | +1&&@6|X+8#0000001#e0e0e08
+|b@2|.|t|x|t| @1|│+1#0000000#ffffff0> +0&&@34
+|c+2&&@2|.|t|x|t| @1|│+1&&|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+|"+0#0000000&|c@2|.|t|x|t|"| |[|N|e|w|]| @21|0|,|0|-|1| @2
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]|│+1#0000000#ffffff0| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@11|X+8#0000001#e0e0e08
+|[+2#0000000#ffffff0|N|o| |N|a|m|e|]|│+1&&> +0&&@34
+| +1&&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +0#0000000&@36|0|,|0|-|1| @2
--- /dev/null
+|│+1&#ffffff0| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@20|X+8#0000001#e0e0e08
+|│+1#0000000#ffffff0> +0&&@43
+|│+1&&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|│+1#0000000&|~+0#4040ff13&| @42
+|:+0#0000000&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|c|o|l|u|m|n|s|:|1|,|v|0|,|0|-|1| @8|A|l@1
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]|│+1#0000000#ffffff0| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@11|X+8#0000001#e0e0e08
+|[+2#0000000#ffffff0|N|o| |N|a|m|e|]|│+1&&> +0&&@34
+| +1&&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+| +1#0000000&@8|│|~+0#4040ff13&| @33
+|:+0#0000000&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|c|o|l|u|m|n|s|:|1|0|,|v|e|r|t| @4|0|,|0|-|1| @2
--- /dev/null
+|[+8#0000001#e0e0e08|│+1#0000000#ffffff0| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@19|X+8#0000001#e0e0e08
+|[+2#0000000#ffffff0|│+1&&> +0&&@42
+| +1&&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+| +1#0000000&|│|~+0#4040ff13&| @41
+|:+0#0000000&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|c|o|l|u|m|n|s|:|2|,|v|e|0|,|0|-|1| @8|A|l
--- /dev/null
+| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@12|│|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]
+> +0#0000000#ffffff0@34|│+1&&|[+2&&|N|o| |N|a|m|e|]
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+| +0&&@26|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@21|│
+> +0&&@43|│+1&&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|~+0#4040ff13&| @42|│+1#0000000&
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|a|l|i|g|n|:|r|i|g|h|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@12|│|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]
+> +0#0000000#ffffff0@34|│+1&&|[+2&&|N|o| |N|a|m|e|]
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|~+0#4040ff13&| @33|│+1#0000000&| @8
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|a|l|i|g|n|:|r|i|g|h|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+| +8#0000001#e0e0e08|[|N|o| |N|a|m|e|]| | +2#0000000#ffffff0|[|N|o| |N|a|m|e|]| | +1&&@20|│|[+8#0000001#e0e0e08
+> +0#0000000#ffffff0@42|│+1&&|[+2&&
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|~+0#4040ff13&| @41|│+1#0000000&|
+|:+0&&|s|e|t| |t|a|b|p|a|n|e|l|o|p|t|=|a|l|i|g|n|:|r|i|g|h|0|,|0|-|1| @8|A|l@1|
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| |a+0&#a8a8a8255@2|1| |b@2|1| >c+0#0000000#ffffff0@2|1| |d@2|1| @15
+|++2&&| |[|N|o| |N|a|m|e|a+0&&@2|2| |b@2|2| |c@2|2| |d@2|2| @15
+| +1&&@9|a+0&&@2|3| |b@2|3| |c@2|3| |d@2|3| @15
+| +1&&@9|a+0&&@2|4| |b@2|4| |c@2|4| |d@2|4| @15
+| +1&&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+|-+2#0000000&@1| |V|I|S|U|A|L| |-@1| +0&&@4|1@1| @17|1|,|1@1| @3
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| |a+0#0000000#ffffff0@2|1| |b@2|1| |c@2|1| |d@2|1| @15
+|++2&&| |[|N|o| |N|a|m|e|a+0&&@2|2| |b+0#0000001#a8a8a8255@2|2| |c@2>2+0#0000000#ffffff0| |d@2|2| @15
+| +1&&@9|a+0&&@2|3| |b@2|3| |c@2|3| |d@2|3| @15
+| +1&&@9|a+0&&@2|4| |b@2|4| |c@2|4| |d@2|4| @15
+| +1&&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+|-+2#0000000&@1| |V|I|S|U|A|L| |-@1| +0&&@4|9| @18|2|,|1|4| @3
--- /dev/null
+|[+8#0000001#e0e0e08|N|o| |N|a|m|e|]| |a+0#0000000#ffffff0@2|1| |b@2|1| |c@2|1| |d@2|1| @15
+|++2&&| |[|N|o| |N|a|m|e|a+0&&@2|2| >b@2|2| |c@2|2| |d@2|2| @15
+| +1&&@9|a+0&&@2|3| |b@2|3| |c@2|3| |d@2|3| @15
+| +1&&@9|a+0&&@2|4| |b@2|4| |c@2|4| |d@2|4| @15
+| +1&&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+| +1#0000000&@9|~+0#4040ff13&| @33
+|b+0#0000000&@2|2| |c@2|2| @27|2|,|6| @4
\ 'scrolljump': [[-100, -1, 0, 1, 2, 15], [-101, 999]],
\ 'scrolloff': [[0, 1, 8, 999], [-1]],
\ 'shiftwidth': [[0, 1, 8, 999], [-1]],
+ \ 'showtabpanel': [[0, 1, 2], []],
\ 'sidescroll': [[0, 1, 8, 999], [-1]],
\ 'sidescrolloff': [[0, 1, 8, 999], [-1]],
\ 'tabstop': [[1, 4, 8, 12, 9999], [-1, 0, 10000]],
\ ['xxx']],
\ 'tabclose': [['', 'left', 'uselast', 'left,uselast'], ['xxx']],
\ 'tabline': [['', 'xxx'], ['%$', '%{', '%{%', '%{%}', '%(', '%)']],
+ \ 'tabpanel': [['', 'aaa', 'bbb'], []],
+ \ 'tabpanelopt': [['', 'align:left', 'align:right', 'vert', 'columns:0',
+ \ 'columns:20', 'columns:999'],
+ \ ['xxx', 'align:', 'align:middle', 'colomns:', 'cols:10',
+ \ 'cols:-1']],
\ 'tagcase': [['followic', 'followscs', 'ignore', 'match', 'smart'],
\ ['', 'xxx', 'smart,match']],
\ 'termencoding': [has('gui_gtk') ? [] : ['', 'utf-8'], ['xxx']],
\ 'verbosefile': [[], ['call delete("Xfile")']],
\}
-const invalid_options = test_values->keys()
+let invalid_options = test_values->keys()
\->filter({-> v:val !~# '^other' && !exists($"&{v:val}")})
+for s:skip_option in [
+ \ [!has('tabpanel'), 'tabpanel'],
+ \ [!has('tabpanel'), 'tabpanelopt'],
+ \ [!has('tabpanel'), 'showtabpanel'],
+ \ ]
+ if s:skip_option[0]
+ call remove(invalid_options, s:skip_option[1])
+ endif
+endfor
if !empty(invalid_options)
throw $"Invalid option name in test_values: '{invalid_options->join("', '")}'"
endif
let [pre_processing, post_processing] = get(test_prepost, fullname, [[], []])
let script += pre_processing
+ " Setting an option can only fail when it's implemented.
+ call add(script, $"if exists('+{fullname}')")
if line =~ 'P_BOOL'
for opt in [fullname, shortname]
for cmd in ['set', 'setlocal', 'setglobal']
endfor
" Failure tests
- " Setting an option can only fail when it's implemented.
- call add(script, $"if exists('+{fullname}')")
for opt in [fullname, shortname]
for cmd in ['set', 'setlocal', 'setglobal']
for val in invalid_values
endfor
endfor
endfor
- call add(script, "endif")
endif
" Cannot change 'termencoding' in GTK
call add(script, 'endif')
endif
+ call add(script, "endif")
+
let script += post_processing
call add(script, 'endfunc')
endwhile
set wildoptions&
endfunc
+func Test_redrawtabpanel_error()
+ CheckNotFeature tabpanel
+ call assert_fails(':redrawtabpanel', 'E1547:')
+endfunc
+
" vim: shiftwidth=2 sts=2 expandtab
--- /dev/null
+" Tests for tabpanel
+
+source check.vim
+source screendump.vim
+CheckFeature tabpanel
+
+function! s:reset()
+ set tabpanel&
+ set tabpanelopt&
+ set showtabpanel&
+endfunc
+
+function! Test_tabpanel_mouse()
+ let save_showtabline = &showtabline
+ let save_mouse = &mouse
+ set showtabline=0 mouse=a
+
+ tabnew
+ tabnew
+
+ call test_setmouse(1, 1)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal(3, tabpagenr())
+
+ set showtabpanel=2 tabpanelopt=columns:10
+
+ call test_setmouse(1, 1)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal(1, tabpagenr())
+ call test_setmouse(2, 1)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal(2, tabpagenr())
+ call test_setmouse(3, 1)
+ call feedkeys("\<LeftMouse>", 'xt')
+ call assert_equal(3, tabpagenr())
+
+ call feedkeys("\<LeftMouse>", 'xt')
+ call test_setmouse(2, 3)
+ let pos = getmousepos()
+ call assert_equal(2, pos['winrow'])
+ call assert_equal(0, pos['wincol'])
+ call assert_equal(2, pos['screenrow'])
+ call assert_equal(3, pos['screencol'])
+
+ call test_setmouse(1, 11)
+ call feedkeys("\<LeftMouse>", 'xt')
+ let pos = getmousepos()
+ call assert_equal(1, pos['winrow'])
+ call assert_equal(1, pos['wincol'])
+ call assert_equal(1, pos['screenrow'])
+ call assert_equal(11, pos['screencol'])
+
+ new
+ wincmd x
+
+ call test_setmouse(10, 11)
+ call feedkeys("\<LeftMouse>", 'xt')
+ let pos = getmousepos()
+ call assert_equal(10, pos['winrow'])
+ call assert_equal(1, pos['wincol'])
+ call assert_equal(10, pos['screenrow'])
+ call assert_equal(11, pos['screencol'])
+
+ tabonly!
+ call s:reset()
+ let &mouse = save_mouse
+ let &showtabline = save_showtabline
+endfunc
+
+function! Test_tabpanel_drawing()
+ CheckScreendump
+
+ let lines =<< trim END
+ function! MyTabPanel()
+ let n = g:actual_curtabpage
+ let hi = n == tabpagenr() ? 'TabLineSel' : 'TabLine'
+ let label = printf("\n%%#%sTabNumber#%d:%%#%s#", hi, n, hi)
+ let label ..= '%1*%f%*'
+ return label
+ endfunction
+ hi User1 ctermfg=12
+
+ set showtabline=0
+ set showtabpanel=0
+ set tabpanelopt=columns:16
+ set tabpanel=
+ silent edit Xtabpanel1
+
+ nnoremap \01 <Cmd>set showtabpanel=2<CR>
+ nnoremap \02 <C-w>v
+ nnoremap \03 <Cmd>call setline(1, ['a', 'b', 'c'])<CR>
+ nnoremap \04 <Cmd>silent tabnew Xtabpanel2<CR><Cmd>call setline(1, ['d', 'e', 'f'])<CR>
+ nnoremap \05 <Cmd>set tabpanel=%!MyTabPanel()<CR>
+ nnoremap \06 <Cmd>set tabpanelopt+=align:right<CR>
+ nnoremap \07 <Cmd>tab terminal NONE<CR><C-w>N
+ nnoremap \08 <Cmd>tabclose!<CR><Cmd>tabclose!<CR>
+ END
+ call writefile(lines, 'XTest_tabpanel', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel', {'rows': 6, 'cols': 45})
+
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_00', {})
+
+ for i in range(1, 8)
+ let n = printf('%02d', i)
+ call term_sendkeys(buf, '\' .. n)
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_' .. n, {})
+ endfor
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_drawing_with_popupwin()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:20
+ set showtabline=0
+ tabnew
+ setlocal buftype=nofile
+ call setbufline(bufnr(), 1, repeat([repeat('.', &columns - 20)], &lines))
+ highlight TestingForTabPanelPopupwin guibg=#7777ff guifg=#000000
+ for line in [1, &lines]
+ for col in [1, &columns - 20 - 2]
+ call popup_create([
+ \ '@',
+ \ ], {
+ \ 'line': line,
+ \ 'col': col,
+ \ 'border': [],
+ \ 'highlight': 'TestingForTabPanelPopupwin',
+ \ })
+ endfor
+ endfor
+ call cursor(4, 10)
+ call popup_atcursor('atcursor', {
+ \ 'highlight': 'TestingForTabPanelPopupwin',
+ \ })
+ END
+ call writefile(lines, 'XTest_tabpanel_with_popupwin', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_with_popupwin', {'rows': 10, 'cols': 45})
+
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_with_popupwin_0', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_drawing_fill_tailing()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:20
+ set showtabline=0
+ e aaa.txt
+ tabnew
+ e bbb.txt
+ let &tabpanel = "abc"
+ redraw!
+ " Check whether "abc" is cleared
+ let &tabpanel = "\nTOP\n%f\nBOTTOM"
+ END
+ call writefile(lines, 'XTest_tabpanel_fill_tailing', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_fill_tailing', {'rows': 10, 'cols': 45})
+
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_fill_tailing_0', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_drawing_pum()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:20
+ set showtabline=0
+ e aaa.txt
+ tabnew
+ e bbb.txt
+ END
+ call writefile(lines, 'XTest_tabpanel_pum', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_pum', {'rows': 10, 'cols': 45})
+
+ call term_sendkeys(buf, "i\<C-x>\<C-v>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_pum_0', {})
+
+ call term_sendkeys(buf, "\<cr> ab\<C-x>\<C-v>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_pum_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_scrolling()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:20
+ set showtabline=0
+ set nowrap
+ set number
+ e aaa.txt
+ tabnew
+ e bbb.txt
+ vsplit
+ call setbufline(bufnr(), 1, repeat(['text text text text'], 100))
+ wincmd =
+ END
+ call writefile(lines, 'XTest_tabpanel_scrolling', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_scrolling', {'rows': 10, 'cols': 45})
+ let n = 0
+ for c in ['H', 'J', 'K', 'L']
+ call term_sendkeys(buf, ":wincmd " .. c .. "\<cr>")
+ call term_sendkeys(buf, "\<C-d>\<C-d>")
+ call term_sendkeys(buf, "r@")
+ call VerifyScreenDump(buf, 'Test_tabpanel_drawing_scrolling_' .. n, {})
+ let n += 1
+ endfor
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_many_tabpages()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10
+ set showtabline=0
+ set tabpanel=%{g:actual_curtabpage}:tab
+ execute join(repeat(['tabnew'], 20), ' | ')
+ END
+ call writefile(lines, 'XTest_tabpanel_many_tabpages', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_many_tabpages', {'rows': 10, 'cols': 45})
+ for n in range(0, 3)
+ call term_sendkeys(buf, "gt")
+ call VerifyScreenDump(buf, 'Test_tabpanel_many_tabpages_' .. n, {})
+ endfor
+ call term_sendkeys(buf, ":tabnext +10\<cr>")
+ call term_sendkeys(buf, ":tabnext -3\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_many_tabpages_4', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_visual()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10
+ set showtabline=0
+ tabnew
+ call setbufline(bufnr(), 1, ['aaa1 bbb1 ccc1 ddd1', 'aaa2 bbb2 ccc2 ddd2', 'aaa3 bbb3 ccc3 ddd3', 'aaa4 bbb4 ccc4 ddd4'])
+ END
+ call writefile(lines, 'XTest_tabpanel_visual', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_visual', {'rows': 10, 'cols': 45})
+ call term_sendkeys(buf, "v2w")
+ call VerifyScreenDump(buf, 'Test_tabpanel_visual_0', {})
+ call term_sendkeys(buf, "\<esc>0jw")
+ call term_sendkeys(buf, "v2wge")
+ call VerifyScreenDump(buf, 'Test_tabpanel_visual_1', {})
+ call term_sendkeys(buf, "y:echo @\"\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_visual_2', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_commandline()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10
+ set showtabline=0
+ tabnew
+ END
+ call writefile(lines, 'XTest_tabpanel_commandline', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_commandline', {'rows': 10, 'cols': 45})
+ call term_sendkeys(buf, ":ab\<tab>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_commandline_0', {})
+
+ call term_sendkeys(buf, "\<esc>")
+ call term_sendkeys(buf, ":set wildoptions=pum\<cr>")
+ call term_sendkeys(buf, ":ab\<tab>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_commandline_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_tabline_and_tabpanel()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10,vert
+ set fillchars=tpl_vert:│
+ set showtabline=2
+ e aaa.txt
+ tabnew
+ e bbb.txt
+ tabnew
+ e ccc.txt
+ END
+ call writefile(lines, 'XTest_tabpanel_tabline_and_tabpanel', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_tabline_and_tabpanel', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_tabline_and_tabpanel_0', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_dont_overflow_into_tabpanel()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10
+ set showtabline=2
+ tabnew
+ call setline(1, repeat('x', 100))
+ set wrap
+ END
+ call writefile(lines, 'XTest_tabpanel_dont_overflow_into_tabpanel', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_dont_overflow_into_tabpanel', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_dont_overflow_into_tabpanel_0', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_dont_vert_is_multibytes_left()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=columns:10,vert
+ set fillchars=tpl_vert:│
+ set showtabline=2
+ tabnew
+ END
+ call writefile(lines, 'XTest_tabpanel_vert_is_multibyte_lefts', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_vert_is_multibyte_lefts', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_0', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=columns:1,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_1', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=columns:10,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_2', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=columns:2,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_left_3', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_dont_vert_is_multibytes_right()
+ CheckScreendump
+
+ let lines =<< trim END
+ set showtabpanel=2
+ set tabpanelopt=align:right,columns:10,vert
+ set fillchars=tpl_vert:│
+ set showtabline=2
+ tabnew
+ END
+ call writefile(lines, 'XTest_tabpanel_vert_is_multibytes_right', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_vert_is_multibytes_right', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_0', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=align:right,columns:1,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_1', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=align:right,columns:10,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_2', {})
+
+ call term_sendkeys(buf, ":set tabpanelopt=align:right,columns:2,vert\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_vert_is_multibytes_right_3', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_eval_tabpanel_statusline_tabline()
+ CheckScreendump
+
+ let lines =<< trim END
+ function! Expr()
+ return "$%=[%f]%=$"
+ endfunction
+ set laststatus=2
+ set showtabline=2
+ set showtabpanel=2
+ set statusline=%!Expr()
+ set tabline=%!Expr()
+ set tabpanel=%!Expr()
+ set tabpanelopt=columns:10,vert
+ set fillchars=tpl_vert:│
+ e aaa
+ tabnew
+ e bbb
+ tabnew
+ e ccc
+ END
+ call writefile(lines, 'XTest_tabpanel_eval_tabpanel_statusline_tabline', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_eval_tabpanel_statusline_tabline', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_eval_tabpanel_statusline_tabline_0', {})
+ call term_sendkeys(buf, ":set tabpanelopt+=align:right\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_eval_tabpanel_statusline_tabline_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_noeval_tabpanel_statusline_tabline()
+ CheckScreendump
+
+ let lines =<< trim END
+ set laststatus=2
+ set showtabline=2
+ set showtabpanel=2
+ set statusline=$%=[%f]%=$
+ set tabline=$%=[%f]%=$
+ set tabpanel=$%=[%f]%=$
+ set tabpanelopt=columns:10,vert
+ set fillchars=tpl_vert:│
+ e aaa
+ tabnew
+ e bbb
+ tabnew
+ e ccc
+ END
+ call writefile(lines, 'XTest_tabpanel_noeval_tabpanel_statusline_tabline', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_noeval_tabpanel_statusline_tabline', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_noeval_tabpanel_statusline_tabline_0', {})
+ call term_sendkeys(buf, ":set tabpanelopt+=align:right\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_noeval_tabpanel_statusline_tabline_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+function! Test_tabpanel_eval_tabpanel_with_linebreaks()
+ CheckScreendump
+
+ let lines =<< trim END
+ function! Expr()
+ return "top\n$%=[%f]%=$\nbottom"
+ endfunction
+ set showtabpanel=2
+ set tabpanel=%!Expr()
+ set tabpanelopt=columns:10
+ e aaa
+ tabnew
+ e bbb
+ tabnew
+ e ccc
+ END
+ call writefile(lines, 'XTest_tabpanel_eval_tabpanel_with_linebreaks', 'D')
+
+ let buf = RunVimInTerminal('-S XTest_tabpanel_eval_tabpanel_with_linebreaks', {'rows': 10, 'cols': 45})
+ call VerifyScreenDump(buf, 'Test_tabpanel_eval_tabpanel_with_linebreaks_0', {})
+ call term_sendkeys(buf, ":set tabpanelopt+=align:right\<cr>")
+ call VerifyScreenDump(buf, 'Test_tabpanel_eval_tabpanel_with_linebreaks_1', {})
+
+ call StopVimInTerminal(buf)
+endfunc
+
+" vim: shiftwidth=2 sts=2 expandtab
// only interesting on Unix systems
#if defined(USE_SYSTEM) && defined(UNIX)
"+system()",
+#endif
+#if defined(FEAT_TABPANEL)
+ "+tabpanel",
+#else
+ "-tabpanel",
#endif
"+tag_binary",
"-tag_old_static",
// start displaying the message lines after half of the blank lines
row = blanklines / 2;
- if ((row >= 2 && Columns >= 50) || colon)
+ if ((row >= 2 && COLUMNS_WITHOUT_TPL() >= 50) || colon)
{
for (i = 0; i < (int)ARRAY_LENGTH(lines); ++i)
{
}
col += (int)STRLEN(vers);
}
- col = (Columns - col) / 2;
+ col = (COLUMNS_WITHOUT_TPL() - col) / 2;
if (col < 0)
col = 0;
else
clen += byte2cells(p[l]);
}
- screen_puts_len(p, l, row, col, *p == '<' ? HL_ATTR(HLF_8) : attr);
+ screen_puts_len(p, l, row, col + TPL_LCOL(NULL),
+ *p == '<' ? HL_ATTR(HLF_8) : attr);
col += clen;
}
// Add the version number to the version line.
if (add_version)
- screen_puts(vers, row, col, 0);
+ screen_puts(vers, row, col + TPL_LCOL(NULL), 0);
}
/*
ex_intro(exarg_T *eap UNUSED)
{
screenclear();
+#if defined(FEAT_TABPANEL)
+ draw_tabpanel();
+#endif
intro_message(TRUE);
wait_return(TRUE);
}
#define FINDFILE_DIR 1 // only directories
#define FINDFILE_BOTH 2 // files and directories
+#if defined(FEAT_TABPANEL)
+# define COLUMNS_WITHOUT_TPL() (Columns - tabpanel_width())
+# define TPL_LCOL(W) tabpanel_leftcol(W)
+#else
+# define COLUMNS_WITHOUT_TPL() Columns
+# define TPL_LCOL(W) 0
+#endif
+
#define W_ENDCOL(wp) ((wp)->w_wincol + (wp)->w_width)
#ifdef FEAT_MENU
# define W_WINROW(wp) ((wp)->w_winrow + (wp)->w_winbar_height)
, HLF_ST // status lines of terminal windows
, HLF_STNC // status lines of not-current terminal windows
, HLF_MSG // message area
+ , HLF_TPL // tabpanel
+ , HLF_TPLS // tabpanel selected
+ , HLF_TPLF // tabpanel filler
, HLF_COUNT // MUST be the last one
} hlf_T;
'B', 'P', 'R', 'L', \
'+', '=', 'k', '<','[', ']', '{', '}', 'x', 'X', \
'*', '#', '_', '!', '.', 'o', 'q', \
- 'z', 'Z', 'g'}
+ 'z', 'Z', 'g', \
+ '%', '^', '&' }
/*
* Values for behaviour in spell_move_to
#define IN_STATUS_LINE 2 // on status or command line
#define IN_SEP_LINE 4 // on vertical separator line
#define IN_OTHER_WIN 8 // in other window but can't go there
+#define IN_TABPANEL 16 // in tabpanel
#define CURSOR_MOVED 0x100
#define MOUSE_FOLD_CLOSE 0x200 // clicked on '-' in fold column
#define MOUSE_FOLD_OPEN 0x400 // clicked on '+' in fold column
if (flags & (WSP_TOP | WSP_BOT))
{
wp->w_wincol = 0;
- win_new_width(wp, Columns);
+ win_new_width(wp, COLUMNS_WITHOUT_TPL());
wp->w_vsep_width = 0;
}
else
dir = *p_ead;
win_equal_rec(next_curwin == NULL ? curwin : next_curwin, current,
topframe, dir, 0, tabline_height(),
- (int)Columns, topframe->fr_height);
+ (int)COLUMNS_WITHOUT_TPL(), topframe->fr_height);
if (!is_aucmd_win(next_curwin))
win_fix_scroll(TRUE);
}
// frame.
n = frame_minwidth(topfr, NOWIN);
// add one for the rightmost window, it doesn't have a separator
- if (col + width == Columns)
+ if (col + width == COLUMNS_WITHOUT_TPL())
extra_sep = 1;
else
extra_sep = 0;
apply_autocmds(EVENT_TABENTER, NULL, NULL, FALSE, curbuf);
if (old_curbuf != curbuf)
apply_autocmds(EVENT_BUFENTER, NULL, NULL, FALSE, curbuf);
+#if defined(FEAT_TABPANEL)
+ if (p_stpl > 0)
+ shell_new_columns();
+#endif
return TRUE;
}
if (curwin->w_frame == NULL)
return FAIL;
topframe = curwin->w_frame;
- topframe->fr_width = Columns;
+ topframe->fr_width = COLUMNS_WITHOUT_TPL();
topframe->fr_height = Rows - p_ch;
return OK;
firstwin->w_height = ROWS_AVAIL;
firstwin->w_prev_height = ROWS_AVAIL;
topframe->fr_height = ROWS_AVAIL;
- firstwin->w_width = Columns;
- topframe->fr_width = Columns;
+ firstwin->w_width = COLUMNS_WITHOUT_TPL();
+ topframe->fr_width = COLUMNS_WITHOUT_TPL();
}
/*
tp->tp_lastwin = lastwin;
tp->tp_old_Rows = Rows;
if (tp->tp_old_Columns != -1)
- tp->tp_old_Columns = Columns;
+ tp->tp_old_Columns = COLUMNS_WITHOUT_TPL();
firstwin = NULL;
lastwin = NULL;
return OK;
#endif
))
shell_new_rows();
- if (curtab->tp_old_Columns != Columns)
+ if (curtab->tp_old_Columns != COLUMNS_WITHOUT_TPL())
{
if (starting == 0)
{
shell_new_columns(); // update window widths
- curtab->tp_old_Columns = Columns;
+ curtab->tp_old_Columns = COLUMNS_WITHOUT_TPL();
}
else
curtab->tp_old_Columns = -1; // update window widths later
// Need to redraw the tabline. Tab page contents doesn't change.
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
}
redraw_mode = TRUE;
#endif
redraw_tabline = TRUE;
+#if defined(FEAT_TABPANEL)
+ redraw_tabpanel = TRUE;
+#endif
if (restart_edit)
redraw_later(UPD_VALID); // causes status line redraw
if (!hidden)
win_append(after, new_wp);
new_wp->w_wincol = 0;
- new_wp->w_width = Columns;
+ new_wp->w_width = COLUMNS_WITHOUT_TPL();
// position the display and the cursor at the top of the file.
new_wp->w_topline = 1;
// First try setting the widths of windows with 'winfixwidth'. If that
// doesn't result in the right width, forget about that option.
- frame_new_width(topframe, (int)Columns, FALSE, TRUE);
- if (!frame_check_width(topframe, Columns))
- frame_new_width(topframe, (int)Columns, FALSE, FALSE);
+ frame_new_width(topframe, COLUMNS_WITHOUT_TPL(), FALSE, TRUE);
+ if (!frame_check_width(topframe, COLUMNS_WITHOUT_TPL()))
+ frame_new_width(topframe, COLUMNS_WITHOUT_TPL(), FALSE, FALSE);
(void)win_comp_pos(); // recompute w_winrow and w_wincol
#if 0
if (frp != curfrp)
room -= frame_minheight(frp, NULL);
}
- if (curfrp->fr_width != Columns)
+ if (curfrp->fr_width != COLUMNS_WITHOUT_TPL())
room_cmdline = 0;
else
{
if (height <= room + room_cmdline)
break;
- if (run == 2 || curfrp->fr_width == Columns)
+ if (run == 2 || curfrp->fr_width == COLUMNS_WITHOUT_TPL())
{
height = room + room_cmdline;
break;
// Find bottom frame with width of screen.
frame_T *frp = lastwin->w_frame;
- while (frp->fr_width != Columns && frp->fr_parent != NULL)
+ while (frp->fr_width != COLUMNS_WITHOUT_TPL() && frp->fr_parent != NULL)
frp = frp->fr_parent;
// Avoid changing the height of a window with 'winfixheight' set.
projects / thirdparty / vim.git / commitdiff
