diff options
-rw-r--r-- | src/edit.h | 11 | ||||
-rw-r--r-- | src/fold.h | 14 | ||||
-rw-r--r-- | src/globals.h | 1 | ||||
-rw-r--r-- | src/hardcopy.h | 35 | ||||
-rw-r--r-- | src/menu.h | 49 | ||||
-rw-r--r-- | src/popupmnu.h | 12 | ||||
-rw-r--r-- | src/sha256.h | 8 | ||||
-rw-r--r-- | src/structs.h | 129 | ||||
-rw-r--r-- | src/tag.h | 13 |
9 files changed, 136 insertions, 136 deletions
diff --git a/src/edit.h b/src/edit.h index b1ae8cbc94..9d45e54dc7 100644 --- a/src/edit.h +++ b/src/edit.h @@ -1,6 +1,15 @@ #ifndef NEOVIM_EDIT_H #define NEOVIM_EDIT_H -/* edit.c */ + +/* + * Array indexes used for cptext argument of ins_compl_add(). + */ +#define CPT_ABBR 0 /* "abbr" */ +#define CPT_MENU 1 /* "menu" */ +#define CPT_KIND 2 /* "kind" */ +#define CPT_INFO 3 /* "info" */ +#define CPT_COUNT 4 /* Number of entries */ + int edit(int cmdchar, int startln, long count); void edit_putchar(int c, int highlight); void edit_unputchar(void); diff --git a/src/fold.h b/src/fold.h index 70416ed8aa..baa781645a 100644 --- a/src/fold.h +++ b/src/fold.h @@ -1,6 +1,18 @@ #ifndef NEOVIM_FOLD_H #define NEOVIM_FOLD_H -/* fold.c */ + +/* + * Info used to pass info about a fold from the fold-detection code to the + * code that displays the foldcolumn. + */ +typedef struct foldinfo { + int fi_level; /* level of the fold; when this is zero the + other fields are invalid */ + int fi_lnum; /* line number where fold starts */ + int fi_low_level; /* lowest fold level that starts in the same + line */ +} foldinfo_T; + void copyFoldingState(win_T *wp_from, win_T *wp_to); int hasAnyFolding(win_T *win); int hasFolding(linenr_T lnum, linenr_T *firstp, linenr_T *lastp); diff --git a/src/globals.h b/src/globals.h index 75011f7c53..91c22061e1 100644 --- a/src/globals.h +++ b/src/globals.h @@ -10,6 +10,7 @@ #define NEOVIM_GLOBALS_H #include "mbyte.h" +#include "menu.h" /* * definition of global variables diff --git a/src/hardcopy.h b/src/hardcopy.h index 43a9278370..fb27ee4344 100644 --- a/src/hardcopy.h +++ b/src/hardcopy.h @@ -1,6 +1,39 @@ #ifndef NEOVIM_HARDCOPY_H #define NEOVIM_HARDCOPY_H -/* hardcopy.c */ + +/* + * Structure to hold printing color and font attributes. + */ +typedef struct { + long_u fg_color; + long_u bg_color; + int bold; + int italic; + int underline; + int undercurl; +} prt_text_attr_T; + +/* + * Structure passed back to the generic printer code. + */ +typedef struct { + int n_collated_copies; + int n_uncollated_copies; + int duplex; + int chars_per_line; + int lines_per_page; + int has_color; + prt_text_attr_T number; + int modec; + int do_syntax; + int user_abort; + char_u *jobname; + char_u *outfile; + char_u *arguments; +} prt_settings_T; + +#define PRINT_NUMBER_WIDTH 8 + char_u *parse_printoptions(void); char_u *parse_printmbfont(void); int prt_header_height(void); diff --git a/src/menu.h b/src/menu.h index a7fe6b7e8e..6d1732703f 100644 --- a/src/menu.h +++ b/src/menu.h @@ -1,6 +1,53 @@ #ifndef NEOVIM_MENU_H #define NEOVIM_MENU_H -/* menu.c */ + +/* Indices into vimmenu_T->strings[] and vimmenu_T->noremap[] for each mode */ +#define MENU_INDEX_INVALID -1 +#define MENU_INDEX_NORMAL 0 +#define MENU_INDEX_VISUAL 1 +#define MENU_INDEX_SELECT 2 +#define MENU_INDEX_OP_PENDING 3 +#define MENU_INDEX_INSERT 4 +#define MENU_INDEX_CMDLINE 5 +#define MENU_INDEX_TIP 6 +#define MENU_MODES 7 + +/* Menu modes */ +#define MENU_NORMAL_MODE (1 << MENU_INDEX_NORMAL) +#define MENU_VISUAL_MODE (1 << MENU_INDEX_VISUAL) +#define MENU_SELECT_MODE (1 << MENU_INDEX_SELECT) +#define MENU_OP_PENDING_MODE (1 << MENU_INDEX_OP_PENDING) +#define MENU_INSERT_MODE (1 << MENU_INDEX_INSERT) +#define MENU_CMDLINE_MODE (1 << MENU_INDEX_CMDLINE) +#define MENU_TIP_MODE (1 << MENU_INDEX_TIP) +#define MENU_ALL_MODES ((1 << MENU_INDEX_TIP) - 1) +/*note MENU_INDEX_TIP is not a 'real' mode*/ + +/* Start a menu name with this to not include it on the main menu bar */ +#define MNU_HIDDEN_CHAR ']' + +typedef struct VimMenu vimmenu_T; + +struct VimMenu { + int modes; /* Which modes is this menu visible for? */ + int enabled; /* for which modes the menu is enabled */ + char_u *name; /* Name of menu, possibly translated */ + char_u *dname; /* Displayed Name ("name" without '&') */ + char_u *en_name; /* "name" untranslated, NULL when "name" + * was not translated */ + char_u *en_dname; /* "dname" untranslated, NULL when "dname" + * was not translated */ + int mnemonic; /* mnemonic key (after '&') */ + char_u *actext; /* accelerator text (after TAB) */ + int priority; /* Menu order priority */ + char_u *strings[MENU_MODES]; /* Mapped string for each mode */ + int noremap[MENU_MODES]; /* A REMAP_ flag for each mode */ + char silent[MENU_MODES]; /* A silent flag for each mode */ + vimmenu_T *children; /* Children of sub-menu */ + vimmenu_T *parent; /* Parent of menu */ + vimmenu_T *next; /* Next item in menu */ +}; + void ex_menu(exarg_T *eap); char_u *set_context_in_menu_cmd(expand_T *xp, char_u *cmd, char_u *arg, int forceit); diff --git a/src/popupmnu.h b/src/popupmnu.h index 9c0bdb2d7b..26d0df439a 100644 --- a/src/popupmnu.h +++ b/src/popupmnu.h @@ -1,6 +1,16 @@ #ifndef NEOVIM_POPUPMNU_H #define NEOVIM_POPUPMNU_H -/* popupmnu.c */ + +/* + * Used for popup menu items. + */ +typedef struct { + char_u *pum_text; /* main menu text */ + char_u *pum_kind; /* extra kind text (may be truncated) */ + char_u *pum_extra; /* extra menu text (may be truncated) */ + char_u *pum_info; /* extra info */ +} pumitem_T; + void pum_display(pumitem_T *array, int size, int selected); void pum_redraw(void); void pum_undisplay(void); diff --git a/src/sha256.h b/src/sha256.h index 0732ba8ec7..c7c93672d9 100644 --- a/src/sha256.h +++ b/src/sha256.h @@ -1,6 +1,12 @@ #ifndef NEOVIM_SHA256_H #define NEOVIM_SHA256_H -/* sha256.c */ + +typedef struct { + UINT32_T total[2]; + UINT32_T state[8]; + char_u buffer[64]; +} context_sha256_T; + void sha256_start(context_sha256_T *ctx); void sha256_update(context_sha256_T *ctx, char_u *input, UINT32_T length); diff --git a/src/structs.h b/src/structs.h index 8fd1a64bf2..4aba076502 100644 --- a/src/structs.h +++ b/src/structs.h @@ -196,18 +196,6 @@ struct wininfo_S { garray_T wi_folds; /* clone of w_folds */ }; -/* - * Info used to pass info about a fold from the fold-detection code to the - * code that displays the foldcolumn. - */ -typedef struct foldinfo { - int fi_level; /* level of the fold; when this is zero the - other fields are invalid */ - int fi_lnum; /* line number where fold starts */ - int fi_low_level; /* lowest fold level that starts in the same - line */ -} foldinfo_T; - /* Structure to store info about the Visual area. */ typedef struct { pos_T vi_start; /* start pos of last VIsual */ @@ -1861,54 +1849,6 @@ typedef struct cursor_entry { } cursorentry_T; #endif /* CURSOR_SHAPE */ - -/* Indices into vimmenu_T->strings[] and vimmenu_T->noremap[] for each mode */ -#define MENU_INDEX_INVALID -1 -#define MENU_INDEX_NORMAL 0 -#define MENU_INDEX_VISUAL 1 -#define MENU_INDEX_SELECT 2 -#define MENU_INDEX_OP_PENDING 3 -#define MENU_INDEX_INSERT 4 -#define MENU_INDEX_CMDLINE 5 -#define MENU_INDEX_TIP 6 -#define MENU_MODES 7 - -/* Menu modes */ -#define MENU_NORMAL_MODE (1 << MENU_INDEX_NORMAL) -#define MENU_VISUAL_MODE (1 << MENU_INDEX_VISUAL) -#define MENU_SELECT_MODE (1 << MENU_INDEX_SELECT) -#define MENU_OP_PENDING_MODE (1 << MENU_INDEX_OP_PENDING) -#define MENU_INSERT_MODE (1 << MENU_INDEX_INSERT) -#define MENU_CMDLINE_MODE (1 << MENU_INDEX_CMDLINE) -#define MENU_TIP_MODE (1 << MENU_INDEX_TIP) -#define MENU_ALL_MODES ((1 << MENU_INDEX_TIP) - 1) -/*note MENU_INDEX_TIP is not a 'real' mode*/ - -/* Start a menu name with this to not include it on the main menu bar */ -#define MNU_HIDDEN_CHAR ']' - -typedef struct VimMenu vimmenu_T; - -struct VimMenu { - int modes; /* Which modes is this menu visible for? */ - int enabled; /* for which modes the menu is enabled */ - char_u *name; /* Name of menu, possibly translated */ - char_u *dname; /* Displayed Name ("name" without '&') */ - char_u *en_name; /* "name" untranslated, NULL when "name" - * was not translated */ - char_u *en_dname; /* "dname" untranslated, NULL when "dname" - * was not translated */ - int mnemonic; /* mnemonic key (after '&') */ - char_u *actext; /* accelerator text (after TAB) */ - int priority; /* Menu order priority */ - char_u *strings[MENU_MODES]; /* Mapped string for each mode */ - int noremap[MENU_MODES]; /* A REMAP_ flag for each mode */ - char silent[MENU_MODES]; /* A silent flag for each mode */ - vimmenu_T *children; /* Children of sub-menu */ - vimmenu_T *parent; /* Parent of menu */ - vimmenu_T *next; /* Next item in menu */ -}; - /* * Struct to save values in before executing autocommands for a buffer that is * not the current buffer. Without FEAT_AUTOCMD only "curbuf" is remembered. @@ -1933,72 +1873,3 @@ typedef struct { int strlen; int present; } option_table_T; - -/* - * Structure to hold printing color and font attributes. - */ -typedef struct { - long_u fg_color; - long_u bg_color; - int bold; - int italic; - int underline; - int undercurl; -} prt_text_attr_T; - -/* - * Structure passed back to the generic printer code. - */ -typedef struct { - int n_collated_copies; - int n_uncollated_copies; - int duplex; - int chars_per_line; - int lines_per_page; - int has_color; - prt_text_attr_T number; - int modec; - int do_syntax; - int user_abort; - char_u *jobname; - char_u *outfile; - char_u *arguments; -} prt_settings_T; - -#define PRINT_NUMBER_WIDTH 8 - -/* - * Used for popup menu items. - */ -typedef struct { - char_u *pum_text; /* main menu text */ - char_u *pum_kind; /* extra kind text (may be truncated) */ - char_u *pum_extra; /* extra menu text (may be truncated) */ - char_u *pum_info; /* extra info */ -} pumitem_T; - -/* - * Structure used for get_tagfname(). - */ -typedef struct { - char_u *tn_tags; /* value of 'tags' when starting */ - char_u *tn_np; /* current position in tn_tags */ - int tn_did_filefind_init; - int tn_hf_idx; - void *tn_search_ctx; -} tagname_T; - -/* - * Array indexes used for cptext argument of ins_compl_add(). - */ -#define CPT_ABBR 0 /* "abbr" */ -#define CPT_MENU 1 /* "menu" */ -#define CPT_KIND 2 /* "kind" */ -#define CPT_INFO 3 /* "info" */ -#define CPT_COUNT 4 /* Number of entries */ - -typedef struct { - UINT32_T total[2]; - UINT32_T state[8]; - char_u buffer[64]; -} context_sha256_T; @@ -1,6 +1,17 @@ #ifndef NEOVIM_TAG_H #define NEOVIM_TAG_H -/* tag.c */ + +/* + * Structure used for get_tagfname(). + */ +typedef struct { + char_u *tn_tags; /* value of 'tags' when starting */ + char_u *tn_np; /* current position in tn_tags */ + int tn_did_filefind_init; + int tn_hf_idx; + void *tn_search_ctx; +} tagname_T; + int do_tag(char_u *tag, int type, int count, int forceit, int verbose); void tag_freematch(void); void do_tags(exarg_T *eap); |