Merge pull request #10798 from bfredl/multifix

multigrid: fixes

src/nvim/api/ui_events.in.h

@@ -100,7 +100,7 @@ void raw_line(Integer grid, Integer row, Integer startcol,
 void event(char *name, Array args, bool *args_consumed)
   FUNC_API_NOEXPORT;
 
-void win_pos(Integer grid, Integer win, Integer startrow,
+void win_pos(Integer grid, Window win, Integer startrow,
              Integer startcol, Integer width, Integer height)
   FUNC_API_SINCE(6) FUNC_API_REMOTE_ONLY;
 void win_float_pos(Integer grid, Window win, String anchor, Integer anchor_grid,

src/nvim/highlight.c

@@ -233,6 +233,7 @@ int hl_get_underline(void)
           .rgb_fg_color = -1,
           .rgb_bg_color = -1,
           .rgb_sp_color = -1,
+          .hl_blend = -1,
       },
       .kind = kHlUI,
       .id1 = 0,
@@ -427,6 +428,8 @@ int hl_blend_attrs(int back_attr, int front_attr, bool *through)
   cattrs.rgb_bg_color = rgb_blend(ratio, battrs.rgb_bg_color,
                                   fattrs.rgb_bg_color);
 
+  cattrs.hl_blend = -1;  // blend property was consumed
+
   HlKind kind = *through ? kHlBlendThrough : kHlBlend;
   id = get_attr_entry((HlEntry){ .attr = cattrs, .kind = kind,
                                  .id1 = back_attr, .id2 = front_attr });
@@ -614,6 +617,10 @@ Dictionary hlattrs2dict(HlAttrs ae, bool use_rgb)
     }
   }
 
+  if (ae.hl_blend > -1) {
+      PUT(hl, "blend", INTEGER_OBJ(ae.hl_blend));
+  }
+
   return hl;
 }
 

src/nvim/terminal.c

@@ -662,6 +662,7 @@ void terminal_get_line_attributes(Terminal *term, win_T *wp, int linenr,
         .rgb_fg_color = vt_fg,
         .rgb_bg_color = vt_bg,
         .rgb_sp_color = -1,
+        .hl_blend = -1,
       });
     }