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

Handle default colors better(?)

Browse Source
This commit is contained in:
Tae Won Ha 2016-06-29 21:35:59 +02:00
parent 47a41156f4
commit 84499e5900
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
1 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
NeoVimXpc/NeoVimXpcImpl.m
View File

@ -34,9 +34,9 @@ typedef struct {
// We declare nvim_main because it's not declared in any header files of neovim // We declare nvim_main because it's not declared in any header files of neovim
extern int nvim_main(int argc, char **argv); extern int nvim_main(int argc, char **argv);
static unsigned int default_foreground = qDefaultForeground; static unsigned int _default_foreground = qDefaultForeground;
static unsigned int default_background = qDefaultBackground; static unsigned int _default_background = qDefaultBackground;
static unsigned int default_special = qDefaultSpecial; static unsigned int _default_special = qDefaultSpecial;
// The thread in which neovim's main runs // The thread in which neovim's main runs
static uv_thread_t _nvim_thread; static uv_thread_t _nvim_thread;
@ -227,12 +227,12 @@ static void xpc_ui_highlight_set(UI *ui __unused, HlAttrs attrs) {
CellAttributes cellAttrs; CellAttributes cellAttrs;
cellAttrs.fontTrait = trait; cellAttrs.fontTrait = trait;
unsigned int fg = attrs.foreground == -1 ? default_foreground : pun_type(unsigned int, attrs.foreground); unsigned int fg = attrs.foreground == -1 ? _default_foreground : pun_type(unsigned int, attrs.foreground);
unsigned int bg = attrs.background == -1 ? default_background : pun_type(unsigned int, attrs.background); unsigned int bg = attrs.background == -1 ? _default_background : pun_type(unsigned int, attrs.background);
cellAttrs.foreground = attrs.reverse ? bg : fg; cellAttrs.foreground = attrs.reverse ? bg : fg;
cellAttrs.background = attrs.reverse ? fg : bg; cellAttrs.background = attrs.reverse ? fg : bg;
cellAttrs.special = attrs.special == -1 ? default_special : pun_type(unsigned int, attrs.special); cellAttrs.special = attrs.special == -1 ? _default_special : pun_type(unsigned int, attrs.special);
[_neo_vim_osx_ui highlightSet:cellAttrs]; [_neo_vim_osx_ui highlightSet:cellAttrs];
}); });
@ -280,9 +280,12 @@ static void xpc_ui_flush(UI *ui __unused) {
static void xpc_ui_update_fg(UI *ui __unused, int fg) { static void xpc_ui_update_fg(UI *ui __unused, int fg) {
xpc_async(^{ xpc_async(^{
// printf("update fg: %x\n", fg); // printf("update fg: %x\n", fg);
if (fg != -1) { if (fg == -1) {
default_foreground = pun_type(unsigned int, fg); [_neo_vim_osx_ui updateForeground:_default_foreground];
return;
} }
_default_foreground = pun_type(unsigned int, fg);
[_neo_vim_osx_ui updateForeground:fg]; [_neo_vim_osx_ui updateForeground:fg];
}); });
} }
@ -290,9 +293,12 @@ static void xpc_ui_update_fg(UI *ui __unused, int fg) {
static void xpc_ui_update_bg(UI *ui __unused, int bg) { static void xpc_ui_update_bg(UI *ui __unused, int bg) {
xpc_async(^{ xpc_async(^{
// printf("update bg: %x\n", bg); // printf("update bg: %x\n", bg);
if (bg != -1) { if (bg == -1) {
default_background = pun_type(unsigned int, bg); [_neo_vim_osx_ui updateBackground:_default_background];
return;
} }
_default_background = pun_type(unsigned int, bg);
[_neo_vim_osx_ui updateBackground:bg]; [_neo_vim_osx_ui updateBackground:bg];
}); });
} }
@ -300,9 +306,12 @@ static void xpc_ui_update_bg(UI *ui __unused, int bg) {
static void xpc_ui_update_sp(UI *ui __unused, int sp) { static void xpc_ui_update_sp(UI *ui __unused, int sp) {
xpc_async(^{ xpc_async(^{
// printf("update sp: %x\n", sp); // printf("update sp: %x\n", sp);
if (sp != -1) { if (sp == -1) {
default_special = pun_type(unsigned int, sp); [_neo_vim_osx_ui updateSpecial:_default_special];
return;
} }
_default_special = pun_type(unsigned int, sp);
[_neo_vim_osx_ui updateSpecial:sp]; [_neo_vim_osx_ui updateSpecial:sp];
}); });
} }