From 442cd0672b567cce56dd45e731ec1cc3b71b7cf4 Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 20 Nov 2015 18:47:20 +0000 Subject: [PATCH 1/2] Enable focus events in cmdline and terminal modes This change adds switch cases for K_FOCUSGAINED and K_FOCUSLOST to the input handling functions in ex_getln.c and terminal.c. The handling is identical to what's found in edit.c (just calling apply_autocmds). If one enters cmdline-mode by feeding `:` and sends a focuslost event (by leaving the window for example) the text `` will be inserted into the command line. There is similar behaviour in terminal mode. This patch corrects this behavior to fire the apropriate autocmd instead. Fixes #3714 --- src/nvim/ex_getln.c | 8 +++ src/nvim/terminal.c | 8 +++ test/functional/terminal/tui_spec.lua | 77 +++++++++++++++++++++++++++ 3 files changed, 93 insertions(+) diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c index 52292128d8..cbaf15e38d 100644 --- a/src/nvim/ex_getln.c +++ b/src/nvim/ex_getln.c @@ -1448,6 +1448,14 @@ static int command_line_handle_key(CommandLineState *s) } return command_line_not_changed(s); + case K_FOCUSGAINED: // Neovim has been given focus + apply_autocmds(EVENT_FOCUSGAINED, NULL, NULL, false, curbuf); + return command_line_not_changed(s); + + case K_FOCUSLOST: // Neovim has lost focus + apply_autocmds(EVENT_FOCUSLOST, NULL, NULL, false, curbuf); + return command_line_not_changed(s); + default: // Normal character with no special meaning. Just set mod_mask // to 0x0 so that typing Shift-Space in the GUI doesn't enter diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c index 119ee2c5b3..adf3f725a2 100644 --- a/src/nvim/terminal.c +++ b/src/nvim/terminal.c @@ -402,6 +402,14 @@ static int terminal_execute(VimState *state, int key) TerminalState *s = (TerminalState *)state; switch (key) { + case K_FOCUSGAINED: // Neovim has been given focus + apply_autocmds(EVENT_FOCUSGAINED, NULL, NULL, false, curbuf); + break; + + case K_FOCUSLOST: // Neovim has lost focus + apply_autocmds(EVENT_FOCUSLOST, NULL, NULL, false, curbuf); + break; + case K_LEFTMOUSE: case K_LEFTDRAG: case K_LEFTRELEASE: diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 9a1fdfca55..92cd9567d2 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -5,6 +5,7 @@ local helpers = require('test.functional.helpers') local thelpers = require('test.functional.terminal.helpers') local feed = thelpers.feed_data local execute = helpers.execute +local nvim_dir = helpers.nvim_dir describe('tui', function() local screen @@ -150,8 +151,11 @@ describe('tui', function() end) it('can handle focus events', function() + execute('set noshowmode') execute('autocmd FocusGained * echo "gained"') execute('autocmd FocusLost * echo "lost"') + + -- In normal mode feed('\x1b[I') screen:expect([[ {1: } | @@ -173,6 +177,79 @@ describe('tui', function() lost | -- TERMINAL -- | ]]) + + -- In insert mode + feed('i') + feed('\x1b[I') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + gained | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + lost | + -- TERMINAL -- | + ]]) + + -- In command-line mode + feed('\x1b') + feed(':') + feed('\x1b[I') + screen:expect([[ + | + ~ | + ~ | + ~ | + [No Name] | + g{1:a}ined | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + | + ~ | + ~ | + ~ | + [No Name] | + l{1:o}st | + -- TERMINAL -- | + ]]) + + -- In terminal mode + execute('set shell='..nvim_dir..'/shell-test') + execute('set laststatus=0') + feed('\x1b') + execute('terminal') + feed('\x1b[I') + screen:expect([[ + ready $ | + [Process exited 0]{1: } | + | + | + | + gained | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + ready $ | + [Process exited 0]{1: } | + | + | + | + lost | + -- TERMINAL -- | + ]]) end) end) From 6329fd420eec1f1325be2131726e82e23da3e90b Mon Sep 17 00:00:00 2001 From: Joe Hermaszewski Date: Fri, 20 Nov 2015 23:09:30 +0000 Subject: [PATCH 2/2] Reorganize focus events test into individual tests The focus event tests now live in their own `describe` block with each test testing the handling of focus events in a single mode. --- test/functional/terminal/tui_spec.lua | 211 +++++++++++++------------- 1 file changed, 109 insertions(+), 102 deletions(-) diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua index 92cd9567d2..3c79bc1fdb 100644 --- a/test/functional/terminal/tui_spec.lua +++ b/test/functional/terminal/tui_spec.lua @@ -149,108 +149,6 @@ describe('tui', function() -- TERMINAL -- | ]]) end) - - it('can handle focus events', function() - execute('set noshowmode') - execute('autocmd FocusGained * echo "gained"') - execute('autocmd FocusLost * echo "lost"') - - -- In normal mode - feed('\x1b[I') - screen:expect([[ - {1: } | - ~ | - ~ | - ~ | - [No Name] | - gained | - -- TERMINAL -- | - ]]) - - feed('\x1b[O') - screen:expect([[ - {1: } | - ~ | - ~ | - ~ | - [No Name] | - lost | - -- TERMINAL -- | - ]]) - - -- In insert mode - feed('i') - feed('\x1b[I') - screen:expect([[ - {1: } | - ~ | - ~ | - ~ | - [No Name] | - gained | - -- TERMINAL -- | - ]]) - feed('\x1b[O') - screen:expect([[ - {1: } | - ~ | - ~ | - ~ | - [No Name] | - lost | - -- TERMINAL -- | - ]]) - - -- In command-line mode - feed('\x1b') - feed(':') - feed('\x1b[I') - screen:expect([[ - | - ~ | - ~ | - ~ | - [No Name] | - g{1:a}ined | - -- TERMINAL -- | - ]]) - feed('\x1b[O') - screen:expect([[ - | - ~ | - ~ | - ~ | - [No Name] | - l{1:o}st | - -- TERMINAL -- | - ]]) - - -- In terminal mode - execute('set shell='..nvim_dir..'/shell-test') - execute('set laststatus=0') - feed('\x1b') - execute('terminal') - feed('\x1b[I') - screen:expect([[ - ready $ | - [Process exited 0]{1: } | - | - | - | - gained | - -- TERMINAL -- | - ]]) - feed('\x1b[O') - screen:expect([[ - ready $ | - [Process exited 0]{1: } | - | - | - | - lost | - -- TERMINAL -- | - ]]) - end) end) describe('tui with non-tty file descriptors', function() @@ -276,3 +174,112 @@ describe('tui with non-tty file descriptors', function() ]]) end) end) + +describe('tui focus event handling', function() + before_each(function() + helpers.clear() + screen = thelpers.screen_setup(0, '["'..helpers.nvim_prog..'", "-u", "NONE", "-i", "NONE", "--cmd", "set noswapfile"]') + execute('autocmd FocusGained * echo "gained"') + execute('autocmd FocusLost * echo "lost"') + end) + + it('can handle focus events in normal mode', function() + feed('\x1b[I') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + gained | + -- TERMINAL -- | + ]]) + + feed('\x1b[O') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + lost | + -- TERMINAL -- | + ]]) + end) + + it('can handle focus events in insert mode', function() + execute('set noshowmode') + feed('i') + feed('\x1b[I') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + gained | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + {1: } | + ~ | + ~ | + ~ | + [No Name] | + lost | + -- TERMINAL -- | + ]]) + end) + + it('can handle focus events in cmdline mode', function() + feed(':') + feed('\x1b[I') + screen:expect([[ + | + ~ | + ~ | + ~ | + [No Name] | + g{1:a}ined | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + | + ~ | + ~ | + ~ | + [No Name] | + l{1:o}st | + -- TERMINAL -- | + ]]) + end) + + it('can handle focus events in terminal mode', function() + execute('set shell='..nvim_dir..'/shell-test') + execute('set laststatus=0') + execute('set noshowmode') + execute('terminal') + feed('\x1b[I') + screen:expect([[ + ready $ | + [Process exited 0]{1: } | + | + | + | + gained | + -- TERMINAL -- | + ]]) + feed('\x1b[O') + screen:expect([[ + ready $ | + [Process exited 0]{1: } | + | + | + | + lost | + -- TERMINAL -- | + ]]) + end) +end)