1 files changed, 59 insertions, 8 deletions

diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index aad72af025..4fe3e1157c 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -8,10 +8,11 @@
 #include <string.h>
 
 #include "nvim/ascii.h"
-#include "nvim/aucmd.h"
+#include "nvim/autocmd.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
 #include "nvim/cursor_shape.h"
+#include "nvim/msgpack_rpc/channel.h"
 #include "nvim/diff.h"
 #include "nvim/event/loop.h"
 #include "nvim/ex_cmds2.h"
@@ -23,7 +24,6 @@
 #include "nvim/main.h"
 #include "nvim/mbyte.h"
 #include "nvim/memory.h"
-#include "nvim/misc1.h"
 #include "nvim/move.h"
 #include "nvim/normal.h"
 #include "nvim/option.h"
@@ -223,10 +223,23 @@ void ui_refresh(void)
 
   ui_default_colors_set();
 
-  int save_p_lz = p_lz;
-  p_lz = false;  // convince redrawing() to return true ...
-  screen_resize(width, height);
-  p_lz = save_p_lz;
+  if (!ui_client_channel_id) {
+    int save_p_lz = p_lz;
+    p_lz = false;  // convince redrawing() to return true ...
+    screen_resize(width, height);
+    p_lz = save_p_lz;
+  } else {
+    Array args = ARRAY_DICT_INIT;
+    Error err = ERROR_INIT;
+    ADD(args, INTEGER_OBJ((int)width));
+    ADD(args, INTEGER_OBJ((int)height));
+    rpc_send_call(ui_client_channel_id, "nvim_ui_try_resize", args, &err);
+
+    if (ERROR_SET(&err)) {
+      ELOG("ui_client resize: %s", err.msg);
+    }
+    api_clear_error(&err);
+  }
 
   if (ext_widgets[kUIMessages]) {
     p_ch = 0;
@@ -300,6 +313,44 @@ void ui_busy_stop(void)
   }
 }
 
+/// Emit a bell or visualbell as a warning
+///
+/// val is one of the BO_ values, e.g., BO_OPER
+void vim_beep(unsigned val)
+{
+  called_vim_beep = true;
+
+  if (emsg_silent == 0) {
+    if (!((bo_flags & val) || (bo_flags & BO_ALL))) {
+      static int beeps = 0;
+      static uint64_t start_time = 0;
+
+      // Only beep up to three times per half a second,
+      // otherwise a sequence of beeps would freeze Vim.
+      if (start_time == 0 || os_hrtime() - start_time > 500000000u) {
+        beeps = 0;
+        start_time = os_hrtime();
+      }
+      beeps++;
+      if (beeps <= 3) {
+        if (p_vb) {
+          ui_call_visual_bell();
+        } else {
+          ui_call_bell();
+        }
+      }
+    }
+
+    // When 'debug' contains "beep" produce a message.  If we are sourcing
+    // a script or executing a function give the user a hint where the beep
+    // comes from.
+    if (vim_strchr(p_debug, 'e') != NULL) {
+      msg_source(HL_ATTR(HLF_W));
+      msg_attr(_("Beep!"), HL_ATTR(HLF_W));
+    }
+  }
+}
+
 void ui_attach_impl(UI *ui, uint64_t chanid)
 {
   if (ui_count == MAX_UI_COUNT) {
@@ -602,8 +653,8 @@ void ui_grid_resize(handle_T grid_handle, int width, int height, Error *error)
     }
   } else {
     // non-positive indicates no request
-    wp->w_height_request = (int)MAX(height, 0);
-    wp->w_width_request = (int)MAX(width, 0);
+    wp->w_height_request = MAX(height, 0);
+    wp->w_width_request = MAX(width, 0);
     win_set_inner_size(wp);
   }
 }