From 72e3125f452ae7224162da8e940e20b00680d41a Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:25 -0300 Subject: API: Refactor: Move non-public files to private subdirectory --- src/nvim/api/window.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/api/window.c') diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 8e21034c40..73487d9c49 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -3,8 +3,8 @@ #include #include "nvim/api/window.h" -#include "nvim/api/defs.h" -#include "nvim/api/helpers.h" +#include "nvim/api/private/defs.h" +#include "nvim/api/private/helpers.h" #include "nvim/vim.h" #include "nvim/window.h" #include "nvim/screen.h" -- cgit From f70f9bfac1ae62828d222bc6ccb528e6e93be523 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:42 -0300 Subject: API: Refactor: Change the integer type of remote objects to uint64_t --- src/nvim/api/window.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/nvim/api/window.c') diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 73487d9c49..8b31d8e9fc 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -19,7 +19,8 @@ Buffer window_get_buffer(Window window, Error *err) return 0; } - return win->w_buffer->b_fnum; + assert(win->w_buffer->b_fnum >= 0); + return (uint64_t)win->w_buffer->b_fnum; } Position window_get_cursor(Window window, Error *err) -- cgit From a842fe4dc1e0624a6332ee0fef40517e7925dfb4 Mon Sep 17 00:00:00 2001 From: Thiago de Arruda Date: Fri, 23 May 2014 15:49:44 -0300 Subject: API: Refactor: Return handles instead of indexes - Define specialized arrays for each remote object type - Implement msgpack_rpc functions for dealing with the new types - Refactor all functions dealing with buffers, windows and tabpages to return/accept handles instead of list indexes. --- src/nvim/api/window.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'src/nvim/api/window.c') diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c index 8b31d8e9fc..8bd8316477 100644 --- a/src/nvim/api/window.c +++ b/src/nvim/api/window.c @@ -19,8 +19,7 @@ Buffer window_get_buffer(Window window, Error *err) return 0; } - assert(win->w_buffer->b_fnum >= 0); - return (uint64_t)win->w_buffer->b_fnum; + return win->w_buffer->handle; } Position window_get_cursor(Window window, Error *err) @@ -193,8 +192,14 @@ Position window_get_position(Window window, Error *err) Tabpage window_get_tabpage(Window window, Error *err) { - set_api_error("Not implemented", err); - return 0; + Tabpage rv = 0; + win_T *win = find_window(window, err); + + if (win) { + rv = win_find_tabpage(win)->handle; + } + + return rv; } Boolean window_is_valid(Window window) -- cgit