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

GH-666 WIP

Browse Source
This commit is contained in:
Tae Won Ha 2018-08-02 11:46:01 +02:00
parent 62ee80a850
commit 14cfd67457
No known key found for this signature in database
GPG Key ID: E40743465B5B8B44
2 changed files with 20 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
NvimView/NvimServer/server_ui.m
View File

@ -405,7 +405,9 @@ static void server_ui_scroll(UI *ui __unused, Integer count) {
});
}
static void server_ui_highlight_set(UI *ui __unused, HlAttrs attrs) {
static void server_ui_hl_attr_define(
UI *ui __unused, Integer id, HlAttrs attrs, HlAttrs cterm_attrs __unused, Array info __unused
) {
var trait = FontTraitNone;
if (attrs.rgb_ae_attr & HL_ITALIC) {
trait |= FontTraitItalic;
@ -419,19 +421,15 @@ static void server_ui_highlight_set(UI *ui __unused, HlAttrs attrs) {
if (attrs.rgb_ae_attr & HL_UNDERCURL) {
trait |= FontTraitUndercurl;
}
CellAttributes cellAttrs;
cellAttrs.fontTrait = trait;
let fg = attrs.rgb_fg_color == -1 ? _default_foreground : attrs.rgb_fg_color;
let bg = attrs.rgb_bg_color == -1 ? _default_background : attrs.rgb_bg_color;
cellAttrs.foreground = attrs.rgb_ae_attr & HL_INVERSE ? bg : fg;
cellAttrs.background = attrs.rgb_ae_attr & HL_INVERSE ? fg : bg;
cellAttrs.special = attrs.rgb_sp_color == -1 ? _default_special : pun_type(unsigned int, attrs.rgb_sp_color);
pack_flush_data(RenderDataTypeHighlight, ^(msgpack_packer *packer) {
msgpack_pack_bin(packer, sizeof(cellAttrs));
msgpack_pack_bin_body(packer, &cellAttrs, sizeof(cellAttrs));
send_msg_packing(NvimServerMsgIdHighlightAttrs, ^(msgpack_packer *packer) {
msgpack_pack_array(packer, 6);
msgpack_pack_int64(packer, id);
msgpack_pack_uint64(packer, trait);
msgpack_pack_int32(packer, attrs.rgb_fg_color);
msgpack_pack_int32(packer, attrs.rgb_bg_color);
msgpack_pack_int32(packer, attrs.rgb_sp_color);
msgpack_pack_bool(packer, (bool) (attrs.rgb_ae_attr & HL_INVERSE));
});
}
@ -475,43 +473,6 @@ static void server_ui_visual_bell(UI *ui __unused) {
[_neovim_server sendMessageWithId:NvimServerMsgIdVisualBell];
}
static void server_ui_update_fg(UI *ui __unused, Integer fg) {
@autoreleasepool {
if (fg != -1) {
_default_foreground = fg;
}
send_msg_packing(NvimServerMsgIdSetForeground, ^(msgpack_packer *packer) {
msgpack_pack_int64(packer, _default_foreground);
});
}
}
static void server_ui_update_bg(UI *ui __unused, Integer bg) {
@autoreleasepool {
if (bg != -1) {
_default_background = bg;
}
send_msg_packing(NvimServerMsgIdSetBackground, ^(msgpack_packer *packer) {
msgpack_pack_int64(packer, _default_background);
});
}
}
static void server_ui_update_sp(UI *ui __unused, Integer sp) {
@autoreleasepool {
if (sp != -1) {
_default_special = sp;
}
send_msg_packing(NvimServerMsgIdSetSpecial, ^(msgpack_packer *packer) {
msgpack_pack_int64(packer, _default_special);
});
}
}
static void server_ui_default_colors_set(
UI *ui __unused, Integer rgb_fg, Integer rgb_bg, Integer rgb_sp, Integer cterm_fg, Integer cterm_bg
) {
@ -581,6 +542,9 @@ static void server_ui_stop(UI *ui __unused) {
void custom_ui_start(void) {
UI *ui = xcalloc(1, sizeof(UI));
memset(ui->ui_ext, 0, sizeof(ui->ui_ext));
ui->ui_ext[kUINewgrid] = true;
ui->rgb = true;
ui->stop = server_ui_stop;
ui->resize = server_ui_resize;
@ -596,14 +560,11 @@ void custom_ui_start(void) {
ui->mode_change = server_ui_mode_change;
ui->set_scroll_region = server_ui_set_scroll_region;
ui->scroll = server_ui_scroll;
ui->highlight_set = server_ui_highlight_set;
ui->hl_attr_define = server_ui_hl_attr_define;
ui->default_colors_set = server_ui_default_colors_set;
ui->put = server_ui_put;
ui->bell = server_ui_bell;
ui->visual_bell = server_ui_visual_bell;
ui->update_fg = server_ui_update_fg;
ui->update_bg = server_ui_update_bg;
ui->update_sp = server_ui_update_sp;
ui->flush = server_ui_flush;
ui->suspend = NULL;
ui->set_title = server_ui_set_title;

11
NvimView/SharedTypes.h
View File

@ -16,9 +16,10 @@ typedef NS_ENUM(NSUInteger, FontTrait) {
typedef struct {
FontTrait fontTrait;
NSInteger foreground;
NSInteger background;
NSInteger special;
int32_t foreground;
int32_t background;
int32_t special;
bool reverse;
} CellAttributes;
// Keep in sync with ModeShape enum in cursor_shape.h.
@ -74,9 +75,7 @@ typedef NS_ENUM(NSInteger, NvimServerMsgId) {
NvimServerMsgIdBell,
NvimServerMsgIdVisualBell,
NvimServerMsgIdFlush,
NvimServerMsgIdSetForeground,
NvimServerMsgIdSetBackground,
NvimServerMsgIdSetSpecial,
NvimServerMsgIdHighlightAttrs,
NvimServerMsgIdSetTitle,
NvimServerMsgIdStop,
NvimServerMsgIdOptionSet,