mirror of
https://github.com/vim/vim.git
synced 2026-05-28 00:21:37 +02:00
patch 9.2.0382: Wayland: focus-stealing is non-working
Problem: Wayland: focus-stealing is non-working
Solution: Remove it, the feature could be re-implemented using
clipboard-providers feature, see :h wayland-primary-selection
(Foxe Chen).
closes: #19984
Signed-off-by: Foxe Chen <chen.foxe@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
This commit is contained in:
Foxe Chen
committed by
Christian Brabandt
Christian Brabandt
parent
ec3f79e037
commit
d0b6ee320b
@@ -1,4 +1,4 @@
|
||||
*builtin.txt* For Vim version 9.2. Last change: 2026 Apr 14
|
||||
*builtin.txt* For Vim version 9.2. Last change: 2026 Apr 20
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -13354,8 +13354,6 @@ vtp Compiled for vcon support |+vtp| (check vcon to find
|
||||
out if it works in the current console).
|
||||
wayland Compiled with Wayland protocol support.
|
||||
wayland_clipboard Compiled with support for Wayland clipboard.
|
||||
wayland_focus_steal Compiled with support for Wayland clipboard focus
|
||||
stealing.
|
||||
wildignore Compiled with 'wildignore' option.
|
||||
wildmenu Compiled with 'wildmenu' option.
|
||||
win16 old version for MS-Windows 3.1 (always false)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*options.txt* For Vim version 9.2. Last change: 2026 Apr 17
|
||||
*options.txt* For Vim version 9.2. Last change: 2026 Apr 20
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -10669,11 +10669,10 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
*'wlsteal'* *'wst'* *'nowlsteal'* *'nowst'*
|
||||
'wlsteal' 'wst' boolean (default off)
|
||||
global
|
||||
{only when the |+wayland_focus_steal| feature is
|
||||
included}
|
||||
DEPRECATED: This option is no longer used; changing it has no effect.
|
||||
|
||||
When enabled, then allow Vim to steal focus by creating a temporary
|
||||
surface, in order to access the clipboard. For more information see
|
||||
|wayland-focus-steal|.
|
||||
surface, in order to access the clipboard.
|
||||
|
||||
*'wltimeoutlen'* *'wtm'*
|
||||
'wltimeoutlen' 'wtm' number (default 500)
|
||||
@@ -10686,9 +10685,6 @@ A jump table for the options with a short description can be found at |Q_op|.
|
||||
some cases. On the other hand, it may also mean you receive errors
|
||||
when the compositor takes more time to respond than usual.
|
||||
|
||||
Additionally, this option is also used as the maximum timeout when
|
||||
waiting for a surface to gain focus, see |wayland-focus-steal|.
|
||||
|
||||
*'wrap'* *'nowrap'*
|
||||
'wrap' boolean (default on)
|
||||
local to window
|
||||
|
||||
@@ -1562,7 +1562,6 @@ $quote eval.txt /*$quote*
|
||||
+vtp various.txt /*+vtp*
|
||||
+wayland various.txt /*+wayland*
|
||||
+wayland_clipboard various.txt /*+wayland_clipboard*
|
||||
+wayland_focus_steal various.txt /*+wayland_focus_steal*
|
||||
+wildignore various.txt /*+wildignore*
|
||||
+wildmenu various.txt /*+wildmenu*
|
||||
+windows various.txt /*+windows*
|
||||
@@ -11805,8 +11804,6 @@ waittime channel.txt /*waittime*
|
||||
warningmsg-variable eval.txt /*warningmsg-variable*
|
||||
wayland wayland.txt /*wayland*
|
||||
wayland-and-x11 wayland.txt /*wayland-and-x11*
|
||||
wayland-focus-steal wayland.txt /*wayland-focus-steal*
|
||||
wayland-gnome wayland.txt /*wayland-gnome*
|
||||
wayland-gui wayland.txt /*wayland-gui*
|
||||
wayland-persist wayland.txt /*wayland-persist*
|
||||
wayland-primary-selection wayland.txt /*wayland-primary-selection*
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*various.txt* For Vim version 9.2. Last change: 2026 Apr 06
|
||||
*various.txt* For Vim version 9.2. Last change: 2026 Apr 20
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -529,9 +529,6 @@ T *+vreplace* |gR| and |gr|
|
||||
*+vtp* on MS-Windows console: support for 'termguicolors'
|
||||
N *+wayland* Unix only: support for the Wayland protocol.
|
||||
N *+wayland_clipboard* Unix only: support for Wayland selections/clipboard.
|
||||
N *+wayland_focus_steal*
|
||||
Unix only: support for Wayland clipboard on
|
||||
compositors without a data control protocol
|
||||
T *+wildignore* 'wildignore' Always enabled since 9.0.0278
|
||||
T *+wildmenu* 'wildmenu' Always enabled since 9.0.0279
|
||||
T *+windows* more than one window; Always enabled since 8.0.1118.
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
*version9.txt* For Vim version 9.2. Last change: 2026 Apr 16
|
||||
*version9.txt* For Vim version 9.2. Last change: 2026 Apr 20
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -41954,7 +41954,7 @@ Vim Arguments: ~
|
||||
|
||||
Configure Switches: ~
|
||||
--with-wayland Enable the |wayland| feature.
|
||||
--enable-wayland-focus-steal Enable the |wayland-focus-steal| feature.
|
||||
--enable-wayland-focus-steal Enable the wayland-focus-steal feature.
|
||||
--enable-socketserver Enable the |socketserver-clientserver|
|
||||
feature.
|
||||
|
||||
@@ -52636,6 +52636,9 @@ Changed ~
|
||||
are moved to the resulting joined line instead of being dropped.
|
||||
- Only a few whitelisted options are allowed to be set by a modeline to
|
||||
improve overall security, see for details: 'modelinestrict'
|
||||
- Removed the Wayland focus steal feature 'wlsteal', since it causes too many
|
||||
issues and can now be re-implemted using the |clipboard-providers| feature
|
||||
if needed, see |wayland-primary-selection| for an example.
|
||||
|
||||
*added-9.3*
|
||||
Added ~
|
||||
|
||||
+57
-34
@@ -1,4 +1,4 @@
|
||||
*wayland.txt* For Vim version 9.2. Last change: 2026 Feb 14
|
||||
*wayland.txt* For Vim version 9.2. Last change: 2026 Apr 20
|
||||
|
||||
|
||||
VIM REFERENCE MANUAL by Bram Moolenaar
|
||||
@@ -54,15 +54,12 @@ try connecting again.
|
||||
2. Wayland Selections *wayland-selections*
|
||||
|
||||
Vim supports the wlr-data-control-unstable-v1 and ext-data-control-v1
|
||||
protocols, for accessing the current Wayland selection. These are the best
|
||||
case scenario protocols, see |wayland-focus-steal|. Selection in this case
|
||||
protocols, for accessing the current Wayland selection. Selection in this case
|
||||
essentially means the "clipboard." You can check if your Wayland compositor
|
||||
supports either of these protocols by running the wayland-info command, which
|
||||
should be bundled with libwayland on your system: >
|
||||
wayland-info | grep -E '(ext_data_control|zwlr_data_control)'
|
||||
<If grep finds a match, then you have either or both protocols on your system.
|
||||
If you don't get any match, then please see |wayland-focus-steal| for more
|
||||
information.
|
||||
|
||||
Some compositors that are known to support either or both protocols:
|
||||
1. KWin (KDE)
|
||||
@@ -90,39 +87,65 @@ Vim determines which one to use when accessing the clipboard using the
|
||||
|
||||
*wayland-primary-selection*
|
||||
If you find X11 style primary selections useful, Wayland also implements this
|
||||
behaviour in its own protocols:
|
||||
feature using the protocols that Vim supports. This is unless you are using
|
||||
version 1 (not the same as the 'v1' in the protocol name), of the
|
||||
wlr-data-control protocol, then primary selection will not be supported. You
|
||||
can check this using >
|
||||
wayland-info | grep -E '(ext_data_control|zwlr_data_control)'
|
||||
If the "version:" entry for "zwlr_data_control_manager_v1" is "2" or greater,
|
||||
then primary selection is supported. If you also get
|
||||
"ext_data_control_manager_v1", then Vim will use that protocol instead, which
|
||||
has primary selection support builtin into it.
|
||||
|
||||
- The primary selection protocol is the most widely supported, but requires
|
||||
focus in order to be used, see |wayland-focus-steal|.
|
||||
If your Wayland compositor does not support the wlr-data-control-v1 or the
|
||||
ext-data-control-v1 protocol, Vim cannot access the clipboard directly through
|
||||
the Wayland protocol. External tools such as wl-clipboard can be used instead
|
||||
via a user-defined |clipboard-providers|.
|
||||
|
||||
- Data control protocol available on your system, such as the ext or wlr
|
||||
protocols, then primary selection is also supported. This is unless you are
|
||||
using version 1 (not the same as the 'v1' in the protocol name), of the
|
||||
wlr-data-control protocol. Then the primary selection protocol will be used
|
||||
as a fallback.
|
||||
Example: define a provider that shells out to `wl-copy` and `wl-paste`: >vim9
|
||||
|
||||
*wayland-focus-steal* *wayland-gnome*
|
||||
If you are using the GNOME desktop environment on Wayland, as of this writing,
|
||||
there is no method of accessing/modifying the clipboard for external clients
|
||||
such as Vim without being focused. Focused in this case means the client has
|
||||
received some sort of input event, such as a window being focused. This is
|
||||
what the wlr-data-control-unstable-v1 and ext-data-control-v1 protocols solve.
|
||||
If your Wayland compositor does not support the above protocols, then the
|
||||
above explanation applies.
|
||||
vim9script
|
||||
|
||||
To solve this problem, Vim implements a way of gaining focus in order to
|
||||
access the clipboard, by creating a temporary transparent top-level surface.
|
||||
This is by default disabled and can be enabled via the 'wlsteal' option.
|
||||
Moreover, a seat that has a keyboard is also required, see 'wlseat', and the
|
||||
xdg-shell protocol must be available. Additionally, Vim must be compiled with
|
||||
the |+wayland_focus_steal| feature.
|
||||
def Available(): bool
|
||||
return executable('wl-copy') && executable('wl-paste')
|
||||
enddef
|
||||
|
||||
Note that this method can have several side effects from the result of focus
|
||||
stealing. For example, if you have a taskbar that shows currently opened apps
|
||||
in your desktop environment, then when Vim attempts to steal focus, it may
|
||||
"flicker," as if a window was opened then immediately closed after.
|
||||
Additionally, if you are in fullscreen mode, this focus stealing won't work,
|
||||
because the created surface won't ever gain focus. If this happens, Vim will
|
||||
seem to freeze temporarily, see 'wltimeoutlen' for more information.
|
||||
def Copy(reg: string, type: string, str: list<string>)
|
||||
var args = "wl-copy"
|
||||
|
||||
if reg == "*"
|
||||
args ..= " -p"
|
||||
endif
|
||||
|
||||
system(args, str)
|
||||
enddef
|
||||
|
||||
def Paste(reg: string): tuple<string, list<string>>
|
||||
var args = "wl-paste --type text/plain;charset=utf-8"
|
||||
|
||||
if reg == "*"
|
||||
args ..= " -p"
|
||||
endif
|
||||
|
||||
return ("", systemlist(args))
|
||||
enddef
|
||||
|
||||
v:clipproviders["wl_clipboard"] = {
|
||||
available: Available,
|
||||
copy: {
|
||||
"+": Copy,
|
||||
"*": Copy
|
||||
},
|
||||
paste: {
|
||||
"+": Paste,
|
||||
"*": Paste
|
||||
}
|
||||
}
|
||||
|
||||
set clipmethod=wl_clipboard
|
||||
|
||||
|
||||
This relies on the wl-clipboard package being installed
|
||||
(https://github.com/bugaevc/wl-clipboard).
|
||||
|
||||
vim:tw=78:ts=8:noet:ft=help:norl
|
||||
|
||||
@@ -835,10 +835,6 @@ if has('wayland')
|
||||
call <SID>AddOption("wlseat", gettext("Wayland seat to use"))
|
||||
call <SID>OptionG("wse", &wse)
|
||||
endif
|
||||
if has("wayland_focus_steal")
|
||||
call <SID>AddOption("wlsteal", gettext("Enable wayland focus stealing functionality in order to access the clipboard"))
|
||||
call <SID>BinOptionG("wst", &wst)
|
||||
endif
|
||||
call <SID>AddOption("keymodel", gettext("\"startsel\" and/or \"stopsel\"; what special keys can do"))
|
||||
call <SID>OptionG("km", &km)
|
||||
|
||||
|
||||
@@ -72,21 +72,21 @@ syn keyword vimOption contained mmd maxmapdepth mm maxmem mmp maxmempattern mmt
|
||||
syn keyword vimOption contained pmbfn printmbfont popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pumopt pw pumwidth 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 sop scrolloffpad 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 skipwhite nextgroup=vimSetEqual,vimSetMod
|
||||
syn keyword vimOption contained shm shortmess sn shortname sbr showbreak sc showcmd sloc showcmdloc sft showfulltag sm showmatch smd showmode 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 stlo statuslineopt 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 skipwhite nextgroup=vimSetEqual,vimSetMod
|
||||
syn keyword vimOption contained tgc termguicolors trz termresize tsy termsync 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 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 skipwhite nextgroup=vimSetEqual,vimSetMod
|
||||
syn keyword vimOption contained wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes skipwhite nextgroup=vimSetEqual,vimSetMod
|
||||
syn keyword vimOption contained wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany 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 vimOption contained noari noallowrevins noarab noarabic noarshape noarabicshape noacd noautochdir noac noautocomplete noai noautoindent noar noautoread noasd noautoshelldir noaw noautowrite noawa noautowriteall nobk nobackup nobeval noballooneval nobevalterm noballoonevalterm nobin nobinary nobomb nobri nobreakindent nobl nobuflisted nocdh nocdhome nocin nocindent nocp nocompatible nocf noconfirm noci nocopyindent nocsre nocscoperelative nocst nocscopetag nocsverb nocscopeverbose nocrb nocursorbind nocuc nocursorcolumn nocul nocursorline nodeco nodelcombine nodiff nodg nodigraph noed noedcompatible noemo noemoji noeof noendoffile noeol noendofline noea noequalalways noeb noerrorbells noek noesckeys noet noexpandtab noex noexrc nofic nofileignorecase
|
||||
syn keyword vimOption contained nofixeol nofixendofline nofen nofoldenable nofs nofsync nogd nogdefault noguipty nohid nohidden nohk nohkmap nohkp nohkmapp nohls nohlsearch noicon noic noignorecase noimc noimcmdline noimd noimdisable nois noincsearch noinf noinfercase noim noinsertmode nojs nojoinspaces nolnr nolangnoremap nolrm nolangremap nolz nolazyredraw nolbr nolinebreak nolisp nolist nolpl noloadplugins nomagic noml nomodeline nomle nomodelineexpr nomlst nomodelinestrict noma nomodifiable nomod nomodified nomore nomousef nomousefocus nomh nomousehide nomousemev nomousemoveevent nonu nonumber noodev noopendevice nopaste nopi nopreserveindent nopvw nopreviewwindow noprompt noro noreadonly nornu norelativenumber noremap nors norestorescreen nori norevins norl norightleft
|
||||
syn keyword vimOption contained noru noruler noscb noscrollbind noscf noscrollfocus nosecure nossl noshellslash nostmp noshelltemp nosr noshiftround nosn noshortname nosc noshowcmd nosft noshowfulltag nosm noshowmatch nosmd noshowmode noscs nosmartcase nosi nosmartindent nosta nosmarttab nosms nosmoothscroll nospell nosb nosplitbelow nospr nosplitright nosol nostartofline noswf noswapfile notbs notagbsearch notr notagrelative notgst notagstack notbidi notermbidi notgc notermguicolors notsy notermsync noterse nota notextauto notx notextmode notop notildeop noto notimeout notitle nottimeout notbi nottybuiltin notf nottyfast noudf noundofile novb novisualbell nowarn nowiv noweirdinvert nowic nowildignorecase nowmnu nowildmenu nowfb nowinfixbuf nowfh nowinfixheight
|
||||
syn keyword vimOption contained nowfw nowinfixwidth nowst nowlsteal nowrap nows nowrapscan nowrite nowa nowriteany nowb nowritebackup noxtermcodes
|
||||
syn keyword vimOption contained nowfw nowinfixwidth nowrap nows nowrapscan nowrite nowa nowriteany nowb nowritebackup noxtermcodes
|
||||
|
||||
" vimOptions: These are the invertible variants {{{2
|
||||
" GEN_SYN_VIM: vimOption invertible, START_STR='syn keyword vimOption contained', END_STR=''
|
||||
syn keyword vimOption contained invari invallowrevins invarab invarabic invarshape invarabicshape invacd invautochdir invac invautocomplete invai invautoindent invar invautoread invasd invautoshelldir invaw invautowrite invawa invautowriteall invbk invbackup invbeval invballooneval invbevalterm invballoonevalterm invbin invbinary invbomb invbri invbreakindent invbl invbuflisted invcdh invcdhome invcin invcindent invcp invcompatible invcf invconfirm invci invcopyindent invcsre invcscoperelative invcst invcscopetag invcsverb invcscopeverbose invcrb invcursorbind invcuc invcursorcolumn invcul invcursorline invdeco invdelcombine invdiff invdg invdigraph inved invedcompatible invemo invemoji inveof invendoffile inveol invendofline invea invequalalways inveb inverrorbells
|
||||
syn keyword vimOption contained invek invesckeys invet invexpandtab invex invexrc invfic invfileignorecase invfixeol invfixendofline invfen invfoldenable invfs invfsync invgd invgdefault invguipty invhid invhidden invhk invhkmap invhkp invhkmapp invhls invhlsearch invicon invic invignorecase invimc invimcmdline invimd invimdisable invis invincsearch invinf invinfercase invim invinsertmode invjs invjoinspaces invlnr invlangnoremap invlrm invlangremap invlz invlazyredraw invlbr invlinebreak invlisp invlist invlpl invloadplugins invmagic invml invmodeline invmle invmodelineexpr invmlst invmodelinestrict invma invmodifiable invmod invmodified invmore invmousef invmousefocus invmh invmousehide invmousemev invmousemoveevent invnu invnumber invodev invopendevice invpaste
|
||||
syn keyword vimOption contained invpi invpreserveindent invpvw invpreviewwindow invprompt invro invreadonly invrnu invrelativenumber invremap invrs invrestorescreen invri invrevins invrl invrightleft invru invruler invscb invscrollbind invscf invscrollfocus invsecure invssl invshellslash invstmp invshelltemp invsr invshiftround invsn invshortname invsc invshowcmd invsft invshowfulltag invsm invshowmatch invsmd invshowmode invscs invsmartcase invsi invsmartindent invsta invsmarttab invsms invsmoothscroll invspell invsb invsplitbelow invspr invsplitright invsol invstartofline invswf invswapfile invtbs invtagbsearch invtr invtagrelative invtgst invtagstack invtbidi invtermbidi invtgc invtermguicolors invtsy invtermsync invterse invta invtextauto invtx invtextmode
|
||||
syn keyword vimOption contained invtop invtildeop invto invtimeout invtitle invttimeout invtbi invttybuiltin invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwst invwlsteal invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes
|
||||
syn keyword vimOption contained invtop invtildeop invto invtimeout invtitle invttimeout invtbi invttybuiltin invtf invttyfast invudf invundofile invvb invvisualbell invwarn invwiv invweirdinvert invwic invwildignorecase invwmnu invwildmenu invwfb invwinfixbuf invwfh invwinfixheight invwfw invwinfixwidth invwrap invws invwrapscan invwrite invwa invwriteany invwb invwritebackup invxtermcodes
|
||||
" termcap codes (which can also be set) {{{2
|
||||
" GEN_SYN_VIM: vimOption term output code, START_STR='syn keyword vimOption contained', END_STR='skipwhite nextgroup=vimSetEqual,vimSetMod'
|
||||
syn keyword vimOption 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 t_BS t_ES skipwhite nextgroup=vimSetEqual,vimSetMod
|
||||
@@ -111,7 +111,7 @@ syn keyword vimOptionVarName contained mfd maxfuncdepth mmd maxmapdepth mm maxme
|
||||
syn keyword vimOptionVarName contained pmbcs printmbcharset pmbfn printmbfont popt printoptions prompt pb pumborder ph pumheight pmw pummaxwidth pumopt pw pumwidth 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 sop scrolloffpad 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
|
||||
syn keyword vimOptionVarName contained 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 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 stlo statuslineopt 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
|
||||
syn keyword vimOptionVarName contained tcldll term tbidi termbidi tenc termencoding tgc termguicolors trz termresize tsy termsync 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 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
|
||||
syn keyword vimOptionVarName contained wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wst wlsteal wtm wltimeoutlen wrap wm wrapmargin ws wrapscan write wa writeany wb writebackup wd writedelay xtermcodes
|
||||
syn keyword vimOptionVarName contained wic wildignorecase wmnu wildmenu wim wildmode wop wildoptions wak winaltkeys wcr wincolor wi window wfb winfixbuf wfh winfixheight wfw winfixwidth wh winheight whl winhighlight wmh winminheight wmw winminwidth winptydll wiw winwidth wse wlseat wtm wltimeoutlen 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 t_BS t_ES
|
||||
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
|
||||
@@ -126,9 +126,9 @@ syn match vimOptionVarName contained "t_k;"
|
||||
|
||||
" unsupported settings: some were supported by vi but don't do anything in vim {{{2
|
||||
" GEN_SYN_VIM: Missing vimOption, START_STR='syn keyword vimErrSetting contained', END_STR=''
|
||||
syn keyword vimErrSetting contained akm altkeymap anti antialias ap autoprint bf beautify biosk bioskey consk conskey fk fkmap fl flash gr graphic ht hardtabs macatsui mesg novice open opt optimize oft osfiletype redraw slow slowopen sourceany w1200 w300 w9600
|
||||
syn keyword vimErrSetting contained noakm noaltkeymap noanti noantialias noap noautoprint nobf nobeautify nobiosk nobioskey noconsk noconskey nofk nofkmap nofl noflash nogr nographic nomacatsui nomesg nonovice noopen noopt nooptimize noredraw noslow noslowopen nosourceany
|
||||
syn keyword vimErrSetting contained invakm invaltkeymap invanti invantialias invap invautoprint invbf invbeautify invbiosk invbioskey invconsk invconskey invfk invfkmap invfl invflash invgr invgraphic invmacatsui invmesg invnovice invopen invopt invoptimize invredraw invslow invslowopen invsourceany
|
||||
syn keyword vimErrSetting contained akm altkeymap anti antialias ap autoprint bf beautify biosk bioskey consk conskey fk fkmap fl flash gr graphic ht hardtabs macatsui mesg novice open opt optimize oft osfiletype redraw slow slowopen sourceany w1200 w300 w9600 wst wlsteal
|
||||
syn keyword vimErrSetting contained noakm noaltkeymap noanti noantialias noap noautoprint nobf nobeautify nobiosk nobioskey noconsk noconskey nofk nofkmap nofl noflash nogr nographic nomacatsui nomesg nonovice noopen noopt nooptimize noredraw noslow noslowopen nosourceany nowst nowlsteal
|
||||
syn keyword vimErrSetting contained invakm invaltkeymap invanti invantialias invap invautoprint invbf invbeautify invbiosk invbioskey invconsk invconskey invfk invfkmap invfl invflash invgr invgraphic invmacatsui invmesg invnovice invopen invopt invoptimize invredraw invslow invslowopen invsourceany invwst invwlsteal
|
||||
|
||||
" AutoCmd Events {{{2
|
||||
syn case ignore
|
||||
|
||||
+1
-13
@@ -1616,8 +1616,6 @@ genwaylandproto:
|
||||
# Needed for parallel jobs to work
|
||||
auto/wayland/ext-data-control-v1.h: auto/wayland/ext-data-control-v1.c
|
||||
auto/wayland/wlr-data-control-unstable-v1.h: auto/wayland/wlr-data-control-unstable-v1.c
|
||||
auto/wayland/primary-selection-unstable-v1.h: auto/wayland/primary-selection-unstable-v1.c
|
||||
auto/wayland/xdg-shell.h: auto/wayland/xdg-shell.c
|
||||
|
||||
# Unittest files
|
||||
JSON_TEST_SRC = json_test.c
|
||||
@@ -3674,12 +3672,6 @@ objects/wlr-data-control-unstable-v1.o: auto/wayland/wlr-data-control-unstable-v
|
||||
objects/ext-data-control-v1.o: auto/wayland/ext-data-control-v1.c
|
||||
$(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/ext-data-control-v1.c
|
||||
|
||||
objects/xdg-shell.o: auto/wayland/xdg-shell.c
|
||||
$(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/xdg-shell.c
|
||||
|
||||
objects/primary-selection-unstable-v1.o: auto/wayland/primary-selection-unstable-v1.c
|
||||
$(CCC) $(WAYLAND_CFLAGS) $(WAYLAND_CPPFLAGS) -o $@ auto/wayland/primary-selection-unstable-v1.c
|
||||
|
||||
objects/netbeans.o: netbeans.c
|
||||
$(CCC) -o $@ netbeans.c
|
||||
|
||||
@@ -4561,17 +4553,13 @@ objects/gui_gtk_gresources.o: auto/gui_gtk_gresources.c
|
||||
objects/wlr-data-control-unstable-v1.o: \
|
||||
auto/wayland/wlr-data-control-unstable-v1.c
|
||||
objects/ext-data-control-v1.o: auto/wayland/ext-data-control-v1.c
|
||||
objects/xdg-shell.o: auto/wayland/xdg-shell.c
|
||||
objects/primary-selection-unstable-v1.o: \
|
||||
auto/wayland/primary-selection-unstable-v1.c
|
||||
objects/wayland.o: auto/osdef.h wayland.c vim.h protodef.h auto/config.h feature.h os_unix.h \
|
||||
ascii.h keymap.h termdefs.h macros.h option.h beval.h \
|
||||
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 wayland.h \
|
||||
auto/wayland/wlr-data-control-unstable-v1.h \
|
||||
auto/wayland/ext-data-control-v1.h auto/wayland/xdg-shell.h \
|
||||
auto/wayland/primary-selection-unstable-v1.h
|
||||
auto/wayland/ext-data-control-v1.h
|
||||
objects/vterm_encoding.o: auto/osdef.h libvterm/src/encoding.c libvterm/src/vterm_internal.h \
|
||||
libvterm/include/vterm.h libvterm/include/vterm_keycodes.h \
|
||||
libvterm/src/encoding/DECdrawing.inc libvterm/src/encoding/uk.inc
|
||||
|
||||
Vendored
-38
@@ -858,7 +858,6 @@ enable_farsi
|
||||
enable_xim
|
||||
enable_fontset
|
||||
with_wayland
|
||||
enable_wayland_focus_steal
|
||||
with_x
|
||||
enable_gui
|
||||
enable_gtk2_check
|
||||
@@ -1539,9 +1538,6 @@ Optional Features:
|
||||
--disable-farsi Deprecated.
|
||||
--enable-xim Include XIM input support.
|
||||
--enable-fontset Include X fontset output support.
|
||||
--enable-wayland-focus-steal
|
||||
Include focus stealing support for Wayland
|
||||
clipboard.
|
||||
--enable-gui=OPTS X11 GUI. default=auto OPTS=auto/no/gtk2/gnome2/gtk3/motif/haiku/photon/carbon
|
||||
--enable-gtk2-check If auto-select GUI, check for GTK+ 2 default=yes
|
||||
--enable-gnome-check If GTK GUI, check for GNOME default=no
|
||||
@@ -9268,30 +9264,6 @@ printf %s "checking for wayland... " >&6; }
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking --enable-wayland-focus-steal argument" >&5
|
||||
printf %s "checking --enable-wayland-focus-steal argument... " >&6; }
|
||||
# Check whether --enable-wayland-focus-steal was given.
|
||||
if test ${enable_wayland_focus_steal+y}
|
||||
then :
|
||||
enableval=$enable_wayland_focus_steal; enable_wayland_fs=$enableval
|
||||
else case e in #(
|
||||
e) enable_wayland_fs="yes" ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
|
||||
if test "$enable_wayland_fs" = "yes"
|
||||
then :
|
||||
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: yes" >&5
|
||||
printf "%s\n" "yes" >&6; }
|
||||
printf "%s\n" "#define FEAT_WAYLAND_CLIPBOARD_FS 1" >>confdefs.h
|
||||
|
||||
else case e in #(
|
||||
e) { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
printf "%s\n" "no" >&6; } ;;
|
||||
esac
|
||||
fi
|
||||
|
||||
printf "%s\n" "#define HAVE_WAYLAND 1" >>confdefs.h
|
||||
|
||||
WAYLAND_CPPFLAGS=`$PKG_CONFIG --cflags-only-I wayland-client`
|
||||
@@ -9308,16 +9280,6 @@ fi
|
||||
objects/ext-data-control-v1.o \
|
||||
objects/wayland.o"
|
||||
|
||||
if test "$enable_wayland_fs" = "yes"
|
||||
then :
|
||||
as_fn_append WAYLAND_SRC " \
|
||||
auto/wayland/xdg-shell.c \
|
||||
auto/wayland/primary-selection-unstable-v1.c"
|
||||
as_fn_append WAYLAND_OBJ " \
|
||||
objects/xdg-shell.o \
|
||||
objects/primary-selection-unstable-v1.o"
|
||||
fi
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,16 +1,10 @@
|
||||
# List of files to generate
|
||||
GEN_XML = protocols/ext-data-control-v1.xml \
|
||||
protocols/primary-selection-unstable-v1.xml \
|
||||
protocols/wlr-data-control-unstable-v1.xml \
|
||||
protocols/xdg-shell.xml
|
||||
protocols/wlr-data-control-unstable-v1.xml
|
||||
GEN_SRC = ext-data-control-v1.c \
|
||||
primary-selection-unstable-v1.c \
|
||||
wlr-data-control-unstable-v1.c \
|
||||
xdg-shell.c
|
||||
wlr-data-control-unstable-v1.c
|
||||
GEN_INCLUDE = ext-data-control-v1.h \
|
||||
primary-selection-unstable-v1.h \
|
||||
wlr-data-control-unstable-v1.h \
|
||||
xdg-shell.h
|
||||
wlr-data-control-unstable-v1.h
|
||||
|
||||
# Default target
|
||||
all: $(GEN_SRC) $(GEN_INCLUDE)
|
||||
@@ -29,16 +23,6 @@ wlr-data-control-unstable-v1.c:
|
||||
wlr-data-control-unstable-v1.h:
|
||||
wayland-scanner client-header protocols/wlr-data-control-unstable-v1.xml $@
|
||||
|
||||
primary-selection-unstable-v1.c:
|
||||
wayland-scanner private-code protocols/primary-selection-unstable-v1.xml $@
|
||||
primary-selection-unstable-v1.h:
|
||||
wayland-scanner client-header protocols/primary-selection-unstable-v1.xml $@
|
||||
|
||||
xdg-shell.c:
|
||||
wayland-scanner private-code protocols/xdg-shell.xml $@
|
||||
xdg-shell.h:
|
||||
wayland-scanner client-header protocols/xdg-shell.xml $@
|
||||
|
||||
$(GEN_SRC) $(GEN_INCLUDE): $(GEN_XML)
|
||||
|
||||
$(GEN_XML):
|
||||
|
||||
@@ -1,225 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<protocol name="wp_primary_selection_unstable_v1">
|
||||
<copyright>
|
||||
Copyright © 2015, 2016 Red Hat
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a
|
||||
copy of this software and associated documentation files (the "Software"),
|
||||
to deal in the Software without restriction, including without limitation
|
||||
the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
||||
and/or sell copies of the Software, and to permit persons to whom the
|
||||
Software is furnished to do so, subject to the following conditions:
|
||||
|
||||
The above copyright notice and this permission notice (including the next
|
||||
paragraph) shall be included in all copies or substantial portions of the
|
||||
Software.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
||||
THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
||||
DEALINGS IN THE SOFTWARE.
|
||||
</copyright>
|
||||
|
||||
<description summary="Primary selection protocol">
|
||||
This protocol provides the ability to have a primary selection device to
|
||||
match that of the X server. This primary selection is a shortcut to the
|
||||
common clipboard selection, where text just needs to be selected in order
|
||||
to allow copying it elsewhere. The de facto way to perform this action
|
||||
is the middle mouse button, although it is not limited to this one.
|
||||
|
||||
Clients wishing to honor primary selection should create a primary
|
||||
selection source and set it as the selection through
|
||||
wp_primary_selection_device.set_selection whenever the text selection
|
||||
changes. In order to minimize calls in pointer-driven text selection,
|
||||
it should happen only once after the operation finished. Similarly,
|
||||
a NULL source should be set when text is unselected.
|
||||
|
||||
wp_primary_selection_offer objects are first announced through the
|
||||
wp_primary_selection_device.data_offer event. Immediately after this event,
|
||||
the primary data offer will emit wp_primary_selection_offer.offer events
|
||||
to let know of the mime types being offered.
|
||||
|
||||
When the primary selection changes, the client with the keyboard focus
|
||||
will receive wp_primary_selection_device.selection events. Only the client
|
||||
with the keyboard focus will receive such events with a non-NULL
|
||||
wp_primary_selection_offer. Across keyboard focus changes, previously
|
||||
focused clients will receive wp_primary_selection_device.events with a
|
||||
NULL wp_primary_selection_offer.
|
||||
|
||||
In order to request the primary selection data, the client must pass
|
||||
a recent serial pertaining to the press event that is triggering the
|
||||
operation, if the compositor deems the serial valid and recent, the
|
||||
wp_primary_selection_source.send event will happen in the other end
|
||||
to let the transfer begin. The client owning the primary selection
|
||||
should write the requested data, and close the file descriptor
|
||||
immediately.
|
||||
|
||||
If the primary selection owner client disappeared during the transfer,
|
||||
the client reading the data will receive a
|
||||
wp_primary_selection_device.selection event with a NULL
|
||||
wp_primary_selection_offer, the client should take this as a hint
|
||||
to finish the reads related to the no longer existing offer.
|
||||
|
||||
The primary selection owner should be checking for errors during
|
||||
writes, merely cancelling the ongoing transfer if any happened.
|
||||
</description>
|
||||
|
||||
<interface name="zwp_primary_selection_device_manager_v1" version="1">
|
||||
<description summary="X primary selection emulation">
|
||||
The primary selection device manager is a singleton global object that
|
||||
provides access to the primary selection. It allows to create
|
||||
wp_primary_selection_source objects, as well as retrieving the per-seat
|
||||
wp_primary_selection_device objects.
|
||||
</description>
|
||||
|
||||
<request name="create_source">
|
||||
<description summary="create a new primary selection source">
|
||||
Create a new primary selection source.
|
||||
</description>
|
||||
<arg name="id" type="new_id" interface="zwp_primary_selection_source_v1"/>
|
||||
</request>
|
||||
|
||||
<request name="get_device">
|
||||
<description summary="create a new primary selection device">
|
||||
Create a new data device for a given seat.
|
||||
</description>
|
||||
<arg name="id" type="new_id" interface="zwp_primary_selection_device_v1"/>
|
||||
<arg name="seat" type="object" interface="wl_seat"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy the primary selection device manager">
|
||||
Destroy the primary selection device manager.
|
||||
</description>
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
<interface name="zwp_primary_selection_device_v1" version="1">
|
||||
<request name="set_selection">
|
||||
<description summary="set the primary selection">
|
||||
Replaces the current selection. The previous owner of the primary
|
||||
selection will receive a wp_primary_selection_source.cancelled event.
|
||||
|
||||
To unset the selection, set the source to NULL.
|
||||
</description>
|
||||
<arg name="source" type="object" interface="zwp_primary_selection_source_v1" allow-null="true"/>
|
||||
<arg name="serial" type="uint" summary="serial of the event that triggered this request"/>
|
||||
</request>
|
||||
|
||||
<event name="data_offer">
|
||||
<description summary="introduce a new wp_primary_selection_offer">
|
||||
Introduces a new wp_primary_selection_offer object that may be used
|
||||
to receive the current primary selection. Immediately following this
|
||||
event, the new wp_primary_selection_offer object will send
|
||||
wp_primary_selection_offer.offer events to describe the offered mime
|
||||
types.
|
||||
</description>
|
||||
<arg name="offer" type="new_id" interface="zwp_primary_selection_offer_v1"/>
|
||||
</event>
|
||||
|
||||
<event name="selection">
|
||||
<description summary="advertise a new primary selection">
|
||||
The wp_primary_selection_device.selection event is sent to notify the
|
||||
client of a new primary selection. This event is sent after the
|
||||
wp_primary_selection.data_offer event introducing this object, and after
|
||||
the offer has announced its mimetypes through
|
||||
wp_primary_selection_offer.offer.
|
||||
|
||||
The data_offer is valid until a new offer or NULL is received
|
||||
or until the client loses keyboard focus. The client must destroy the
|
||||
previous selection data_offer, if any, upon receiving this event.
|
||||
</description>
|
||||
<arg name="id" type="object" interface="zwp_primary_selection_offer_v1" allow-null="true"/>
|
||||
</event>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy the primary selection device">
|
||||
Destroy the primary selection device.
|
||||
</description>
|
||||
</request>
|
||||
</interface>
|
||||
|
||||
<interface name="zwp_primary_selection_offer_v1" version="1">
|
||||
<description summary="offer to transfer primary selection contents">
|
||||
A wp_primary_selection_offer represents an offer to transfer the contents
|
||||
of the primary selection clipboard to the client. Similar to
|
||||
wl_data_offer, the offer also describes the mime types that the data can
|
||||
be converted to and provides the mechanisms for transferring the data
|
||||
directly to the client.
|
||||
</description>
|
||||
|
||||
<request name="receive">
|
||||
<description summary="request that the data is transferred">
|
||||
To transfer the contents of the primary selection clipboard, the client
|
||||
issues this request and indicates the mime type that it wants to
|
||||
receive. The transfer happens through the passed file descriptor
|
||||
(typically created with the pipe system call). The source client writes
|
||||
the data in the mime type representation requested and then closes the
|
||||
file descriptor.
|
||||
|
||||
The receiving client reads from the read end of the pipe until EOF and
|
||||
closes its end, at which point the transfer is complete.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"/>
|
||||
<arg name="fd" type="fd"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy the primary selection offer">
|
||||
Destroy the primary selection offer.
|
||||
</description>
|
||||
</request>
|
||||
|
||||
<event name="offer">
|
||||
<description summary="advertise offered mime type">
|
||||
Sent immediately after creating announcing the
|
||||
wp_primary_selection_offer through
|
||||
wp_primary_selection_device.data_offer. One event is sent per offered
|
||||
mime type.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"/>
|
||||
</event>
|
||||
</interface>
|
||||
|
||||
<interface name="zwp_primary_selection_source_v1" version="1">
|
||||
<description summary="offer to replace the contents of the primary selection">
|
||||
The source side of a wp_primary_selection_offer, it provides a way to
|
||||
describe the offered data and respond to requests to transfer the
|
||||
requested contents of the primary selection clipboard.
|
||||
</description>
|
||||
|
||||
<request name="offer">
|
||||
<description summary="add an offered mime type">
|
||||
This request adds a mime type to the set of mime types advertised to
|
||||
targets. Can be called several times to offer multiple types.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"/>
|
||||
</request>
|
||||
|
||||
<request name="destroy" type="destructor">
|
||||
<description summary="destroy the primary selection source">
|
||||
Destroy the primary selection source.
|
||||
</description>
|
||||
</request>
|
||||
|
||||
<event name="send">
|
||||
<description summary="send the primary selection contents">
|
||||
Request for the current primary selection contents from the client.
|
||||
Send the specified mime type over the passed file descriptor, then
|
||||
close it.
|
||||
</description>
|
||||
<arg name="mime_type" type="string"/>
|
||||
<arg name="fd" type="fd"/>
|
||||
</event>
|
||||
|
||||
<event name="cancelled">
|
||||
<description summary="request for primary selection contents was canceled">
|
||||
This primary selection source is no longer valid. The client should
|
||||
clean up and destroy this primary selection source.
|
||||
</description>
|
||||
</event>
|
||||
</interface>
|
||||
</protocol>
|
||||
File diff suppressed because it is too large
Load Diff
+5
-373
@@ -42,39 +42,6 @@ static int clip_provider_is_available(char_u *provider);
|
||||
|
||||
# include "wayland.h"
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
|
||||
// Structures used for focus stealing
|
||||
typedef struct {
|
||||
struct wl_shm_pool *pool;
|
||||
int fd;
|
||||
|
||||
struct wl_buffer *buffer;
|
||||
bool available;
|
||||
|
||||
int width;
|
||||
int height;
|
||||
int stride;
|
||||
int size;
|
||||
} clip_wl_buffer_store_T;
|
||||
|
||||
typedef struct {
|
||||
void *user_data;
|
||||
void (*on_focus)(void *data, uint32_t serial);
|
||||
|
||||
struct wl_surface *surface;
|
||||
struct wl_keyboard *keyboard;
|
||||
|
||||
struct {
|
||||
struct xdg_surface *surface;
|
||||
struct xdg_toplevel *toplevel;
|
||||
} shell;
|
||||
|
||||
bool got_focus;
|
||||
} clip_wl_fs_surface_T; // fs = focus steal
|
||||
|
||||
# endif // FEAT_WAYLAND_CLIPBOARD_FS
|
||||
|
||||
// Represents either the regular or primary selection
|
||||
typedef struct {
|
||||
char_u *contents; // Non-null if we own selection,
|
||||
@@ -84,10 +51,6 @@ typedef struct {
|
||||
// else NULL if we don't.
|
||||
vwl_data_offer_T *offer; // Current offer for the selection
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
bool requires_focus; // If focus needs to be given to us to
|
||||
// work
|
||||
# endif
|
||||
bool own_success; // Used by clip_wl_own_selection()
|
||||
bool available; // If selection is ready to serve/use
|
||||
|
||||
@@ -101,10 +64,6 @@ typedef struct {
|
||||
typedef struct {
|
||||
vwl_seat_T *seat;
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
clip_wl_buffer_store_T *fs_buffer;
|
||||
# endif
|
||||
|
||||
clip_wl_selection_T regular;
|
||||
clip_wl_selection_T primary;
|
||||
} clip_wl_T;
|
||||
@@ -2361,290 +2320,6 @@ clip_wl_get_selection_type(clip_wl_selection_T *sel)
|
||||
return WAYLAND_SELECTION_NONE;
|
||||
}
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
/*
|
||||
* If globals required for focus stealing method are available.
|
||||
*/
|
||||
static bool
|
||||
clip_wl_focus_stealing_available(void)
|
||||
{
|
||||
return wayland_ct->gobjects.wl_compositor != NULL &&
|
||||
wayland_ct->gobjects.wl_shm != NULL &&
|
||||
wayland_ct->gobjects.xdg_wm_base != NULL;
|
||||
}
|
||||
|
||||
/*
|
||||
* Called when compositor isn't using the buffer anymore, we can reuse it
|
||||
* again.
|
||||
*/
|
||||
static void
|
||||
wl_buffer_listener_release(
|
||||
void *data,
|
||||
struct wl_buffer *buffer UNUSED)
|
||||
{
|
||||
clip_wl_buffer_store_T *store = data;
|
||||
|
||||
store->available = true;
|
||||
}
|
||||
|
||||
static struct wl_buffer_listener wl_buffer_listener = {
|
||||
.release = wl_buffer_listener_release
|
||||
};
|
||||
|
||||
/*
|
||||
* Destroy a buffer store structure.
|
||||
*/
|
||||
static void
|
||||
clip_wl_destroy_buffer_store(clip_wl_buffer_store_T *store)
|
||||
{
|
||||
if (store == NULL)
|
||||
return;
|
||||
if (store->buffer != NULL)
|
||||
wl_buffer_destroy(store->buffer);
|
||||
if (store->pool != NULL)
|
||||
wl_shm_pool_destroy(store->pool);
|
||||
|
||||
close(store->fd);
|
||||
|
||||
vim_free(store);
|
||||
}
|
||||
|
||||
/*
|
||||
* Initialize a buffer and its backing memory pool.
|
||||
*/
|
||||
static clip_wl_buffer_store_T *
|
||||
clip_wl_init_buffer_store(int width, int height)
|
||||
{
|
||||
int fd, r;
|
||||
clip_wl_buffer_store_T *store;
|
||||
|
||||
store = alloc(sizeof(*store));
|
||||
|
||||
if (store == NULL)
|
||||
return NULL;
|
||||
|
||||
store->available = false;
|
||||
|
||||
store->width = width;
|
||||
store->height = height;
|
||||
store->stride = store->width * 4;
|
||||
store->size = store->stride * store->height;
|
||||
|
||||
fd = mch_create_anon_file();
|
||||
r = ftruncate(fd, store->size);
|
||||
|
||||
if (r == -1)
|
||||
{
|
||||
if (fd >= 0)
|
||||
close(fd);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
store->pool = wl_shm_create_pool(
|
||||
wayland_ct->gobjects.wl_shm,
|
||||
fd,
|
||||
store->size);
|
||||
store->buffer = wl_shm_pool_create_buffer(
|
||||
store->pool,
|
||||
0,
|
||||
store->width,
|
||||
store->height,
|
||||
store->stride,
|
||||
WL_SHM_FORMAT_ARGB8888);
|
||||
|
||||
store->fd = fd;
|
||||
|
||||
wl_buffer_add_listener(store->buffer, &wl_buffer_listener, store);
|
||||
|
||||
if (vwl_connection_roundtrip(wayland_ct) == FAIL)
|
||||
{
|
||||
clip_wl_destroy_buffer_store(store);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
store->available = true;
|
||||
|
||||
return store;
|
||||
}
|
||||
|
||||
/*
|
||||
* Configure xdg_surface
|
||||
*/
|
||||
static void
|
||||
xdg_surface_listener_configure(
|
||||
void *data UNUSED,
|
||||
struct xdg_surface *surface,
|
||||
uint32_t serial)
|
||||
{
|
||||
xdg_surface_ack_configure(surface, serial);
|
||||
}
|
||||
|
||||
|
||||
static struct xdg_surface_listener xdg_surface_listener = {
|
||||
.configure = xdg_surface_listener_configure
|
||||
};
|
||||
|
||||
/*
|
||||
* Destroy a focus stealing structure.
|
||||
*/
|
||||
static void
|
||||
clip_wl_destroy_fs_surface(clip_wl_fs_surface_T *store)
|
||||
{
|
||||
if (store == NULL)
|
||||
return;
|
||||
if (store->shell.toplevel != NULL)
|
||||
xdg_toplevel_destroy(store->shell.toplevel);
|
||||
if (store->shell.surface != NULL)
|
||||
xdg_surface_destroy(store->shell.surface);
|
||||
if (store->surface != NULL)
|
||||
wl_surface_destroy(store->surface);
|
||||
if (store->keyboard != NULL)
|
||||
{
|
||||
if (wl_keyboard_get_version(store->keyboard) >= 3)
|
||||
wl_keyboard_release(store->keyboard);
|
||||
else
|
||||
wl_keyboard_destroy(store->keyboard);
|
||||
}
|
||||
vim_free(store);
|
||||
}
|
||||
|
||||
VWL_FUNCS_DUMMY_KEYBOARD_EVENTS()
|
||||
|
||||
/*
|
||||
* Called when the keyboard focus is on our surface
|
||||
*/
|
||||
static void
|
||||
clip_wl_fs_keyboard_listener_enter(
|
||||
void *data,
|
||||
struct wl_keyboard *keyboard UNUSED,
|
||||
uint32_t serial,
|
||||
struct wl_surface *surface UNUSED,
|
||||
struct wl_array *keys UNUSED)
|
||||
{
|
||||
clip_wl_fs_surface_T *store = data;
|
||||
|
||||
store->got_focus = true;
|
||||
|
||||
if (store->on_focus != NULL)
|
||||
store->on_focus(store->user_data, serial);
|
||||
}
|
||||
|
||||
|
||||
static struct wl_keyboard_listener vwl_fs_keyboard_listener = {
|
||||
.enter = clip_wl_fs_keyboard_listener_enter,
|
||||
.key = clip_wl_fs_keyboard_listener_key,
|
||||
.keymap = clip_wl_fs_keyboard_listener_keymap,
|
||||
.leave = clip_wl_fs_keyboard_listener_leave,
|
||||
.modifiers = clip_wl_fs_keyboard_listener_modifiers,
|
||||
.repeat_info = clip_wl_fs_keyboard_listener_repeat_info
|
||||
};
|
||||
|
||||
/*
|
||||
* Create an invisible surface in order to gain focus and call on_focus() with
|
||||
* serial that was given.
|
||||
*/
|
||||
static int
|
||||
clip_wl_init_fs_surface(
|
||||
vwl_seat_T *seat,
|
||||
clip_wl_buffer_store_T *buffer_store,
|
||||
void (*on_focus)(void *, uint32_t),
|
||||
void *user_data)
|
||||
{
|
||||
clip_wl_fs_surface_T *store;
|
||||
# ifdef ELAPSED_FUNC
|
||||
elapsed_T start_tv;
|
||||
# endif
|
||||
|
||||
if (wayland_ct->gobjects.wl_compositor == NULL
|
||||
|| wayland_ct->gobjects.xdg_wm_base == NULL
|
||||
|| buffer_store == NULL
|
||||
|| seat == NULL)
|
||||
return FAIL;
|
||||
|
||||
store = ALLOC_CLEAR_ONE(clip_wl_fs_surface_T);
|
||||
|
||||
if (store == NULL)
|
||||
return FAIL;
|
||||
|
||||
// Get keyboard
|
||||
store->keyboard = vwl_seat_get_keyboard(seat);
|
||||
|
||||
if (store->keyboard == NULL)
|
||||
goto fail;
|
||||
|
||||
wl_keyboard_add_listener(store->keyboard, &vwl_fs_keyboard_listener, store);
|
||||
|
||||
if (vwl_connection_dispatch(wayland_ct) < 0)
|
||||
goto fail;
|
||||
|
||||
store->surface = wl_compositor_create_surface(
|
||||
wayland_ct->gobjects.wl_compositor);
|
||||
store->shell.surface = xdg_wm_base_get_xdg_surface(
|
||||
wayland_ct->gobjects.xdg_wm_base, store->surface);
|
||||
store->shell.toplevel = xdg_surface_get_toplevel(store->shell.surface);
|
||||
|
||||
xdg_toplevel_set_title(store->shell.toplevel, "Vim clipboard");
|
||||
|
||||
xdg_surface_add_listener(store->shell.surface,
|
||||
&xdg_surface_listener, NULL);
|
||||
|
||||
wl_surface_commit(store->surface);
|
||||
|
||||
store->on_focus = on_focus;
|
||||
store->user_data = user_data;
|
||||
store->got_focus = FALSE;
|
||||
|
||||
if (vwl_connection_roundtrip(wayland_ct) == FAIL)
|
||||
goto fail;
|
||||
|
||||
// We may get the enter event early, if we do then we will set `got_focus`
|
||||
// to TRUE.
|
||||
if (store->got_focus)
|
||||
goto early_exit;
|
||||
|
||||
// Buffer hasn't been released yet, abort. This shouldn't happen but still
|
||||
// check for it.
|
||||
if (!buffer_store->available)
|
||||
goto fail;
|
||||
|
||||
buffer_store->available = false;
|
||||
|
||||
wl_surface_attach(store->surface, buffer_store->buffer, 0, 0);
|
||||
wl_surface_damage(store->surface, 0, 0,
|
||||
buffer_store->width, buffer_store->height);
|
||||
wl_surface_commit(store->surface);
|
||||
|
||||
// Dispatch events until we receive the enter event. Add a max delay of
|
||||
// 'p_wtm' when waiting for it (may be longer depending on how long we poll
|
||||
// when dispatching events)
|
||||
# ifdef ELAPSED_FUNC
|
||||
ELAPSED_INIT(start_tv);
|
||||
# endif
|
||||
|
||||
while (vwl_connection_dispatch(wayland_ct) >= 0)
|
||||
{
|
||||
if (store->got_focus)
|
||||
break;
|
||||
|
||||
# ifdef ELAPSED_FUNC
|
||||
if (ELAPSED_FUNC(start_tv) >= p_wtm)
|
||||
goto fail;
|
||||
# endif
|
||||
}
|
||||
early_exit:
|
||||
clip_wl_destroy_fs_surface(store);
|
||||
vwl_connection_flush(wayland_ct);
|
||||
|
||||
return OK;
|
||||
fail:
|
||||
clip_wl_destroy_fs_surface(store);
|
||||
vwl_connection_flush(wayland_ct);
|
||||
|
||||
return FAIL;
|
||||
}
|
||||
|
||||
# endif // FEAT_WAYLAND_CLIPBOARD_FS
|
||||
|
||||
static bool
|
||||
wl_data_offer_listener_event_offer(
|
||||
void *data UNUSED,
|
||||
@@ -2811,23 +2486,6 @@ clip_init_wayland(void)
|
||||
clip_wl.primary.device = clip_wl.regular.device;
|
||||
}
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
if (clip_wl.regular.available
|
||||
&& clip_wl.regular.manager->protocol == VWL_DATA_PROTOCOL_CORE
|
||||
&& clip_wl_focus_stealing_available())
|
||||
clip_wl.regular.requires_focus = true;
|
||||
if (clip_wl.primary.available
|
||||
&& clip_wl.primary.manager->protocol == VWL_DATA_PROTOCOL_PRIMARY
|
||||
&& clip_wl_focus_stealing_available())
|
||||
clip_wl.primary.requires_focus = true;
|
||||
|
||||
if (clip_wl.regular.requires_focus || clip_wl.primary.requires_focus)
|
||||
{
|
||||
// Initialize buffer to use for focus stealing
|
||||
clip_wl.fs_buffer = clip_wl_init_buffer_store(1, 1);
|
||||
}
|
||||
# endif
|
||||
|
||||
if (!clip_wl.regular.available && !clip_wl.primary.available)
|
||||
return FAIL;
|
||||
|
||||
@@ -2857,10 +2515,6 @@ clip_uninit_wayland(void)
|
||||
clip_lose_selection(&clip_plus);
|
||||
}
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
clip_wl_destroy_buffer_store(clip_wl.fs_buffer);
|
||||
# endif
|
||||
|
||||
// Don't want to double free
|
||||
if (clip_wl.regular.manager != clip_wl.primary.manager)
|
||||
vwl_data_device_manager_discard(clip_wl.primary.manager);
|
||||
@@ -3032,23 +2686,10 @@ clip_wl_request_selection(Clipboard_T *cbd)
|
||||
if (!sel->available)
|
||||
goto clear;
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
if (sel->requires_focus)
|
||||
{
|
||||
// We don't care about the on_focus callback since once we gain
|
||||
// focus the data offer events will come immediately.
|
||||
if (clip_wl_init_fs_surface(clip_wl.seat,
|
||||
clip_wl.fs_buffer, NULL, NULL) == FAIL)
|
||||
goto clear;
|
||||
}
|
||||
else
|
||||
# endif
|
||||
{
|
||||
// Dispatch any events that still queued up before checking for a data
|
||||
// offer.
|
||||
if (vwl_connection_roundtrip(wayland_ct) == FAIL)
|
||||
goto clear;
|
||||
}
|
||||
// Dispatch any events that still queued up before checking for a data
|
||||
// offer.
|
||||
if (vwl_connection_roundtrip(wayland_ct) == FAIL)
|
||||
goto clear;
|
||||
|
||||
if (sel->offer == NULL)
|
||||
goto clear;
|
||||
@@ -3249,16 +2890,7 @@ clip_wl_own_selection(Clipboard_T *cbd)
|
||||
vwl_data_source_offer(sel->source, supported_mimes[i]);
|
||||
|
||||
sel->own_success = false;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
if (sel->requires_focus)
|
||||
{
|
||||
if (clip_wl_init_fs_surface(clip_wl.seat, clip_wl.fs_buffer,
|
||||
clip_wl_do_set_selection, sel) == FAIL)
|
||||
goto fail;
|
||||
}
|
||||
else
|
||||
# endif
|
||||
clip_wl_do_set_selection(sel, 0);
|
||||
clip_wl_do_set_selection(sel, 0);
|
||||
|
||||
if (!sel->own_success)
|
||||
goto fail;
|
||||
|
||||
@@ -12,9 +12,6 @@
|
||||
/* Define unless no Wayland support found */
|
||||
#undef HAVE_WAYLAND
|
||||
|
||||
/* Define if you want focus stealing support with Wayland clipboard */
|
||||
#undef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
|
||||
/* Define when terminfo support found */
|
||||
#undef TERMINFO
|
||||
|
||||
|
||||
@@ -2461,18 +2461,6 @@ if test "$with_wayland" = yes; then
|
||||
if "$PKG_CONFIG" --exists 'wayland-client'; then
|
||||
AC_MSG_RESULT([yes])
|
||||
|
||||
AC_MSG_CHECKING(--enable-wayland-focus-steal argument)
|
||||
AC_ARG_ENABLE(wayland-focus-steal,
|
||||
[AS_HELP_STRING([--enable-wayland-focus-steal],
|
||||
[Include focus stealing support for Wayland clipboard.])],
|
||||
[enable_wayland_fs=$enableval],
|
||||
enable_wayland_fs="yes")
|
||||
|
||||
AS_IF([test "$enable_wayland_fs" = "yes"],
|
||||
[AC_MSG_RESULT([yes])
|
||||
AC_DEFINE(FEAT_WAYLAND_CLIPBOARD_FS)],
|
||||
[AC_MSG_RESULT([no])])
|
||||
|
||||
AC_DEFINE(HAVE_WAYLAND)
|
||||
WAYLAND_CPPFLAGS=`$PKG_CONFIG --cflags-only-I wayland-client`
|
||||
WAYLAND_CFLAGS=`$PKG_CONFIG --cflags-only-other wayland-client`
|
||||
@@ -2488,14 +2476,6 @@ if test "$with_wayland" = yes; then
|
||||
objects/ext-data-control-v1.o \
|
||||
objects/wayland.o"
|
||||
|
||||
AS_IF([test "$enable_wayland_fs" = "yes"],
|
||||
[AS_VAR_APPEND([WAYLAND_SRC], " \
|
||||
auto/wayland/xdg-shell.c \
|
||||
auto/wayland/primary-selection-unstable-v1.c")
|
||||
AS_VAR_APPEND([WAYLAND_OBJ], " \
|
||||
objects/xdg-shell.o \
|
||||
objects/primary-selection-unstable-v1.o")])
|
||||
|
||||
AC_SUBST(WAYLAND_CPPFLAGS)
|
||||
AC_SUBST(WAYLAND_CFLAGS)
|
||||
AC_SUBST(WAYLAND_LIBS)
|
||||
|
||||
@@ -7681,13 +7681,6 @@ f_has(typval_T *argvars, typval_T *rettv)
|
||||
1
|
||||
#else
|
||||
0
|
||||
#endif
|
||||
},
|
||||
{"wayland_focus_steal",
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
1
|
||||
#else
|
||||
0
|
||||
#endif
|
||||
},
|
||||
{"wildignore", 1},
|
||||
|
||||
@@ -925,13 +925,6 @@
|
||||
# endif
|
||||
#endif
|
||||
|
||||
/*
|
||||
* +wayland_focus_steal Focus stealing support for Wayland clipboard
|
||||
*/
|
||||
#if !defined(FEAT_WAYLAND_CLIPBOARD) && defined(FEAT_WAYLAND_CLIPBOARD_FS)
|
||||
# undef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
#endif
|
||||
|
||||
/*
|
||||
* +dnd Drag'n'drop support. Always used for the GTK+ GUI.
|
||||
*/
|
||||
|
||||
@@ -1154,9 +1154,6 @@ EXTERN long p_wmw; // 'winminwidth'
|
||||
EXTERN long p_wiw; // 'winwidth'
|
||||
#ifdef FEAT_WAYLAND
|
||||
EXTERN char_u *p_wse; // 'wlseat'
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
EXTERN int p_wst; // 'wlsteal'
|
||||
# endif
|
||||
EXTERN long p_wtm; // 'wltimeoutlen'
|
||||
#endif
|
||||
#if defined(MSWIN) && defined(FEAT_TERMINAL)
|
||||
|
||||
+1
-6
@@ -3039,14 +3039,9 @@ static struct vimoption options[] =
|
||||
{(char_u *)NULL, (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{"wlsteal", "wst", P_BOOL|P_VI_DEF,
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
(char_u *)&p_wst, PV_NONE, did_set_wlsteal, NULL,
|
||||
{(char_u *)FALSE, (char_u *)0L}
|
||||
#else
|
||||
{"wlsteal", "wst", P_BOOL|P_VI_DEF, // Deprecated
|
||||
(char_u *)NULL, PV_NONE, NULL, NULL,
|
||||
{(char_u *)NULL, (char_u *)0L}
|
||||
#endif
|
||||
SCTX_INIT},
|
||||
{"wltimeoutlen", "wtm", P_NUM|P_VI_DEF,
|
||||
#ifdef FEAT_WAYLAND
|
||||
|
||||
Generated
+1
-5
@@ -8,7 +8,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Vim\n"
|
||||
"Report-Msgid-Bugs-To: vim-dev@vim.org\n"
|
||||
"POT-Creation-Date: 2026-04-20 17:22+0000\n"
|
||||
"POT-Creation-Date: 2026-04-20 17:54+0000\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@@ -9916,10 +9916,6 @@ msgstr ""
|
||||
msgid "Wayland seat to use"
|
||||
msgstr ""
|
||||
|
||||
msgid ""
|
||||
"Enable wayland focus stealing functionality in order to access the clipboard"
|
||||
msgstr ""
|
||||
|
||||
msgid "\"startsel\" and/or \"stopsel\"; what special keys can do"
|
||||
msgstr ""
|
||||
|
||||
|
||||
@@ -3,7 +3,6 @@ int vwl_connection_flush(vwl_connection_T *self);
|
||||
int vwl_connection_dispatch(vwl_connection_T *self);
|
||||
int vwl_connection_roundtrip(vwl_connection_T *self);
|
||||
vwl_seat_T *vwl_connection_get_seat(vwl_connection_T *self, const char *label);
|
||||
struct wl_keyboard *vwl_seat_get_keyboard(vwl_seat_T *self);
|
||||
int wayland_init_connection(const char *display);
|
||||
void wayland_uninit_connection(void);
|
||||
int wayland_prepare_read(void);
|
||||
|
||||
@@ -31,31 +31,6 @@ func s:PreTest()
|
||||
set cpm=wayland
|
||||
endfunc
|
||||
|
||||
func s:SetupFocusStealing()
|
||||
CheckFeature wayland_focus_steal
|
||||
if !executable('wayland-info')
|
||||
throw "Skipped: wayland-info program not available"
|
||||
endif
|
||||
|
||||
" Starting a headless compositor won't expose a keyboard capability for its
|
||||
" seat, so we must use the user's existing Wayland session if they are in one.
|
||||
let $WAYLAND_DISPLAY = s:old_wayland_display
|
||||
|
||||
exe 'wlrestore! ' .. $WAYLAND_DISPLAY
|
||||
|
||||
" Check if we have keyboard capability for seat
|
||||
if system("wayland-info -i wl_seat | grep capabilities") !~? "keyboard"
|
||||
throw "Skipped: seat does not have keyboard"
|
||||
endif
|
||||
|
||||
let $VIM_WAYLAND_FORCE_FS=1
|
||||
wlrestore!
|
||||
endfunc
|
||||
|
||||
func s:UnsetupFocusStealing()
|
||||
unlet $VIM_WAYLAND_FORCE_FS
|
||||
endfunc
|
||||
|
||||
func s:CheckClientserver()
|
||||
CheckFeature clientserver
|
||||
|
||||
@@ -487,31 +462,6 @@ func Test_wayland_seat()
|
||||
set wlseat&
|
||||
endfunc
|
||||
|
||||
" Test focus stealing
|
||||
func Test_wayland_focus_steal()
|
||||
CheckFeature wayland_focus_steal
|
||||
call s:PreTest()
|
||||
call s:SetupFocusStealing()
|
||||
|
||||
call system('wl-copy regular')
|
||||
|
||||
call assert_equal('regular', getreg('+'))
|
||||
|
||||
call system('wl-copy -p primary')
|
||||
|
||||
call assert_equal('primary', getreg('*'))
|
||||
|
||||
call setreg('+', 'REGULAR')
|
||||
|
||||
call assert_equal('REGULAR', system('wl-paste -n'))
|
||||
|
||||
call setreg('*', 'PRIMARY')
|
||||
|
||||
call assert_equal('PRIMARY', system('wl-paste -p -n'))
|
||||
|
||||
call s:UnsetupFocusStealing()
|
||||
endfunc
|
||||
|
||||
" Test when environment is not suitable for Wayland
|
||||
func Test_wayland_bad_environment()
|
||||
call s:PreTest()
|
||||
@@ -564,32 +514,6 @@ func Test_wayland_lost_selection()
|
||||
|
||||
endfunc
|
||||
|
||||
" Same as above but for the focus stealing method
|
||||
func Test_wayland_lost_selection_focus_steal()
|
||||
call s:PreTest()
|
||||
call s:SetupFocusStealing()
|
||||
|
||||
call setreg('+', 'regular')
|
||||
call setreg('*', 'primary')
|
||||
|
||||
call assert_equal('regular', getreg('+'))
|
||||
call assert_equal('primary', getreg('*'))
|
||||
|
||||
call system('wl-copy overwrite')
|
||||
call system('wl-copy -p overwrite')
|
||||
|
||||
call assert_equal('overwrite', getreg('+'))
|
||||
call assert_equal('overwrite-primary', getreg('*'))
|
||||
|
||||
call setreg('+', 'regular')
|
||||
call setreg('*', 'primary')
|
||||
|
||||
call assert_equal('regular', getreg('+'))
|
||||
call assert_equal('primary', getreg('*'))
|
||||
|
||||
call s:UnsetupFocusStealing()
|
||||
endfunc
|
||||
|
||||
" Test when there are no supported mime types for the selection
|
||||
func Test_wayland_no_mime_types_supported()
|
||||
call s:PreTest()
|
||||
|
||||
+2
-5
@@ -663,11 +663,6 @@ static char *(features[]) =
|
||||
"+wayland_clipboard",
|
||||
#else
|
||||
"-wayland_clipboard",
|
||||
#endif
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
"+wayland_focus_steal",
|
||||
#else
|
||||
"-wayland_focus_steal",
|
||||
#endif
|
||||
"+wildignore",
|
||||
"+wildmenu",
|
||||
@@ -734,6 +729,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
382,
|
||||
/**/
|
||||
381,
|
||||
/**/
|
||||
|
||||
+1
-278
@@ -22,12 +22,6 @@
|
||||
* times, and saves new selections/offers as events come in. When we
|
||||
* want retrieve the selection, the currently saved data offer is
|
||||
* used from the respective data device.
|
||||
*
|
||||
* The focus stealing code is implemented in clipboard.c, and is
|
||||
* based off of wl-clipboard's implementation. The idea using of
|
||||
* extensive macros to reduce boilerplate code also comes from
|
||||
* wl-clipboard as well. The project page for wl-clipboard can be
|
||||
* found here: https://github.com/bugaevc/wl-clipboard
|
||||
*/
|
||||
|
||||
#include "vim.h"
|
||||
@@ -336,38 +330,6 @@ wl_registry_listener_event_global(
|
||||
ct->gobjects.ext_data_control_manager_v1 =
|
||||
wl_registry_bind(registry, name,
|
||||
&ext_data_control_manager_v1_interface, 1);
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
else if (p_wst)
|
||||
{
|
||||
if (STRCMP(interface, wl_data_device_manager_interface.name) == 0)
|
||||
ct->gobjects.wl_data_device_manager =
|
||||
wl_registry_bind(registry, name,
|
||||
&wl_data_device_manager_interface, 1);
|
||||
|
||||
else if (STRCMP(interface, wl_shm_interface.name) == 0)
|
||||
ct->gobjects.wl_shm =
|
||||
wl_registry_bind(registry, name,
|
||||
&wl_shm_interface, 1);
|
||||
|
||||
else if (STRCMP(interface, wl_compositor_interface.name) == 0)
|
||||
ct->gobjects.wl_compositor =
|
||||
wl_registry_bind(registry, name,
|
||||
&wl_compositor_interface, 1);
|
||||
|
||||
else if (STRCMP(interface, xdg_wm_base_interface.name) == 0)
|
||||
ct->gobjects.xdg_wm_base =
|
||||
wl_registry_bind(registry, name,
|
||||
&xdg_wm_base_interface, 1);
|
||||
|
||||
else if (STRCMP(interface,
|
||||
zwp_primary_selection_device_manager_v1_interface.name)
|
||||
== 0)
|
||||
ct->gobjects.zwp_primary_selection_device_manager_v1 =
|
||||
wl_registry_bind(registry, name,
|
||||
&zwp_primary_selection_device_manager_v1_interface, 1);
|
||||
}
|
||||
# endif // FEAT_WAYLAND_CLIPBOARD_FS
|
||||
#endif // FEAT_WAYLAND_CLIPBOARD
|
||||
|
||||
}
|
||||
@@ -386,28 +348,11 @@ wl_registry_listener_event_global_remove(
|
||||
{
|
||||
}
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
static void
|
||||
xdg_wm_base_listener_event_ping(
|
||||
void *data UNUSED,
|
||||
struct xdg_wm_base *xdg_base,
|
||||
uint32_t serial)
|
||||
{
|
||||
xdg_wm_base_pong(xdg_base, serial);
|
||||
}
|
||||
#endif
|
||||
|
||||
static const struct wl_registry_listener wl_registry_listener = {
|
||||
.global = wl_registry_listener_event_global,
|
||||
.global_remove = wl_registry_listener_event_global_remove
|
||||
};
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
static const struct xdg_wm_base_listener xdg_wm_base_listener = {
|
||||
.ping = xdg_wm_base_listener_event_ping
|
||||
};
|
||||
#endif
|
||||
|
||||
static void vwl_connection_destroy(vwl_connection_T *self);
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD
|
||||
@@ -428,10 +373,7 @@ static void vwl_connection_destroy(vwl_connection_T *self);
|
||||
vwl_connection_new(const char *display)
|
||||
{
|
||||
vwl_connection_T *ct;
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
const char_u *env;
|
||||
bool force_fs;
|
||||
#endif
|
||||
|
||||
if (wayland_no_connect)
|
||||
return NULL;
|
||||
|
||||
@@ -469,46 +411,12 @@ vwl_connection_new(const char *display)
|
||||
|
||||
wl_registry_add_listener(ct->registry.proxy, &wl_registry_listener, ct);
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
env = mch_getenv("VIM_WAYLAND_FORCE_FS");
|
||||
force_fs = (env != NULL && STRCMP(env, "1") == 0);
|
||||
|
||||
if (force_fs)
|
||||
p_wst = TRUE;
|
||||
#endif
|
||||
|
||||
if (vwl_connection_roundtrip(ct) == FAIL)
|
||||
{
|
||||
vwl_connection_destroy(ct);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
if (force_fs)
|
||||
{
|
||||
// Force using focus stealing method
|
||||
VWL_DESTROY_GOBJECT(ct, ext_data_control_manager_v1)
|
||||
VWL_DESTROY_GOBJECT(ct, zwlr_data_control_manager_v1)
|
||||
}
|
||||
|
||||
// If data control protocols are available, we don't need the other global
|
||||
// objects.
|
||||
else if (VWL_GOBJECT_AVAIL(ct, ext_data_control_manager_v1)
|
||||
|| VWL_GOBJECT_AVAIL(ct, zwlr_data_control_manager_v1))
|
||||
{
|
||||
VWL_DESTROY_GOBJECT(ct, wl_data_device_manager)
|
||||
VWL_DESTROY_GOBJECT(ct, wl_shm)
|
||||
VWL_DESTROY_GOBJECT(ct, wl_compositor)
|
||||
VWL_DESTROY_GOBJECT(ct, xdg_wm_base)
|
||||
VWL_DESTROY_GOBJECT(ct, zwp_primary_selection_device_manager_v1)
|
||||
}
|
||||
|
||||
// Start responding to pings from the compositor if we have xdg_wm_base
|
||||
if (VWL_GOBJECT_AVAIL(ct, xdg_wm_base))
|
||||
xdg_wm_base_add_listener(ct->gobjects.xdg_wm_base,
|
||||
&xdg_wm_base_listener, NULL);
|
||||
#endif
|
||||
|
||||
return ct;
|
||||
}
|
||||
|
||||
@@ -544,13 +452,6 @@ vwl_connection_destroy(vwl_connection_T *self)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD
|
||||
VWL_DESTROY_GOBJECT(self, ext_data_control_manager_v1)
|
||||
VWL_DESTROY_GOBJECT(self, zwlr_data_control_manager_v1)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_DESTROY_GOBJECT(self, wl_data_device_manager)
|
||||
VWL_DESTROY_GOBJECT(self, wl_shm)
|
||||
VWL_DESTROY_GOBJECT(self, wl_compositor)
|
||||
VWL_DESTROY_GOBJECT(self, xdg_wm_base)
|
||||
VWL_DESTROY_GOBJECT(self, zwp_primary_selection_device_manager_v1)
|
||||
# endif
|
||||
# endif
|
||||
|
||||
for (int i = 0; i < self->gobjects.seats.ga_len; i++)
|
||||
@@ -592,21 +493,6 @@ vwl_connection_get_seat(vwl_connection_T *self, const char *label)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
/*
|
||||
* Get keyboard object from seat and return it. NULL is returned on
|
||||
* failure such as when a keyboard is not available for seat.
|
||||
*/
|
||||
struct wl_keyboard *
|
||||
vwl_seat_get_keyboard(vwl_seat_T *self)
|
||||
{
|
||||
if (!(self->capabilities & WL_SEAT_CAPABILITY_KEYBOARD))
|
||||
return NULL;
|
||||
|
||||
return wl_seat_get_keyboard(self->proxy);
|
||||
}
|
||||
# endif
|
||||
|
||||
#endif
|
||||
|
||||
/*
|
||||
@@ -896,27 +782,6 @@ vwl_connection_get_data_device_manager(
|
||||
if (zwlr_data_control_manager_v1_get_version(manager->proxy) >= 2)
|
||||
*supported |= WAYLAND_SELECTION_PRIMARY;
|
||||
}
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
else if (self->gobjects.wl_data_device_manager != NULL
|
||||
&& req_sel == WAYLAND_SELECTION_REGULAR)
|
||||
{
|
||||
manager->proxy = self->gobjects.wl_data_device_manager;
|
||||
manager->protocol = VWL_DATA_PROTOCOL_CORE;
|
||||
|
||||
*supported |= WAYLAND_SELECTION_REGULAR;
|
||||
}
|
||||
|
||||
if (req_sel == WAYLAND_SELECTION_PRIMARY
|
||||
&& !(*supported & WAYLAND_SELECTION_PRIMARY))
|
||||
if (self->gobjects.zwp_primary_selection_device_manager_v1 != NULL)
|
||||
{
|
||||
manager->proxy =
|
||||
self->gobjects.zwp_primary_selection_device_manager_v1;
|
||||
manager->protocol = VWL_DATA_PROTOCOL_PRIMARY;
|
||||
|
||||
*supported |= WAYLAND_SELECTION_PRIMARY;
|
||||
}
|
||||
# endif
|
||||
|
||||
if (!(*supported & req_sel))
|
||||
{
|
||||
@@ -944,16 +809,6 @@ vwl_data_device_manager_get_data_device(
|
||||
device->proxy = zwlr_data_control_manager_v1_get_data_device(
|
||||
self->proxy, seat->proxy);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
device->proxy = wl_data_device_manager_get_data_device(
|
||||
self->proxy, seat->proxy);
|
||||
break;
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
device->proxy = zwp_primary_selection_device_manager_v1_get_device(
|
||||
self->proxy, seat->proxy);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
vim_free(device);
|
||||
return NULL;
|
||||
@@ -978,17 +833,6 @@ vwl_data_device_manager_create_data_source(vwl_data_device_manager_T *self)
|
||||
source->proxy = zwlr_data_control_manager_v1_create_data_source(
|
||||
self->proxy);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
source->proxy = wl_data_device_manager_create_data_source(
|
||||
self->proxy);
|
||||
break;
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
source->proxy =
|
||||
zwp_primary_selection_device_manager_v1_create_source(
|
||||
self->proxy);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
vim_free(source);
|
||||
return NULL;
|
||||
@@ -1018,18 +862,6 @@ vwl_data_device_wrap_offer_proxy(vwl_data_device_T *self, void *proxy)
|
||||
return offer;
|
||||
}
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
# define VWL_CODE_DATA_PROXY_FS_DESTROY(type) \
|
||||
case VWL_DATA_PROTOCOL_CORE: \
|
||||
wl_data_##type##_destroy(self->proxy); \
|
||||
break; \
|
||||
case VWL_DATA_PROTOCOL_PRIMARY: \
|
||||
zwp_primary_selection_##type##_v1_destroy(self->proxy); \
|
||||
break;
|
||||
# else
|
||||
# define VWL_CODE_DATA_PROXY_FS_DESTROY(type)
|
||||
# endif
|
||||
|
||||
# define VWL_FUNC_DATA_PROXY_DESTROY(type) \
|
||||
void \
|
||||
vwl_data_##type##_destroy(vwl_data_##type##_T *self) \
|
||||
@@ -1044,7 +876,6 @@ vwl_data_device_wrap_offer_proxy(vwl_data_device_T *self, void *proxy)
|
||||
case VWL_DATA_PROTOCOL_WLR: \
|
||||
zwlr_data_control_##type##_v1_destroy(self->proxy); \
|
||||
break; \
|
||||
VWL_CODE_DATA_PROXY_FS_DESTROY(type) \
|
||||
default: \
|
||||
break; \
|
||||
} \
|
||||
@@ -1067,14 +898,6 @@ vwl_data_offer_destroy(vwl_data_offer_T *self)
|
||||
case VWL_DATA_PROTOCOL_WLR:
|
||||
zwlr_data_control_offer_v1_destroy(self->proxy);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
wl_data_offer_destroy(self->proxy);
|
||||
break;
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
zwp_primary_selection_offer_v1_destroy(self->proxy);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1147,11 +970,6 @@ VWL_FUNC_DATA_DEVICE_EVENT_DATA_OFFER(
|
||||
ext_data_control_device_v1, ext_data_control_offer_v1)
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_DATA_OFFER(
|
||||
zwlr_data_control_device_v1, zwlr_data_control_offer_v1)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_DATA_OFFER(wl_data_device, wl_data_offer)
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_DATA_OFFER(
|
||||
zwp_primary_selection_device_v1, zwp_primary_selection_offer_v1)
|
||||
# endif
|
||||
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_SELECTION(
|
||||
ext_data_control_device_v1, ext_data_control_offer_v1
|
||||
@@ -1165,13 +983,6 @@ VWL_FUNC_DATA_DEVICE_EVENT_PRIMARY_SELECTION(
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_PRIMARY_SELECTION(
|
||||
zwlr_data_control_device_v1, zwlr_data_control_offer_v1
|
||||
)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_SELECTION(
|
||||
wl_data_device, wl_data_offer
|
||||
)
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_PRIMARY_SELECTION(
|
||||
zwp_primary_selection_device_v1, zwp_primary_selection_offer_v1)
|
||||
# endif
|
||||
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_FINISHED(ext_data_control_device_v1)
|
||||
VWL_FUNC_DATA_DEVICE_EVENT_FINISHED(zwlr_data_control_device_v1)
|
||||
@@ -1192,18 +1003,6 @@ static const struct zwlr_data_control_device_v1_listener
|
||||
zwlr_data_control_device_v1_listener_event_primary_selection,
|
||||
.finished = zwlr_data_control_device_v1_listener_event_finished
|
||||
};
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
static const struct wl_data_device_listener wl_data_device_listener = {
|
||||
.data_offer = wl_data_device_listener_event_data_offer,
|
||||
.selection = wl_data_device_listener_event_selection,
|
||||
};
|
||||
static const struct zwp_primary_selection_device_v1_listener
|
||||
zwp_primary_selection_device_v1_listener = {
|
||||
.data_offer = zwp_primary_selection_device_v1_listener_event_data_offer,
|
||||
.selection =
|
||||
zwp_primary_selection_device_v1_listener_event_primary_selection,
|
||||
};
|
||||
# endif
|
||||
|
||||
# define VWL_FUNC_DATA_SOURCE_EVENT_SEND(source_type) \
|
||||
static void \
|
||||
@@ -1226,17 +1025,9 @@ static const struct zwp_primary_selection_device_v1_listener
|
||||
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_SEND(ext_data_control_source_v1)
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_SEND(zwlr_data_control_source_v1)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_SEND(wl_data_source)
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_SEND(zwp_primary_selection_source_v1)
|
||||
# endif
|
||||
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_CANCELLED(ext_data_control_source_v1)
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_CANCELLED(zwlr_data_control_source_v1)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_CANCELLED(wl_data_source)
|
||||
VWL_FUNC_DATA_SOURCE_EVENT_CANCELLED(zwp_primary_selection_source_v1)
|
||||
# endif
|
||||
|
||||
static const struct ext_data_control_source_v1_listener
|
||||
ext_data_control_source_v1_listener = {
|
||||
@@ -1248,17 +1039,6 @@ static const struct zwlr_data_control_source_v1_listener
|
||||
.send = zwlr_data_control_source_v1_listener_event_send,
|
||||
.cancelled = zwlr_data_control_source_v1_listener_event_cancelled
|
||||
};
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
static const struct wl_data_source_listener wl_data_source_listener = {
|
||||
.send = wl_data_source_listener_event_send,
|
||||
.cancelled = wl_data_source_listener_event_cancelled
|
||||
};
|
||||
static const struct zwp_primary_selection_source_v1_listener
|
||||
zwp_primary_selection_source_v1_listener = {
|
||||
.send = zwp_primary_selection_source_v1_listener_event_send,
|
||||
.cancelled = zwp_primary_selection_source_v1_listener_event_cancelled
|
||||
};
|
||||
# endif
|
||||
|
||||
# define VWL_FUNC_DATA_OFFER_EVENT_OFFER(offer_type) \
|
||||
static void \
|
||||
@@ -1282,10 +1062,6 @@ static const struct zwp_primary_selection_source_v1_listener
|
||||
|
||||
VWL_FUNC_DATA_OFFER_EVENT_OFFER(ext_data_control_offer_v1)
|
||||
VWL_FUNC_DATA_OFFER_EVENT_OFFER(zwlr_data_control_offer_v1)
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_FUNC_DATA_OFFER_EVENT_OFFER(wl_data_offer)
|
||||
VWL_FUNC_DATA_OFFER_EVENT_OFFER(zwp_primary_selection_offer_v1)
|
||||
# endif
|
||||
|
||||
static const struct ext_data_control_offer_v1_listener
|
||||
ext_data_control_offer_v1_listener = {
|
||||
@@ -1295,30 +1071,6 @@ static const struct zwlr_data_control_offer_v1_listener
|
||||
zwlr_data_control_offer_v1_listener = {
|
||||
.offer = zwlr_data_control_offer_v1_listener_event_offer
|
||||
};
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
static const struct wl_data_offer_listener
|
||||
wl_data_offer_listener = {
|
||||
.offer = wl_data_offer_listener_event_offer
|
||||
};
|
||||
static const struct zwp_primary_selection_offer_v1_listener
|
||||
zwp_primary_selection_offer_v1_listener = {
|
||||
.offer = zwp_primary_selection_offer_v1_listener_event_offer
|
||||
};
|
||||
# endif
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
# define VWL_CODE_DATA_PROXY_FS_ADD_LISTENER(type) \
|
||||
case VWL_DATA_PROTOCOL_CORE: \
|
||||
wl_data_##type##_add_listener(self->proxy, \
|
||||
&wl_data_##type##_listener, self); \
|
||||
break; \
|
||||
case VWL_DATA_PROTOCOL_PRIMARY: \
|
||||
zwp_primary_selection_##type##_v1_add_listener(self->proxy, \
|
||||
&zwp_primary_selection_##type##_v1_listener, self); \
|
||||
break;
|
||||
# else
|
||||
# define VWL_CODE_DATA_PROXY_FS_ADD_LISTENER(type)
|
||||
# endif
|
||||
|
||||
# define VWL_FUNC_DATA_PROXY_ADD_LISTENER(type) \
|
||||
void \
|
||||
@@ -1341,7 +1093,6 @@ static const struct zwp_primary_selection_offer_v1_listener
|
||||
zwlr_data_control_##type##_v1_add_listener(self->proxy, \
|
||||
&zwlr_data_control_##type##_v1_listener, self); \
|
||||
break; \
|
||||
VWL_CODE_DATA_PROXY_FS_ADD_LISTENER(type) \
|
||||
default: \
|
||||
break; \
|
||||
} \
|
||||
@@ -1350,7 +1101,6 @@ static const struct zwp_primary_selection_offer_v1_listener
|
||||
VWL_FUNC_DATA_PROXY_ADD_LISTENER(device)
|
||||
VWL_FUNC_DATA_PROXY_ADD_LISTENER(source)
|
||||
VWL_FUNC_DATA_PROXY_ADD_LISTENER(offer)
|
||||
|
||||
/*
|
||||
* Set the given selection to source. If a data control protocol is being used,
|
||||
* "serial" is ignored.
|
||||
@@ -1375,11 +1125,6 @@ vwl_data_device_set_selection(
|
||||
case VWL_DATA_PROTOCOL_WLR:
|
||||
zwlr_data_control_device_v1_set_selection(self->proxy, proxy);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
wl_data_device_set_selection(self->proxy, proxy, serial);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1398,12 +1143,6 @@ vwl_data_device_set_selection(
|
||||
self->proxy, proxy
|
||||
);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
zwp_primary_selection_device_v1_set_selection(
|
||||
self->proxy, proxy, serial);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1421,14 +1160,6 @@ vwl_data_source_offer(vwl_data_source_T *self, const char *mime_type)
|
||||
case VWL_DATA_PROTOCOL_WLR:
|
||||
zwlr_data_control_source_v1_offer(self->proxy, mime_type);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
wl_data_source_offer(self->proxy, mime_type);
|
||||
break;
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
zwp_primary_selection_source_v1_offer(self->proxy, mime_type);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
@@ -1448,14 +1179,6 @@ vwl_data_offer_receive(
|
||||
case VWL_DATA_PROTOCOL_WLR:
|
||||
zwlr_data_control_offer_v1_receive(self->proxy, mime_type, fd);
|
||||
break;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
case VWL_DATA_PROTOCOL_CORE:
|
||||
wl_data_offer_receive(self->proxy, mime_type, fd);
|
||||
break;
|
||||
case VWL_DATA_PROTOCOL_PRIMARY:
|
||||
zwp_primary_selection_offer_v1_receive(self->proxy, mime_type, fd);
|
||||
break;
|
||||
# endif
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -19,10 +19,6 @@
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD
|
||||
# include "auto/wayland/wlr-data-control-unstable-v1.h"
|
||||
# include "auto/wayland/ext-data-control-v1.h"
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
# include "auto/wayland/xdg-shell.h"
|
||||
# include "auto/wayland/primary-selection-unstable-v1.h"
|
||||
# endif
|
||||
#endif
|
||||
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD
|
||||
@@ -32,10 +28,6 @@ typedef enum {
|
||||
VWL_DATA_PROTOCOL_NONE,
|
||||
VWL_DATA_PROTOCOL_EXT,
|
||||
VWL_DATA_PROTOCOL_WLR,
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
VWL_DATA_PROTOCOL_CORE,
|
||||
VWL_DATA_PROTOCOL_PRIMARY
|
||||
# endif
|
||||
} vwl_data_protocol_T;
|
||||
|
||||
#endif // FEAT_WAYLAND_CLIPBOARD
|
||||
@@ -68,14 +60,6 @@ struct vwl_connection_S {
|
||||
#ifdef FEAT_WAYLAND_CLIPBOARD
|
||||
struct zwlr_data_control_manager_v1 *zwlr_data_control_manager_v1;
|
||||
struct ext_data_control_manager_v1 *ext_data_control_manager_v1;
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
struct wl_data_device_manager *wl_data_device_manager;
|
||||
struct wl_shm *wl_shm;
|
||||
struct wl_compositor *wl_compositor;
|
||||
struct xdg_wm_base *xdg_wm_base;
|
||||
struct zwp_primary_selection_device_manager_v1
|
||||
*zwp_primary_selection_device_manager_v1;
|
||||
# endif
|
||||
#endif
|
||||
} gobjects;
|
||||
};
|
||||
@@ -149,61 +133,6 @@ struct vwl_data_device_manager_S {
|
||||
vwl_data_protocol_T protocol;
|
||||
};
|
||||
|
||||
# ifdef FEAT_WAYLAND_CLIPBOARD_FS
|
||||
|
||||
// Dummy functions to handle keyboard events we don't care about.
|
||||
|
||||
# define VWL_FUNCS_DUMMY_KEYBOARD_EVENTS() \
|
||||
static void \
|
||||
clip_wl_fs_keyboard_listener_keymap( \
|
||||
void *data UNUSED, \
|
||||
struct wl_keyboard *keyboard UNUSED, \
|
||||
uint32_t format UNUSED, \
|
||||
int fd, \
|
||||
uint32_t size UNUSED) \
|
||||
{ \
|
||||
close(fd); \
|
||||
} \
|
||||
static void \
|
||||
clip_wl_fs_keyboard_listener_leave( \
|
||||
void *data UNUSED, \
|
||||
struct wl_keyboard *keyboard UNUSED, \
|
||||
uint32_t serial UNUSED, \
|
||||
struct wl_surface *surface UNUSED) \
|
||||
{ \
|
||||
} \
|
||||
static void \
|
||||
clip_wl_fs_keyboard_listener_key( \
|
||||
void *data UNUSED, \
|
||||
struct wl_keyboard *keyboard UNUSED, \
|
||||
uint32_t serial UNUSED, \
|
||||
uint32_t time UNUSED, \
|
||||
uint32_t key UNUSED, \
|
||||
uint32_t state UNUSED) \
|
||||
{ \
|
||||
} \
|
||||
static void \
|
||||
clip_wl_fs_keyboard_listener_modifiers( \
|
||||
void *data UNUSED, \
|
||||
struct wl_keyboard *keyboard UNUSED, \
|
||||
uint32_t serial UNUSED, \
|
||||
uint32_t mods_depressed UNUSED, \
|
||||
uint32_t mods_latched UNUSED, \
|
||||
uint32_t mods_locked UNUSED, \
|
||||
uint32_t group UNUSED) \
|
||||
{ \
|
||||
} \
|
||||
static void \
|
||||
clip_wl_fs_keyboard_listener_repeat_info( \
|
||||
void *data UNUSED, \
|
||||
struct wl_keyboard *keyboard UNUSED, \
|
||||
int32_t rate UNUSED, \
|
||||
int32_t delay UNUSED) \
|
||||
{ \
|
||||
}
|
||||
|
||||
# endif
|
||||
|
||||
#endif // FEAT_WAYLAND_CLIPBOARD
|
||||
|
||||
// Global Wayland connection. Is also set to NULL when the connection is lost.
|
||||
|
||||
Reference in New Issue
Block a user