diff options
author | Josh Rahm <joshuarahm@gmail.com> | 2024-03-09 14:57:57 -0700 |
---|---|---|
committer | Josh Rahm <joshuarahm@gmail.com> | 2024-03-09 14:57:57 -0700 |
commit | c324271b99eee4c621463f368914d57cd729bd9c (patch) | |
tree | 5d979d333a2d5f9c080991d5482fd5916f8579c6 /src/nvim/grid.h | |
parent | 931bffbda3668ddc609fc1da8f9eb576b170aa52 (diff) | |
parent | ade1b12f49c3b3914c74847d791eb90ea90b56b7 (diff) | |
download | rneovim-c324271b99eee4c621463f368914d57cd729bd9c.tar.gz rneovim-c324271b99eee4c621463f368914d57cd729bd9c.tar.bz2 rneovim-c324271b99eee4c621463f368914d57cd729bd9c.zip |
Merge remote-tracking branch 'upstream/master' into userreg
Diffstat (limited to 'src/nvim/grid.h')
-rw-r--r-- | src/nvim/grid.h | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/nvim/grid.h b/src/nvim/grid.h index 9d8e395dae..7506f0fc9d 100644 --- a/src/nvim/grid.h +++ b/src/nvim/grid.h @@ -2,13 +2,11 @@ #include <stdbool.h> #include <stddef.h> // IWYU pragma: keep -#include <string.h> -#include "nvim/buffer_defs.h" -#include "nvim/grid_defs.h" // IWYU pragma: export +#include "nvim/grid_defs.h" // IWYU pragma: keep #include "nvim/macros_defs.h" -#include "nvim/mbyte.h" #include "nvim/pos_defs.h" +#include "nvim/types_defs.h" /// By default, all windows are drawn on a single rectangular grid, represented by /// this ScreenGrid instance. In multigrid mode each window will have its own @@ -42,18 +40,6 @@ EXTERN char *linebuf_scratch INIT( = NULL); # define schar_from_ascii(x) ((schar_T)(x)) #endif -/// Put a unicode character in a screen cell. -static inline schar_T schar_from_char(int c) -{ - schar_T sc = 0; - if (c >= 0x200000) { - // TODO(bfredl): this must NEVER happen, even if the file contained overlong sequences - c = 0xFFFD; - } - utf_char2bytes(c, (char *)&sc); - return sc; -} - #ifdef INCLUDE_GENERATED_DECLARATIONS # include "grid.h.generated.h" #endif |