qvacua/vimr
1
1
Fork 0
mirror of https://github.com/qvacua/vimr.git synced 2024-11-24 03:25:03 +03:00
Code Issues Projects Releases Wiki Activity

Add NvimViewDelegate for menu item key equivalent handling

Browse Source
This commit is contained in:
Tae Won Ha 2021-12-23 14:16:37 +01:00
parent 9b35ebb3be
commit d442e6021b
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
2 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
NvimView/Sources/NvimView/NvimView+Key.swift
View File

@ -78,8 +78,21 @@ public extension NvimView {
override func performKeyEquivalent(with event: NSEvent) -> Bool {
if event.type != .keyDown { return false }
// Cocoa first calls this method to ask whether a subview implements the key equivalent
// in question. For example, if we have ⌘-. as shortcut for a menu item, which is the case
// for "Tools -> Focus Neovim View" by default, at some point in the event processing chain
// this method will be called. If we want to forward the event to Neovim because the user
// could have set it for some action, that menu item shortcut will not work. To work around
// this, we ask NvimViewDelegate whether the event is a shortcut of a menu item. The delegate
// has to be implemented by the user of NvimView.
if self.delegate?.isMenuItemKeyEquivalent(event) == true { return false }
let flags = event.modifierFlags.intersection(.deviceIndependentFlagsMask)
// Emoji menu: Cmd-Ctrl-Space
if flags.contains([.command, .control]), event.keyCode == spaceKeyChar { return false }
// <C-Tab> & <C-S-Tab> do not trigger keyDown events.
// Catch the key event here and pass it to keyDown.
// By rogual in NeoVim dot app:
@ -89,13 +102,10 @@ public extension NvimView {
return true
}
// Emoji menu: Cmd-Ctrl-Space
if flags.contains([.command, .control]), event.keyCode == 49 { return false }
// Space key (especially in combination with modifiers) can result in
// unexpected chars (e.g. ctrl-space = \0), so catch the event early and
// pass it to keyDown.
if event.keyCode == 49 {
if event.keyCode == spaceKeyChar {
self.keyDown(with: event)
return true
}
@ -315,3 +325,5 @@ public extension NvimView {
string.replacingOccurrences(of: "<", with: self.wrapNamedKeys("lt"))
}
}
private let spaceKeyChar = 49

6
NvimView/Sources/NvimView/NvimView.swift
View File

@ -11,6 +11,10 @@ import RxPack
import RxSwift
import Tabs
public protocol NvimViewDelegate {
func isMenuItemKeyEquivalent(_: NSEvent) -> Bool
}
public class NvimView: NSView,
UiBridgeConsumer,
NSUserInterfaceValidations,
@ -29,6 +33,8 @@ public class NvimView: NSView,
public static let minLinespacing = 0.5.cgf
public static let maxLinespacing = 8.cgf
public var delegate: NvimViewDelegate?
public let usesCustomTabBar: Bool
public let tabBar: TabBar<TabEntry>?