diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2017-06-14 20:32:16 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 20:32:16 +0200 |
| commit | 7918845215855814cf16b483fb0bec9cdad313d2 (patch) | |
| tree | 7c4b17c92f72df637d096e43ccbd00891a896e87 /src/nvim/buffer_defs.h | |
| parent | 6650588c4a89616249e964631dad17a66e1c6592 (diff) | |
| parent | ad73a70e5a1c7da58d7afbb70310c14c62b2519d (diff) | |
| download | rneovim-7918845215855814cf16b483fb0bec9cdad313d2.tar.gz rneovim-7918845215855814cf16b483fb0bec9cdad313d2.tar.bz2 rneovim-7918845215855814cf16b483fb0bec9cdad313d2.zip | |
Merge pull request #6700 from bfredl/winhl
window specific ui highlighting: part 2
Diffstat (limited to 'src/nvim/buffer_defs.h')
| -rw-r--r-- | src/nvim/buffer_defs.h | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/nvim/buffer_defs.h b/src/nvim/buffer_defs.h index c065ce60f1..af2b50e22d 100644 --- a/src/nvim/buffer_defs.h +++ b/src/nvim/buffer_defs.h @@ -18,6 +18,8 @@ typedef struct { // for garray_T #include "nvim/garray.h" +// for HLF_COUNT +#include "nvim/highlight_defs.h" // for pos_T, lpos_T and linenr_T #include "nvim/pos.h" // for the number window-local and buffer-local options @@ -936,9 +938,13 @@ struct window_S { synblock_T *w_s; /* for :ownsyntax */ - int w_hl_id; ///< 'winhighlight' id - int w_hl_id_inactive; ///< 'winhighlight' id for inactive window - int w_hl_attr; ///< 'winhighlight' final attrs + int w_hl_id_normal; ///< 'winhighlight' normal id + int w_hl_attr_normal; ///< 'winhighlight' normal final attrs + + int w_hl_ids[HLF_COUNT]; ///< 'winhighlight' id + int w_hl_attrs[HLF_COUNT]; ///< 'winhighlight' final attrs + + int w_hl_needs_update; ///< attrs need to be recalculated win_T *w_prev; /* link to previous window */ win_T *w_next; /* link to next window */ @@ -1169,4 +1175,9 @@ struct window_S { qf_info_T *w_llist_ref; }; +static inline int win_hl_attr(win_T *wp, int hlf) +{ + return wp->w_hl_attrs[hlf]; +} + #endif // NVIM_BUFFER_DEFS_H |