updated for version 7.3.940

Problem:    Python: Can't get position of window.
Solution:   Add window.row and window.col. (ZyX)

diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index bf21f8cc49f1d67a6240b951f89395992c8e0f62..dcdcf207fb98a5b860bc5b779e383bc7d2a18cfd 100644 (file)
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -400,6 +400,9 @@ Window attributes are:
                                This is zero in case it cannot be determined
                                (e.g. when the window object belongs to other
                                tab page).
+       row, col (read-only)    On-screen window position in display cells.
+                               First position is zero.
+
 The height attribute is writable only if the screen is split horizontally.
 The width attribute is writable only if the screen is split vertically.
 

diff --git a/src/if_py_both.h b/src/if_py_both.h
index dc9be3ad2dfa01172a82c673c12751d960b3ca97..f20f3ff5bf80c64a51eeac34fdbe7030a286b40f 100644 (file)
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -1839,9 +1839,15 @@ WindowAttr(WindowObject *this, char *name)
     }
     else if (strcmp(name, "height") == 0)
        return PyLong_FromLong((long)(this->win->w_height));
+#ifdef FEAT_WINDOWS
+    else if (strcmp(name, "row") == 0)
+       return PyLong_FromLong((long)(this->win->w_winrow));
+#endif
 #ifdef FEAT_VERTSPLIT
     else if (strcmp(name, "width") == 0)
        return PyLong_FromLong((long)(W_WIDTH(this->win)));
+    else if (strcmp(name, "col") == 0)
+       return PyLong_FromLong((long)(W_WINCOL(this->win)));
 #endif
     else if (strcmp(name, "vars") == 0)
        return DictionaryNew(this->win->w_vars);
@@ -1851,8 +1857,8 @@ WindowAttr(WindowObject *this, char *name)
     else if (strcmp(name, "number") == 0)
        return PyLong_FromLong((long) get_win_number(this->win));
     else if (strcmp(name,"__members__") == 0)
-       return Py_BuildValue("[ssssss]", "buffer", "cursor", "height", "vars",
-               "options", "number");
+       return Py_BuildValue("[ssssssss]", "buffer", "cursor", "height", "vars",
+               "options", "number", "row", "col");
     else
        return NULL;
 }

diff --git a/src/version.c b/src/version.c
index 8e311b861b455ead6f27b1f3af4e183127d54766..20239c29230d552bc4bf77fd2af483fd8f0ecdab 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    940,
 /**/
     939,
 /**/