diff options
| author | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
|---|---|---|
| committer | Josh Rahm <joshuarahm@gmail.com> | 2023-11-29 22:39:54 +0000 |
| commit | 21cb7d04c387e4198ca8098a884c78b56ffcf4c2 (patch) | |
| tree | 84fe5690df1551f0bb2bdfe1a13aacd29ebc1de7 /src/nvim/ugrid.h | |
| parent | d9c904f85a23a496df4eb6be42aa43f007b22d50 (diff) | |
| parent | 4a8bf24ac690004aedf5540fa440e788459e5e34 (diff) | |
| download | rneovim-colorcolchar.tar.gz rneovim-colorcolchar.tar.bz2 rneovim-colorcolchar.zip | |
Merge remote-tracking branch 'upstream/master' into colorcolcharcolorcolchar
Diffstat (limited to 'src/nvim/ugrid.h')
| -rw-r--r-- | src/nvim/ugrid.h | 28 |
1 files changed, 7 insertions, 21 deletions
diff --git a/src/nvim/ugrid.h b/src/nvim/ugrid.h index a85a6fb4a8..54cd33e58f 100644 --- a/src/nvim/ugrid.h +++ b/src/nvim/ugrid.h @@ -1,30 +1,17 @@ -#ifndef NVIM_UGRID_H -#define NVIM_UGRID_H +#pragma once -#include "nvim/globals.h" -#include "nvim/grid_defs.h" -#include "nvim/ui.h" +#include "nvim/types_defs.h" -struct ucell; -struct ugrid; - -typedef struct ucell UCell; -typedef struct ugrid UGrid; - -#define CELLBYTES (sizeof(schar_T)) - -struct ucell { - char data[CELLBYTES + 1]; +typedef struct ucell { + schar_T data; sattr_T attr; -}; +} UCell; -struct ugrid { +typedef struct ugrid { int row, col; int width, height; UCell **cells; -}; - -// -V:UGRID_FOREACH_CELL:625 +} UGrid; #define UGRID_FOREACH_CELL(grid, row, startcol, endcol, code) \ do { \ @@ -39,4 +26,3 @@ struct ugrid { #ifdef INCLUDE_GENERATED_DECLARATIONS # include "ugrid.h.generated.h" #endif -#endif // NVIM_UGRID_H |