Merge e45ee5adf8 into c18d7941ef

Also enable caching for dependencies.

Closes https://github.com/neovim/neovim/issues/28670

CMakeLists.txt

@@ -50,11 +50,6 @@ file(GLOB DOCFILES CONFIGURE_DEPENDS ${PROJECT_SOURCE_DIR}/runtime/doc/*.txt)
 set_directory_properties(PROPERTIES
   EP_PREFIX "${DEPS_BUILD_DIR}")
 
-find_program(CCACHE_PRG ccache)
-if(CCACHE_PRG)
-  set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CCACHE_PRG})
-endif()
-
 if(NOT CI_BUILD)
   set(CMAKE_INSTALL_MESSAGE NEVER)
 endif()

cmake/Deps.cmake

@@ -23,6 +23,12 @@ if(POLICY CMP0092)
   list(APPEND DEPS_CMAKE_ARGS -D CMAKE_POLICY_DEFAULT_CMP0092=NEW)
 endif()
 
+find_program(CACHE_PRG NAMES ccache sccache)
+if(CACHE_PRG)
+  set(CMAKE_C_COMPILER_LAUNCHER ${CMAKE_COMMAND} -E env CCACHE_SLOPPINESS=pch_defines,time_macros ${CACHE_PRG})
+  list(APPEND DEPS_CMAKE_CACHE_ARGS -DCMAKE_C_COMPILER_LAUNCHER:STRING=${CMAKE_C_COMPILER_LAUNCHER})
+endif()
+
 # MAKE_PRG
 if(UNIX)
   find_program(MAKE_PRG NAMES gmake make)
@@ -58,7 +64,8 @@ function(get_externalproject_options name DEPS_IGNORE_SHA)
 
   set(EXTERNALPROJECT_OPTIONS
     DOWNLOAD_NO_PROGRESS TRUE
-    EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL})
+    EXTERNALPROJECT_OPTIONS URL ${${name_allcaps}_URL}
+    CMAKE_CACHE_ARGS ${DEPS_CMAKE_CACHE_ARGS})
 
   if(NOT ${DEPS_IGNORE_SHA})
     list(APPEND EXTERNALPROJECT_OPTIONS URL_HASH SHA256=${${name_allcaps}_SHA256})

src/nvim/api/ui_events.in.h

@@ -35,6 +35,10 @@ void set_title(String title)
   FUNC_API_SINCE(3);
 void set_icon(String icon)
   FUNC_API_SINCE(3);
+void set_cursor(void)
+  FUNC_API_SINCE(3);
+void reset_cursor(void)
+  FUNC_API_SINCE(3);
 void screenshot(String path)
   FUNC_API_SINCE(7);
 void option_set(String name, Object value)

src/nvim/buffer.c

@@ -1740,6 +1740,7 @@ void enter_buffer(buf_T *buf)
     curwin->w_topfill = 0;
     apply_autocmds(EVENT_BUFENTER, NULL, NULL, false, curbuf);
     apply_autocmds(EVENT_BUFWINENTER, NULL, NULL, false, curbuf);
+    ui_call_set_cursor();
   }
 
   // If autocommands did not change the cursor position, restore cursor lnum

src/nvim/cursor_shape.h

@@ -29,7 +29,7 @@ typedef enum {
 typedef enum {
   SHAPE_BLOCK     = 0,       ///< block cursor
   SHAPE_HOR       = 1,       ///< horizontal bar cursor
-  SHAPE_VER       = 2,  ///< vertical bar cursor
+  SHAPE_VER       = 2,       ///< vertical bar cursor
 } CursorShape;
 
 #define MSHAPE_NUMBERED 1000    // offset for shapes identified by number

src/nvim/drawscreen.c

@@ -844,6 +844,7 @@ void setcursor_mayforce(win_T *wp, bool force)
 
     grid_adjust(&grid, &row, &col);
     ui_grid_cursor_goto(grid->handle, row, col);
+    ui_call_reset_cursor();
   }
 }
 

src/nvim/tui/tui.c

@@ -1193,6 +1193,17 @@ void tui_mode_info_set(TUIData *tui, bool guicursor_enabled, Array args)
   tui_set_mode(tui, tui->showing_mode);
 }
 
+void tui_set_cursor(TUIData *tui)
+{
+  tui_set_mode(tui, tui->showing_mode);
+}
+
+void tui_reset_cursor(TUIData *tui)
+{
+  unibi_out_ext(tui, tui->unibi_ext.reset_cursor_color);
+  unibi_out_ext(tui, tui->unibi_ext.reset_cursor_style);
+}
+
 void tui_update_menu(TUIData *tui)
 {
   // Do nothing; menus are for GUI only