vim-patch:7.4.1557 (#5117)

Problem:    Windows cannot be identified.
Solution:   Add a unique window number to each window and functions to use it.

https://github.com/vim/vim/commit/86edef664efccbfe685906c854b9cdd04e56f2d5

1 files changed, 93 insertions, 0 deletions

diff --git a/src/nvim/window.c b/src/nvim/window.c
index e267d493bf..350b54d595 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -3683,6 +3683,8 @@ win_T *buf_jump_open_tab(buf_T *buf)
   return NULL;
 }
 
+static int last_win_id = 0;
+
 /*
  * Allocate a window structure and link it in the window list when "hidden" is
  * FALSE.
@@ -3695,6 +3697,7 @@ static win_T *win_alloc(win_T *after, int hidden)
   win_T *new_wp = xcalloc(1, sizeof(win_T));
   handle_register_window(new_wp);
   win_alloc_lines(new_wp);
+  new_wp->w_id = ++last_win_id;
 
   /* init w: variables */
   new_wp->w_vars = dict_alloc();
@@ -5674,3 +5677,93 @@ static bool frame_check_width(frame_T *topfrp, int width)
   }
   return true;
 }
+
+int win_getid(typval_T *argvars)
+{
+  if (argvars[0].v_type == VAR_UNKNOWN) {
+    return curwin->w_id;
+  }
+  int winnr = get_tv_number(&argvars[0]);
+  win_T *wp;
+  if (winnr > 0) {
+    if (argvars[1].v_type == VAR_UNKNOWN) {
+      wp = firstwin;
+    } else {
+      tabpage_T *tp;
+      int tabnr = get_tv_number(&argvars[1]);
+      for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+        if (--tabnr == 0) {
+          break;
+        }
+      }
+      if (tp == NULL) {
+        return -1;
+      }
+      wp = tp->tp_firstwin;
+    }
+    for ( ; wp != NULL; wp = wp->w_next) {
+      if (--winnr == 0) {
+        return wp->w_id;
+      }
+    }
+  }
+  return 0;
+}
+
+int win_gotoid(typval_T *argvars)
+{
+  win_T *wp;
+  tabpage_T   *tp;
+  int id = get_tv_number(&argvars[0]);
+
+  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+    for (wp = tp == curtab ? firstwin : tp->tp_firstwin;
+         wp != NULL; wp = wp->w_next) {
+      if (wp->w_id == id) {
+        goto_tabpage_win(tp, wp);
+        return 1;
+      }
+    }
+  }
+  return 0;
+}
+
+void win_id2tabwin(typval_T *argvars, list_T *list)
+{
+  win_T *wp;
+  tabpage_T   *tp;
+  int winnr = 1;
+  int tabnr = 1;
+  int id = get_tv_number(&argvars[0]);
+
+  for (tp = first_tabpage; tp != NULL; tp = tp->tp_next) {
+    for (wp = tp == curtab ? firstwin : tp->tp_firstwin;
+         wp != NULL; wp = wp->w_next) {
+      if (wp->w_id == id) {
+        list_append_number(list, tabnr);
+        list_append_number(list, winnr);
+        return;
+      }
+      winnr++;
+    }
+    tabnr++;
+    winnr = 1;
+  }
+  list_append_number(list, 0);
+  list_append_number(list, 0);
+}
+
+int win_id2win(typval_T *argvars)
+{
+  win_T   *wp;
+  int nr = 1;
+  int id = get_tv_number(&argvars[0]);
+
+  for (wp = firstwin; wp != NULL; wp = wp->w_next) {
+    if (wp->w_id == id) {
+      return nr;
+    }
+    nr++;
+  }
+  return 0;
+}