fix #121 Cursor position does not update properly when vterm is showing in another frame

3 files changed, 23 insertions, 18 deletions

diff --git a/elisp.c b/elisp.c
index c6d3ed8..bffeb5e 100644
--- a/elisp.c
+++ b/elisp.c
@@ -100,8 +100,9 @@ emacs_value buffer_line_number(emacs_env *env) {
   return env->funcall(env, Fbuffer_line_number, 0, (emacs_value[]){});
 }
 
-emacs_value get_buffer_window(emacs_env *env) {
-  return env->funcall(env, Fget_buffer_window, 0, (emacs_value[]){});
+emacs_value get_buffer_window_list(emacs_env *env) {
+  return env->funcall(env, Fget_buffer_window_list, 3,
+                      (emacs_value[]){Qnil, Qnil, Qt});
 }
 
 emacs_value selected_window(emacs_env *env) {
diff --git a/elisp.h b/elisp.h
index 3cfd319..c5f7e6d 100644
--- a/elisp.h
+++ b/elisp.h
@@ -43,7 +43,7 @@ emacs_value Fpoint;
 emacs_value Fput_text_property;
 emacs_value Fset;
 emacs_value Fvterm_flush_output;
-emacs_value Fget_buffer_window;
+emacs_value Fget_buffer_window_list;
 emacs_value Fselected_window;
 emacs_value Fvterm_set_title;
 emacs_value Fvterm_set_directory;
@@ -74,7 +74,7 @@ void set_window_point(emacs_env *env, emacs_value win, emacs_value point);
 emacs_value point(emacs_env *env);
 bool eq(emacs_env *env, emacs_value e1, emacs_value e2);
 void forward_char(emacs_env *env, emacs_value n);
-emacs_value get_buffer_window(emacs_env *env);
+emacs_value get_buffer_window_list(emacs_env *env);
 emacs_value selected_window(emacs_env *env);
 void set_title(emacs_env *env, emacs_value string);
 void set_directory(emacs_env *env, emacs_value string);
diff --git a/vterm-module.c b/vterm-module.c
index 0c3e5b0..a82cf2e 100644
--- a/vterm-module.c
+++ b/vterm-module.c
@@ -301,20 +301,24 @@ static void adjust_topline(Term *term, emacs_env *env, long added) {
 
   bool following = buffer_lnum == cursor_lnum + added; // cursor at end?
 
-  emacs_value window = get_buffer_window(env);
+  emacs_value windows = get_buffer_window_list(env);
   emacs_value swindow = selected_window(env);
-
-  if (eq(env, window, swindow)) {
-    if (following) {
-      // "Follow" the terminal output
-      recenter(env, env->make_integer(
-                        env, -1)); /* make current line at the screen bottom */
+  int winnum = env->extract_integer(env, length(env, windows));
+  for (int i = 0; i < winnum; i++) {
+    emacs_value window = nth(env, i, windows);
+    if (eq(env, window, swindow)) {
+      if (following) {
+        // "Follow" the terminal output
+        recenter(env,
+                 env->make_integer(
+                     env, -1)); /* make current line at the screen bottom */
+      } else {
+        recenter(env, env->make_integer(env, pos.row));
+      }
     } else {
-      recenter(env, env->make_integer(env, pos.row));
-    }
-  } else {
-    if (env->is_not_nil(env, window)) {
-      set_window_point(env, window, point(env));
+      if (env->is_not_nil(env, window)) {
+        set_window_point(env, window, point(env));
+      }
     }
   }
 }
@@ -843,8 +847,8 @@ int emacs_module_init(struct emacs_runtime *ert) {
       env->make_global_ref(env, env->intern(env, "set-window-point"));
   Fpoint = env->make_global_ref(env, env->intern(env, "point"));
   Fforward_char = env->make_global_ref(env, env->intern(env, "forward-char"));
-  Fget_buffer_window =
-      env->make_global_ref(env, env->intern(env, "get-buffer-window"));
+  Fget_buffer_window_list =
+      env->make_global_ref(env, env->intern(env, "get-buffer-window-list"));
   Fselected_window =
       env->make_global_ref(env, env->intern(env, "selected-window"));