multigrid: reorganize types and global varaibles

1 files changed, 3 insertions, 32 deletions

diff --git a/src/nvim/types.h b/src/nvim/types.h
index 6d39caab50..f803b45e27 100644
--- a/src/nvim/types.h
+++ b/src/nvim/types.h
@@ -13,38 +13,9 @@ typedef unsigned char char_u;
 // Can hold one decoded UTF-8 character.
 typedef uint32_t u8char_T;
 
-typedef struct expand expand_T;
-
-#define MAX_MCO        6                 // maximum value for 'maxcombine'
-
-
-// The characters and attributes cached for the screen.
-typedef char_u schar_T[(MAX_MCO+1) * 4 + 1];
-typedef int16_t sattr_T;
-
-// TODO(bfredl): find me a good home
-typedef int GridHandle;
-typedef struct {
-  GridHandle handle;
+// Opaque handle used by API clients to refer to various objects in vim
+typedef int handle_T;
 
-  schar_T  *ScreenLines;
-  sattr_T  *ScreenAttrs;
-  unsigned *LineOffset;
-  char_u   *LineWraps;
-
-  // the size of the allocated grid
-  int Rows;
-  int Columns;
-
-  // offsets for the grid relative to the screen
-  int OffsetRow;
-  int OffsetColumn;
-
-  // the size expected to be allocated to the internal grid
-  int internal_rows;
-  int internal_columns;
-
-  int was_resized;
-} ScreenGrid;
+typedef struct expand expand_T;
 
 #endif  // NVIM_TYPES_H