From d6ecead36406233cc56353dd05f3380f0497630f Mon Sep 17 00:00:00 2001 From: bfredl Date: Tue, 14 Mar 2023 11:49:46 +0100 Subject: refactor(screen): screen.c delenda est drawscreen.c vs screen.c makes absolutely no sense. The screen exists only to draw upon it, therefore helper functions are distributed randomly between screen.c and the file that does the redrawing. In addition screen.c does a lot of drawing on the screen. It made more sense for vim/vim as our grid.c is their screen.c Not sure if we want to dump all the code for option chars into optionstr.c, so keep these in a optionchar.c for now. --- src/nvim/drawline.h | 1 - 1 file changed, 1 deletion(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 9f60b46e1b..91261aba78 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -8,7 +8,6 @@ #include "nvim/decoration_provider.h" #include "nvim/fold.h" #include "nvim/macros.h" -#include "nvim/screen.h" #include "nvim/types.h" // Maximum columns for terminal highlight attributes -- cgit From 316c8770348264f64deea34359cb5bdff6856ed8 Mon Sep 17 00:00:00 2001 From: Luuk van Baal Date: Sun, 28 May 2023 00:12:56 +0200 Subject: vim-patch:9.0.1585: weird use of static variables for spell checking Problem: Weird use of static variables for spell checking. Solution: Move the variables to a structure and pass them from win_update() to win_line(). (Luuk van Baal, closes vim/vim#12448) https://github.com/vim/vim/commit/30805a1aba0067cf0087f9a0e5c184562433e2e7 --- src/nvim/drawline.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 91261aba78..9a917df0c5 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -23,6 +23,17 @@ EXTERN kvec_t(WinExtmark) win_extmark_arr INIT(= KV_INITIAL_VALUE); EXTERN bool conceal_cursor_used INIT(= false); +// Spell checking variables passed from win_update() to win_line(). +typedef struct { + bool spv_has_spell; ///< drawn window has spell checking + bool spv_unchanged; ///< not updating for changed text + int spv_checked_col; ///< column in "checked_lnum" up to + ///< which there are no spell errors + linenr_T spv_checked_lnum; ///< line number for "checked_col" + int spv_cap_col; ///< column to check for Cap word + linenr_T spv_capcol_lnum; ///< line number for "cap_col" +} spellvars_T; + #ifdef INCLUDE_GENERATED_DECLARATIONS # include "drawline.h.generated.h" #endif -- cgit From cf8b2c0e74fd5e723b0c15c2ce84e6900fd322d3 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sat, 30 Sep 2023 12:05:28 +0800 Subject: build(iwyu): add a few more _defs.h mappings (#25435) --- src/nvim/drawline.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 9a917df0c5..f35b15c474 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -8,6 +8,7 @@ #include "nvim/decoration_provider.h" #include "nvim/fold.h" #include "nvim/macros.h" +#include "nvim/pos.h" #include "nvim/types.h" // Maximum columns for terminal highlight attributes -- cgit From 5f03a1eaabfc8de2b3a9c666fcd604763f41e152 Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 20 Oct 2023 15:10:33 +0200 Subject: build(lint): remove unnecessary clint.py rules Uncrustify is the source of truth where possible. Remove any redundant checks from clint.py. --- src/nvim/drawline.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index f35b15c474..8345596e6f 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -20,9 +20,9 @@ typedef struct { int win_row; int win_col; } WinExtmark; -EXTERN kvec_t(WinExtmark) win_extmark_arr INIT(= KV_INITIAL_VALUE); +EXTERN kvec_t(WinExtmark) win_extmark_arr INIT( = KV_INITIAL_VALUE); -EXTERN bool conceal_cursor_used INIT(= false); +EXTERN bool conceal_cursor_used INIT( = false); // Spell checking variables passed from win_update() to win_line(). typedef struct { -- cgit From 4f8941c1a5f1ef6caa410feeb52e343db22763ce Mon Sep 17 00:00:00 2001 From: dundargoc Date: Fri, 10 Nov 2023 12:23:42 +0100 Subject: refactor: replace manual header guards with #pragma once It is less error-prone than manually defining header guards. Pretty much all compilers support it even if it's not part of the C standard. --- src/nvim/drawline.h | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 8345596e6f..747e062bf9 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -1,5 +1,4 @@ -#ifndef NVIM_DRAWLINE_H -#define NVIM_DRAWLINE_H +#pragma once #include #include @@ -38,4 +37,3 @@ typedef struct { #ifdef INCLUDE_GENERATED_DECLARATIONS # include "drawline.h.generated.h" #endif -#endif // NVIM_DRAWLINE_H -- cgit From f4aedbae4cb1f206f5b7c6142697b71dd473059b Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 18:39:38 +0100 Subject: build(IWYU): fix includes for undo_defs.h --- src/nvim/drawline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 747e062bf9..edec7fea44 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -7,7 +7,7 @@ #include "nvim/decoration_provider.h" #include "nvim/fold.h" #include "nvim/macros.h" -#include "nvim/pos.h" +#include "nvim/pos_defs.h" #include "nvim/types.h" // Maximum columns for terminal highlight attributes -- cgit From 6c14ae6bfaf51415b555e9a6b85d1d280976358d Mon Sep 17 00:00:00 2001 From: dundargoc Date: Mon, 27 Nov 2023 20:27:32 +0100 Subject: refactor: rename types.h to types_defs.h --- src/nvim/drawline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index edec7fea44..20072e4103 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -8,7 +8,7 @@ #include "nvim/fold.h" #include "nvim/macros.h" #include "nvim/pos_defs.h" -#include "nvim/types.h" +#include "nvim/types_defs.h" // Maximum columns for terminal highlight attributes #define TERM_ATTRS_MAX 1024 -- cgit From 79b6ff28ad1204fbb4199b9092f5c578d88cb28e Mon Sep 17 00:00:00 2001 From: dundargoc Date: Tue, 28 Nov 2023 20:31:00 +0100 Subject: refactor: fix headers with IWYU --- src/nvim/drawline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 20072e4103..6a9c6d5597 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -6,7 +6,7 @@ #include "klib/kvec.h" #include "nvim/decoration_provider.h" #include "nvim/fold.h" -#include "nvim/macros.h" +#include "nvim/macros_defs.h" #include "nvim/pos_defs.h" #include "nvim/types_defs.h" -- cgit From a6cba103cebce535279db197f9efeb34e9d1171f Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Wed, 29 Nov 2023 20:32:40 +0800 Subject: refactor: move some constants out of vim_defs.h (#26298) --- src/nvim/drawline.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/nvim/drawline.h') diff --git a/src/nvim/drawline.h b/src/nvim/drawline.h index 6a9c6d5597..5a7f220a13 100644 --- a/src/nvim/drawline.h +++ b/src/nvim/drawline.h @@ -5,7 +5,7 @@ #include "klib/kvec.h" #include "nvim/decoration_provider.h" -#include "nvim/fold.h" +#include "nvim/fold_defs.h" #include "nvim/macros_defs.h" #include "nvim/pos_defs.h" #include "nvim/types_defs.h" -- cgit