Skip to content

Commit da2ae5b

Browse files
vim91vim91
authored
Merge branch 'skywind3000:master' into master
2 parents d4159fa + 0e51541 commit da2ae5b

File tree

6 files changed

+263
-9
lines changed

6 files changed

+263
-9
lines changed

‎autoload/quickui/command.vim‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -198,6 +198,8 @@ let s:quickui.context = {
198198
"----------------------------------------------------------------------
199199
function! s:sub_terminal(opts, argv) abort
200200
let cmd = a:opts.cmdline
201+
" echom printf("cmd is '%s', type: %d", cmd, type(cmd))
202+
" echom a:opts
201203
return quickui#terminal#open(cmd, a:opts)
202204
endfunc
203205

‎autoload/quickui/context.vim‎

Lines changed: 193 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,199 @@ function! quickui#context#open(textlist, opts)
692692
endfunc
693693

694694

695+
"----------------------------------------------------------------------
696+
" open the context window and wait for selection
697+
"----------------------------------------------------------------------
698+
function! s:context_wait(textlist, opts) abort
699+
let border = get(a:opts, 'border', g:quickui#style#border)
700+
let ignore_case = get(a:opts, 'ignore_case', 1)
701+
let hwnd = quickui#context#compile(a:textlist, border)
702+
let cwnd = quickui#window#new()
703+
let w = hwnd.width
704+
let h = hwnd.height
705+
let hwnd.index = get(a:opts, 'index', -1)
706+
let hwnd.opts = a:opts
707+
let opts = {'w':w, 'h':h, 'border':0}
708+
if has_key(a:opts, 'x') && has_key(a:opts, 'y')
709+
let opts.x = a:opts.x
710+
let opts.y = a:opts.y
711+
else
712+
let pos = quickui#core#around_cursor(w, h)
713+
let opts.y = pos[0] - 1
714+
let opts.x = pos[1] - 1
715+
endif
716+
let opts.z = get(a:opts, 'z', 500)
717+
let opts.color = get(a:opts, 'color', 'QuickBG')
718+
let hwnd.direct = get(a:opts, 'direct', 0)
719+
if hwnd.direct == 0
720+
let hwnd.direct = (opts.x <= (&columns / 2))? 1 : -1
721+
endif
722+
call cwnd.open(hwnd.image, opts)
723+
call cwnd.show(1)
724+
let keymap = quickui#utils#keymap()
725+
let keymap['J'] = 'BOTTOM'
726+
let keymap['K'] = 'TOP'
727+
let hwnd.code = 0
728+
let hwnd.state = 1
729+
let hwnd.keymap = keymap
730+
let hwnd.hotkey = {}
731+
for item in hwnd.items
732+
if item.enable != 0 && item.key_pos >= 0
733+
let key = ignore_case ? tolower(item.key_char) : item.key_char
734+
if get(a:opts, 'reserve', 0) == 0
735+
let hwnd.hotkey[key] = item.index
736+
elseif get(g:, 'quickui_protect_hjkl', 0) != 0
737+
let hwnd.hotkey[key] = item.index
738+
else
739+
if key != 'h' && key != 'j' && key != 'k' && key != 'l'
740+
let hwnd.hotkey[key] = item.index
741+
endif
742+
endif
743+
endif
744+
endfor
745+
let hwnd.winid = cwnd.winid
746+
let retval = -1
747+
while 1
748+
noautocmd call quickui#context#update(hwnd)
749+
redraw
750+
try
751+
let code = getchar()
752+
catch /^Vim:Interrupt$/
753+
let code = "\<C-C>"
754+
endtry
755+
let ch = (type(code) == v:t_number)? nr2char(code) : code
756+
if ch == "\<ESC>" || ch == "\<c-c>"
757+
break
758+
elseif ch == " " || ch == "\<cr>"
759+
let index = hwnd.index
760+
if index >= 0 && index < len(hwnd.items)
761+
let item = hwnd.items[index]
762+
if item.is_sep == 0 && item.enable != 0
763+
let retval = index
764+
break
765+
endif
766+
endif
767+
elseif ch == "\<LeftMouse>"
768+
let pos = cwnd.mouse_click()
769+
if pos.x < 0
770+
break
771+
else
772+
let x1 = (hwnd.border == 0)? 0 : 1
773+
let x2 = (hwnd.border == 0)? w : (w - 1)
774+
let ii = (hwnd.border == 0)? pos.y : (pos.y - 1)
775+
if pos.x >= x1 && pos.x < x2
776+
if ii >= 0 && ii < len(hwnd.items)
777+
let item = hwnd.items[ii]
778+
if item.is_sep == 0 && item.enable != 0
779+
let hwnd.index = ii
780+
let retval = ii
781+
noautocmd call quickui#context#update(hwnd)
782+
redraw
783+
break
784+
endif
785+
endif
786+
endif
787+
endif
788+
elseif has_key(hwnd.hotkey, ch)
789+
let hr = hwnd.hotkey[ch]
790+
if hr >= 0
791+
let hwnd.index = hr
792+
let retval = hr
793+
break
794+
endif
795+
elseif has_key(hwnd.keymap, ch)
796+
let key = hwnd.keymap[ch]
797+
if key == 'ESC'
798+
break
799+
elseif key == 'UP'
800+
let hwnd.index = s:cursor_move(hwnd, hwnd.index, -1)
801+
elseif key == 'DOWN'
802+
let hwnd.index = s:cursor_move(hwnd, hwnd.index, 1)
803+
elseif key == 'TOP'
804+
let hwnd.index = s:cursor_move(hwnd, hwnd.index, 'TOP')
805+
elseif key == 'BOTTOM'
806+
let hwnd.index = s:cursor_move(hwnd, hwnd.index, 'BOTTOM')
807+
endif
808+
endif
809+
endwhile
810+
noautocmd call quickui#context#update(hwnd)
811+
let hr = ''
812+
if retval >= 0 && retval < len(hwnd.items)
813+
let item = hwnd.items[retval]
814+
if item.is_sep == 0 && item.enable != 0
815+
let hwnd.index = retval
816+
if !has_key(item, 'child')
817+
let hr = item.cmd
818+
else
819+
let child = item.child
820+
let cc = quickui#context#compile(child, border)
821+
let cw = cc.width
822+
let ch = cc.height
823+
unlet cc
824+
let op = {}
825+
let op.z = opts.z + 1
826+
let op.y = opts.y + retval
827+
let op.y = (op.y + ch > &lines)? (&lines - ch) : op.y
828+
let op.y = (op.y < 0)? 0 : op.y
829+
for i in range(5)
830+
if hwnd.direct >= 0
831+
let tx = opts.x + opts.w
832+
if tx + cw > &columns
833+
let hwnd.direct = -1
834+
else
835+
let op.x = tx
836+
break
837+
endif
838+
elseif hwnd.direct < 0
839+
let tx = opts.x - cw
840+
if tx < 0
841+
let hwnd.direct = 1
842+
else
843+
let op.x = tx
844+
break
845+
endif
846+
endif
847+
endfor
848+
if !has_key(op, 'x')
849+
let op.x = 1
850+
endif
851+
let op.direct = hwnd.direct
852+
let op.border = get(a:opts, 'border', border)
853+
let hr = s:context_wait(child, op)
854+
endif
855+
endif
856+
endif
857+
let g:quickui#context#cursor = hwnd.index
858+
let g:quickui#context#current = hwnd
859+
call cwnd.close()
860+
unlet cwnd
861+
return hr
862+
endfunc
863+
864+
865+
"----------------------------------------------------------------------
866+
" open the context window and wait for selection
867+
"----------------------------------------------------------------------
868+
function! quickui#context#wait(textlist, opts) abort
869+
return s:context_wait(a:textlist, a:opts)
870+
endfunc
871+
872+
873+
"----------------------------------------------------------------------
874+
" open context menu and execute commands
875+
"----------------------------------------------------------------------
876+
function! quickui#context#open_nested(textlist, opts) abort
877+
let cmd = s:context_wait(a:textlist, a:opts)
878+
if has_key(a:opts, 'callback')
879+
call a:opts.callback(0)
880+
endif
881+
if cmd != ''
882+
exec cmd
883+
endif
884+
endfunc
885+
886+
887+
695888
"----------------------------------------------------------------------
696889
" testing suit
697890
"----------------------------------------------------------------------

‎autoload/quickui/palette.vim‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
" palette.vim -
44
"
55
" Created by skywind on 2021/12/23
6-
" Last Modified: 2021/12/23 13:29:47
6+
" Last Modified: 2022/09/25 01:31
77
"
88
"======================================================================
99

@@ -461,7 +461,7 @@ endfunc
461461

462462

463463
"----------------------------------------------------------------------
464-
" optimize if possible: achieve 30x times faster
464+
" optimize if possible: achieve 40x times faster
465465
"----------------------------------------------------------------------
466466
if has('vim9script')
467467
import './palette9.vim'

‎autoload/quickui/tools.vim‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -432,7 +432,7 @@ function! quickui#tools#clever_context(name, content, opts)
432432
let opts.keep_name = a:name
433433
let opts.callback = function('s:remember_cursor_context')
434434
let content = quickui#context#reduce_items(a:content)
435-
call quickui#context#open(content, opts)
435+
call quickui#context#open_nested(content, opts)
436436
endfunc
437437

438438
function! quickui#tools#clever_listbox(name, content, opts)

‎autoload/quickui/utils.vim‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,26 @@
1515
"----------------------------------------------------------------------
1616
function! quickui#utils#item_parse(description)
1717
let obj = {'text':'', 'key_pos':-1, 'key_char':'', 'is_sep':0, 'help':''}
18-
let obj.info = []
1918
let text = ''
19+
let child = 0
2020
if type(a:description) == v:t_string
2121
let text = a:description
2222
let obj.help = ''
2323
let obj.cmd = ''
24-
let obj.info = [ text ]
2524
elseif type(a:description) == v:t_list
2625
let size = len(a:description)
2726
let text = (size >= 1)? a:description[0] : ''
28-
let obj.cmd = (size >= 2)? a:description[1] : ''
2927
let obj.help = (size >= 3)? a:description[2] : ''
30-
let obj.info = deepcopy(a:description)
28+
let obj.cmd = ''
29+
if size >= 2
30+
if type(a:description[1]) == v:t_string
31+
let obj.cmd = a:description[1]
32+
elseif type(a:description[1]) == v:t_list
33+
let obj.cmd = ''
34+
let obj.child = a:description[1]
35+
let child = 1
36+
endif
37+
endif
3138
endif
3239
if text =~ '^-\+$'
3340
let obj.is_sep = 1
@@ -44,6 +51,7 @@ function! quickui#utils#item_parse(description)
4451
let obj.enable = 0
4552
endif
4653
let pos = stridx(text, "\t")
54+
let sep = ">"
4755
if pos < 0
4856
let obj.text = text
4957
let obj.desc = ""
@@ -52,6 +60,7 @@ function! quickui#utils#item_parse(description)
5260
let obj.desc = strpart(text, pos + 1)
5361
let obj.desc = substitute(obj.desc, "\t", " ", "g")
5462
endif
63+
let obj.desc = (child == 0)? obj.desc : sep
5564
let text = obj.text
5665
let rest = ''
5766
let start = 0

‎autoload/quickui/window.vim‎

Lines changed: 52 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,11 +73,12 @@ function! s:window.__prepare_opts(textlist, opts)
7373
let sum_pad = pad[0] + pad[1] + pad[2] + pad[3]
7474
let info.has_padding = (sum_pad > 0)? 1 : 0
7575
let border = quickui#core#border_auto(self.opts.border)
76-
let info.has_border = (len(border) > 0)? 1 : 0
76+
let info.has_border = (self.opts.border > 0)? 1 : 0
7777
if info.has_border != 0
7878
let info.tw += 2
7979
let info.th += 2
8080
endif
81+
" echom info
8182
call self.set_text(a:textlist)
8283
if opts.h < 0
8384
let opts.h = len(self.text)
@@ -179,7 +180,7 @@ function! s:window.__vim_create()
179180
let opts.callback = function('s:popup_exit')
180181
let opts.highlight = self.opts.color
181182
let border = quickui#core#border_auto(self.opts.border)
182-
if len(border) > 0
183+
if self.info.has_border
183184
let opts.borderchars = border
184185
let opts.border = [1,1,1,1,1,1,1,1,1]
185186
let bc = get(self.opts, 'bordercolor', 'QuickBorder')
@@ -690,6 +691,55 @@ function! s:window.syntax_region(color, x1, y1, x2, y2)
690691
endfunc
691692

692693

694+
"----------------------------------------------------------------------
695+
" click window
696+
"----------------------------------------------------------------------
697+
function! s:window.mouse_click()
698+
let winid = self.winid
699+
let retval = {'x':-1, 'y':-1}
700+
if g:quickui#core#has_nvim == 0
701+
let pos = getmousepos()
702+
if pos.winid != winid
703+
return retval
704+
endif
705+
if self.info.has_border == 0
706+
let retval.x = pos.column - 1
707+
let retval.y = pos.line - 1
708+
else
709+
let retval.x = pos.column - 2
710+
let retval.y = pos.line - 2
711+
endif
712+
else
713+
if v:mouse_winid != winid
714+
return retval
715+
endif
716+
if self.info.has_border == 0
717+
let retval.x = v:mouse_col - 1
718+
let retval.y = v:mouse_lnum - 1
719+
else
720+
let retval.x = v:mouse_col - 2
721+
let retval.y = v:mouse_lnum - 2
722+
endif
723+
endif
724+
return retval
725+
endfunc
726+
727+
728+
"----------------------------------------------------------------------
729+
" refresh redraw
730+
"----------------------------------------------------------------------
731+
function! s:window.refresh()
732+
let winid = self.winid
733+
if g:quickui#core#has_nvim == 0
734+
if winid >= 0
735+
call popup_setoptions(winid, {})
736+
endif
737+
else
738+
endif
739+
redraw
740+
endfunc
741+
742+
693743
"----------------------------------------------------------------------
694744
" constructor
695745
"----------------------------------------------------------------------

0 commit comments

Comments
 (0)