3 files changed, 26 insertions, 28 deletions

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 380de12c89..383e13fd92 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -447,9 +447,9 @@ void buffer_insert(Buffer buffer, Integer lnum, Array lines, Error *err)
 /// @param name The mark's name
 /// @param[out] err Details of an error that may have occurred
 /// @return The (row, col) tuple
-Position buffer_get_mark(Buffer buffer, String name, Error *err)
+Array buffer_get_mark(Buffer buffer, String name, Error *err)
 {
-  Position rv = POSITION_INIT;
+  Array rv = ARRAY_DICT_INIT;
   buf_T *buf = find_buffer_by_handle(buffer, err);
 
   if (!buf) {
@@ -479,8 +479,9 @@ Position buffer_get_mark(Buffer buffer, String name, Error *err)
     return rv;
   }
 
-  rv.row = posp->lnum;
-  rv.col = posp->col;
+  ADD(rv, INTEGER_OBJ(posp->lnum));
+  ADD(rv, INTEGER_OBJ(posp->col));
+
   return rv;
 }
 
diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index 689594f231..11800ed786 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -8,7 +8,6 @@
 #define ARRAY_DICT_INIT {.size = 0, .items = NULL}
 #define STRING_INIT {.data = NULL, .size = 0}
 #define OBJECT_INIT { .type = kObjectTypeNil }
-#define POSITION_INIT { .row = 0, .col = 0 }
 #define REMOTE_TYPE(type) typedef uint64_t type
 
 // Basic types
@@ -33,10 +32,6 @@ REMOTE_TYPE(Tabpage);
 typedef struct object Object;
 
 typedef struct {
-  Integer row, col;
-} Position;
-
-typedef struct {
   Object *items;
   size_t size, capacity;
 } Array;
@@ -52,7 +47,6 @@ typedef enum {
 // The following comments are markers that msgpack-gen.lua uses to extract
 // types, don't remove!
 // start custom types
-  kObjectTypePosition,
   kObjectTypeBuffer,
   kObjectTypeWindow,
   kObjectTypeTabpage,
@@ -69,7 +63,6 @@ typedef enum {
 struct object {
   ObjectType type;
   union {
-    Position position;
     Buffer buffer;
     Window window;
     Tabpage tabpage;
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 1ab441bed3..967d8acda4 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -33,14 +33,14 @@ Buffer window_get_buffer(Window window, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return the (row, col) tuple
-Position window_get_cursor(Window window, Error *err)
+Array window_get_cursor(Window window, Error *err)
 {
-  Position rv = POSITION_INIT;
+  Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
 
   if (win) {
-    rv.row = win->w_cursor.lnum;
-    rv.col = win->w_cursor.col;
+    ADD(rv, INTEGER_OBJ(win->w_cursor.lnum));
+    ADD(rv, INTEGER_OBJ(win->w_cursor.col));
   }
 
   return rv;
@@ -51,31 +51,35 @@ Position window_get_cursor(Window window, Error *err)
 /// @param window The window handle
 /// @param pos the (row, col) tuple representing the new position
 /// @param[out] err Details of an error that may have occurred
-void window_set_cursor(Window window, Position pos, Error *err)
+void window_set_cursor(Window window, Array pos, Error *err)
 {
   win_T *win = find_window_by_handle(window, err);
 
-  if (!win) {
+  if (pos.size != 2 || pos.items[0].type != kObjectTypeInteger ||
+      pos.items[1].type != kObjectTypeInteger) {
+    set_api_error("\"pos\" argument must be a [row, col] array", err);
     return;
   }
 
-  if (pos.row <= 0 || pos.row > win->w_buffer->b_ml.ml_line_count) {
-    set_api_error("cursor position outside buffer", err);
+  if (!win) {
     return;
   }
 
-  if (pos.row > LONG_MAX || pos.row < LONG_MIN) {
-    set_api_error("Row value outside range", err);
+  int64_t row = pos.items[0].data.integer;
+  int64_t col = pos.items[1].data.integer;
+
+  if (row <= 0 || row > win->w_buffer->b_ml.ml_line_count) {
+    set_api_error("cursor position outside buffer", err);
     return;
   }
 
-  if (pos.col > INT_MAX || pos.col < INT_MIN) {
+  if (col > MAXCOL || col < 0) {
     set_api_error("Column value outside range", err);
     return;
   }
 
-  win->w_cursor.lnum = (linenr_T)pos.row;
-  win->w_cursor.col = (colnr_T)pos.col;
+  win->w_cursor.lnum = (linenr_T)row;
+  win->w_cursor.col = (colnr_T)col;
   win->w_cursor.coladd = 0;
   // When column is out of range silently correct it.
   check_cursor_col_win(win);
@@ -243,14 +247,14 @@ void window_set_option(Window window, String name, Object value, Error *err)
 /// @param window The window handle
 /// @param[out] err Details of an error that may have occurred
 /// @return The (row, col) tuple with the window position
-Position window_get_position(Window window, Error *err)
+Array window_get_position(Window window, Error *err)
 {
-  Position rv = POSITION_INIT;
+  Array rv = ARRAY_DICT_INIT;
   win_T *win = find_window_by_handle(window, err);
 
   if (win) {
-    rv.col = win->w_wincol;
-    rv.row = win->w_winrow;
+    ADD(rv, INTEGER_OBJ(win->w_winrow));
+    ADD(rv, INTEGER_OBJ(win->w_wincol));
   }
 
   return rv;