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

GH-666 WIP

Browse Source
This commit is contained in:
Tae Won Ha 2018-09-03 07:50:36 +02:00
parent 7c997589a9
commit 779071c2b5
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NvimView/NvimView.xcodeproj/project.pbxproj
View File

@ -56,7 +56,7 @@
4B90F0421FD2AFAE008A39E0 /* NvimView+UiBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0241FD2AFAD008A39E0 /* NvimView+UiBridge.swift */; }; 4B90F0421FD2AFAE008A39E0 /* NvimView+UiBridge.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0241FD2AFAD008A39E0 /* NvimView+UiBridge.swift */; };
4B90F0431FD2AFAE008A39E0 /* NvimView+MenuItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0251FD2AFAD008A39E0 /* NvimView+MenuItems.swift */; }; 4B90F0431FD2AFAE008A39E0 /* NvimView+MenuItems.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0251FD2AFAD008A39E0 /* NvimView+MenuItems.swift */; };
4B90F0451FD2AFAE008A39E0 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0271FD2AFAD008A39E0 /* Logger.swift */; }; 4B90F0451FD2AFAE008A39E0 /* Logger.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0271FD2AFAD008A39E0 /* Logger.swift */; };
4B90F0461FD2AFAE008A39E0 /* Grid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0281FD2AFAD008A39E0 /* Grid.swift */; }; 4B90F0461FD2AFAE008A39E0 /* OldGrid.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0281FD2AFAD008A39E0 /* OldGrid.swift */; };
4B90F0521FD2AFD3008A39E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0511FD2AFD3008A39E0 /* main.m */; }; 4B90F0521FD2AFD3008A39E0 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0511FD2AFD3008A39E0 /* main.m */; };
4B90F0661FD2AFF7008A39E0 /* server_ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0561FD2AFF7008A39E0 /* server_ui.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; }; 4B90F0661FD2AFF7008A39E0 /* server_ui.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F0561FD2AFF7008A39E0 /* server_ui.m */; settings = {COMPILER_FLAGS = "-fno-objc-arc"; }; };
4B90F0681FD2AFF7008A39E0 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F05A1FD2AFF7008A39E0 /* CocoaCategories.m */; }; 4B90F0681FD2AFF7008A39E0 /* CocoaCategories.m in Sources */ = {isa = PBXBuildFile; fileRef = 4B90F05A1FD2AFF7008A39E0 /* CocoaCategories.m */; };
@ -210,7 +210,7 @@
4B90F0241FD2AFAD008A39E0 /* NvimView+UiBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NvimView+UiBridge.swift"; sourceTree = "<group>"; }; 4B90F0241FD2AFAD008A39E0 /* NvimView+UiBridge.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NvimView+UiBridge.swift"; sourceTree = "<group>"; };
4B90F0251FD2AFAD008A39E0 /* NvimView+MenuItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NvimView+MenuItems.swift"; sourceTree = "<group>"; }; 4B90F0251FD2AFAD008A39E0 /* NvimView+MenuItems.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "NvimView+MenuItems.swift"; sourceTree = "<group>"; };
4B90F0271FD2AFAD008A39E0 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; }; 4B90F0271FD2AFAD008A39E0 /* Logger.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Logger.swift; sourceTree = "<group>"; };
4B90F0281FD2AFAD008A39E0 /* Grid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Grid.swift; sourceTree = "<group>"; }; 4B90F0281FD2AFAD008A39E0 /* OldGrid.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = OldGrid.swift; sourceTree = "<group>"; };
4B90F04F1FD2AFD3008A39E0 /* NvimServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = NvimServer; sourceTree = BUILT_PRODUCTS_DIR; }; 4B90F04F1FD2AFD3008A39E0 /* NvimServer */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = NvimServer; sourceTree = BUILT_PRODUCTS_DIR; };
4B90F0511FD2AFD3008A39E0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; 4B90F0511FD2AFD3008A39E0 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
4B90F0561FD2AFF7008A39E0 /* server_ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_ui.m; sourceTree = "<group>"; }; 4B90F0561FD2AFF7008A39E0 /* server_ui.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = server_ui.m; sourceTree = "<group>"; };
@ -355,7 +355,7 @@
4B90F0081FD2AF59008A39E0 /* Info.plist */, 4B90F0081FD2AF59008A39E0 /* Info.plist */,
4B8662E41FDC3D4F007F490D /* vimr.vim */, 4B8662E41FDC3D4F007F490D /* vimr.vim */,
4BF18C5C1FD2EEE400DF95D1 /* NvimView.h */, 4BF18C5C1FD2EEE400DF95D1 /* NvimView.h */,
4B90F0281FD2AFAD008A39E0 /* Grid.swift */, 4B90F0281FD2AFAD008A39E0 /* OldGrid.swift */,
4B90F01F1FD2AFAD008A39E0 /* InputTestView.swift */, 4B90F01F1FD2AFAD008A39E0 /* InputTestView.swift */,
4B90F0121FD2AFAC008A39E0 /* KeyUtils.swift */, 4B90F0121FD2AFAC008A39E0 /* KeyUtils.swift */,
4B90F0271FD2AFAD008A39E0 /* Logger.swift */, 4B90F0271FD2AFAD008A39E0 /* Logger.swift */,
@ -621,7 +621,7 @@
files = ( files = (
4B90F03F1FD2AFAE008A39E0 /* NvimView+Draw.swift in Sources */, 4B90F03F1FD2AFAE008A39E0 /* NvimView+Draw.swift in Sources */,
4B90F02F1FD2AFAE008A39E0 /* NvimView+Resize.swift in Sources */, 4B90F02F1FD2AFAE008A39E0 /* NvimView+Resize.swift in Sources */,
4B90F0461FD2AFAE008A39E0 /* Grid.swift in Sources */, 4B90F0461FD2AFAE008A39E0 /* OldGrid.swift in Sources */,
4B90F0421FD2AFAE008A39E0 /* NvimView+UiBridge.swift in Sources */, 4B90F0421FD2AFAE008A39E0 /* NvimView+UiBridge.swift in Sources */,
4BD874302014C2600039888E /* NvimAutoCommandEvent.generated.swift in Sources */, 4BD874302014C2600039888E /* NvimAutoCommandEvent.generated.swift in Sources */,
4B90F02E1FD2AFAE008A39E0 /* NvimView.swift in Sources */, 4B90F02E1FD2AFAE008A39E0 /* NvimView.swift in Sources */,

7
NvimView/NvimView/NvimView.swift
View File

@ -332,11 +332,12 @@ public class NvimView: NSView,
let bridge: UiBridge let bridge: UiBridge
let api = RxNeovimApi.Api() let api = RxNeovimApi.Api()
let grid = Grid()
let ugrid = UGrid()
let ugrid = UGrid()
let cellAttributesCollection = CellAttributesCollection() let cellAttributesCollection = CellAttributesCollection()
let runDrawer: AttributesRunDrawer let runDrawer: AttributesRunDrawer
let typesetter = Typesetter()
var baselineOffset = CGFloat(0)
var markedText: String? var markedText: String?
@ -377,6 +378,4 @@ public class NvimView: NSView,
// MARK: - Private // MARK: - Private
private var _linespacing = NvimView.defaultLinespacing private var _linespacing = NvimView.defaultLinespacing
let typesetter = Typesetter()
var baselineOffset = CGFloat(0)
} }

1
NvimView/NvimView/Grid.swift → NvimView/NvimView/OldGrid.swift
View File

@ -31,6 +31,7 @@ struct Cell: CustomStringConvertible {
} }
} }
// FIXME: GH-666: Delete
/// Almost a verbatim copy of ugrid.c of NeoVim /// Almost a verbatim copy of ugrid.c of NeoVim
class Grid: CustomStringConvertible { class Grid: CustomStringConvertible {