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

Make cursor drawing a bit better

Browse Source 
- we still have to overhaul the cursor drawing, this is just a temporary
  fix...
This commit is contained in:
Tae Won Ha 2016-07-11 19:37:06 +02:00
parent e362dbc711
commit 97cc6e4ad5
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SwiftNeoVim/NeoVimView.swift
View File

@ -207,8 +207,8 @@ public class NeoVimView: NSView {
private func drawCursor(background: UInt32) {
// FIXME: for now do some rudimentary cursor drawing
let cursorPosition = self.grid.screenCursor
// Swift.print("\(#function): \(cursorPosition)")
let cursorPosition = self.grid.putPosition
// NSLog("\(#function): \(cursorPosition)")
var cursorRect = self.cellRectFor(row: cursorPosition.row, column: cursorPosition.column)
if self.grid.isNextCellEmpty(cursorPosition) {

14
SwiftNeoVim/NeoVimViewUiBridge.swift
View File

@ -46,8 +46,10 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
DispatchUtils.gui {
// NSLog("\(#function): \(position), \(screenCursor)")
self.setNeedsDisplay(cellPosition: self.grid.screenCursor) // redraw where the cursor was till now
self.setNeedsDisplay(screenCursor: screenCursor) // draw the new cursor
// Because neovim fills blank space with "Space" and when we enter "Space" we don't get the puts.
self.setNeedsDisplay(cellPosition: self.grid.putPosition)
self.setNeedsDisplay(cellPosition: self.grid.nextCellPosition(self.grid.putPosition))
self.setNeedsDisplay(screenCursor: position)
self.grid.goto(position)
self.grid.moveCursor(screenCursor)
@ -99,7 +101,9 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
// NSLog("\(#function): \(curPos) -> \(string)")
self.grid.put(string)
self.setNeedsDisplay(cellPosition: curPos)
// When the cursor is in the command line, then we need this...
self.setNeedsDisplay(cellPosition: self.grid.nextCellPosition(curPos))
self.setNeedsDisplay(screenCursor: self.grid.screenCursor)
}
}
@ -111,6 +115,8 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
self.grid.putMarkedText(markedText)
self.setNeedsDisplay(position: curPos)
// When the cursor is in the command line, then we need this...
self.setNeedsDisplay(cellPosition: self.grid.nextCellPosition(curPos))
if markedText.characters.count == 0 {
self.setNeedsDisplay(position: self.grid.previousCellPosition(curPos))
}
@ -141,7 +147,7 @@ extension NeoVimView: NeoVimUiBridgeProtocol {
}
public func flush() {
// Swift.print("\(self.grid)")
// NSLog("\(#function)")
}
public func updateForeground(fg: Int32) {