upgrade libvterm

Author: jixiuf

CMakeLists.txt

@@ -36,6 +36,11 @@ if (USE_SYSTEM_LIBVTERM)
   # vterm.h is found.
   if (LIBVTERM_INCLUDE_DIR)
     message(STATUS "System libvterm detected")
+    execute_process(COMMAND  grep -c "VTermStringFragment" "${LIBVTERM_INCLUDE_DIR}/vterm.h" OUTPUT_VARIABLE VTermStringFragmentExists)
+    if (${VTermStringFragmentExists} EQUAL "0")
+#    add_compile_definitions(VTermStringFragmentNotExists)
+    add_definitions(-DVTermStringFragmentNotExists)
+    endif()
   else()
     message(STATUS "System libvterm not found: libvterm will be downloaded and compiled as part of the build process")
   endif()
@@ -58,7 +63,7 @@ else()
 
   ExternalProject_add(libvterm
     GIT_REPOSITORY https://github.com/neovim/libvterm.git
-    GIT_TAG 65dbda3ed214f036ee799d18b2e693a833a0e591
+    GIT_TAG 54c03b21f763fa775a4c0643a9d8326342873179
     CONFIGURE_COMMAND ""
     BUILD_COMMAND ${LIBVTERM_BUILD_COMMAND} "CFLAGS='-fPIC'"
     BUILD_IN_SOURCE ON

vterm-module.c

@@ -609,8 +609,7 @@ static bool is_key(unsigned char *key, size_t len, char *key_description) {
           memcmp(key, key_description, len) == 0);
 }
 
-static void term_set_title(Term *term, char *title) {
-  size_t len = strlen(title);
+static void term_set_title(Term *term, const char *title, size_t len) {
   if (term->title) {
     free(term->title);
   }
@@ -640,7 +639,11 @@ static int term_settermprop(VTermProp prop, VTermValue *val, void *user_data) {
 
     break;
   case VTERM_PROP_TITLE:
-    term_set_title(term, val->string);
+#ifdef VTermStringFragmentNotExists
+    term_set_title(term, val->string, strlen(val->string));
+#else
+    term_set_title(term, val->string.str, val->string.len);
+#endif
     break;
   case VTERM_PROP_ALTSCREEN:
     invalidate_terminal(term, 0, term->height);
@@ -923,8 +926,13 @@ void term_finalize(void *object) {
   vterm_free(term->vt);
   free(term);
 }
-
+#ifdef VTermStringFragmentNotExists
 static int osc_callback(const char *command, size_t cmdlen, void *user) {
+#else
+static int osc_callback(int cmd, VTermStringFragment frag, void *user) {
+  const char *command = frag.str;
+  size_t cmdlen = frag.len;
+#endif
   /* osc_callback (OSC = Operating System Command) */
 
   /* We interpret escape codes that start with "51;" */
@@ -976,6 +984,7 @@ static int osc_callback(const char *command, size_t cmdlen, void *user) {
   return 0;
 }
 
+#ifdef VTermStringFragmentNotExists
 static VTermParserCallbacks parser_callbacks = {
     .text = NULL,
     .control = NULL,
@@ -984,6 +993,14 @@ static VTermParserCallbacks parser_callbacks = {
     .osc = &osc_callback,
     .dcs = NULL,
 };
+#else
+static VTermStateFallbacks parser_callbacks = {
+    .control = NULL,
+    .csi = NULL,
+    .osc = &osc_callback,
+    .dcs = NULL,
+};
+#endif
 
 emacs_value Fvterm_new(emacs_env *env, ptrdiff_t nargs, emacs_value args[],
                        void *data) {