diff options
author | scott-linder <scott.b.linder@wmich.edu> | 2014-02-25 15:41:16 -0500 |
---|---|---|
committer | Thiago de Arruda <tpadilha84@gmail.com> | 2014-02-26 04:17:27 -0300 |
commit | 0ef90c13b72b74928bfb3c183c7a5bd7240b51ad (patch) | |
tree | b342ba525a153962f928e01fde7518398a4859c3 /src/ui.h | |
parent | 82e0636e788f131d46451805f6c46e2d4f8496a9 (diff) | |
download | rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.tar.gz rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.tar.bz2 rneovim-0ef90c13b72b74928bfb3c183c7a5bd7240b51ad.zip |
Removes 'proto' dir
See #137 for the issue.
Every header in the proto directory was:
* Given include guards in the form
#ifndef NEOVIM_FILENAME_H
#define NEOVIM_FILENAME_H
...
#endif /* NEOVIM_FILENAM_H */
* Renamed from *.pro -> *.h
* Moved from src/proto/ to src/
This would have caused conficts with some existing headers in src/;
rather than merge these conflicts now (which is a whole other can of
worms involving multiple and conditional inclusion), any header in src/
with a conflicting name was renamed from *.h -> *_defs.h (which may or
may not actually describe its purpose, the change is purely a
namespacing issue).
Once all of these changes were made a script was developed to determine
what #includes needed to be added to each source file to describe its
dependencies and allow it to compile; because the script is so short
and I'll just list it here:
#! /bin/bash
cd $(dirname $0)
# Scrapes `make` output for provided error messages and outputs #includes
# needed to resolve them.
# $1 : part of the clang error message between filename and identifier
list_missing_includes() {
for file_missing_pair in $(CC=clang make 2>&1 >/dev/null | sed -n "s/\/\(.*\.[hc]\).*$1.*'\(.*\)'.*/\1:\2/p"); do
fields=(${file_missing_pair//:/ })
source_file=${fields[0]}
missing_func=${fields[1]}
# Try to find the declaration of the missing function.
echo $(basename $source_file) \
\#include \"$(grep -r "\b$missing_func __ARGS" | sed -n "s/.*\/\(.*\)\:.*/\1/p")\"
# Remove duplicates
done | sort | uniq
}
echo "Finding missing function prototypes..."
list_missing_includes "implicit declaration of function"
echo "Finding missing identifier declarations..."
list_missing_includes "use of undeclared identifier"
Each list of required headers was added by hand in the following format:
#include "vim.h"
#include "*_defs.h"
#include "filename.h"
/* All other includes in same module here, in alphabetical order. */
/* All includes from other modules (e.g. "os/*.h") here in alphabetical
* order. */
Diffstat (limited to 'src/ui.h')
-rw-r--r-- | src/ui.h | 70 |
1 files changed, 70 insertions, 0 deletions
diff --git a/src/ui.h b/src/ui.h new file mode 100644 index 0000000000..bcd6afd426 --- /dev/null +++ b/src/ui.h @@ -0,0 +1,70 @@ +#ifndef NEOVIM_UI_H +#define NEOVIM_UI_H +/* ui.c */ +void ui_write __ARGS((char_u *s, int len)); +void ui_inchar_undo __ARGS((char_u *s, int len)); +int ui_inchar __ARGS((char_u *buf, int maxlen, long wtime, int tb_change_cnt)); +int ui_char_avail __ARGS((void)); +void ui_delay __ARGS((long msec, int ignoreinput)); +void ui_suspend __ARGS((void)); +void suspend_shell __ARGS((void)); +int ui_get_shellsize __ARGS((void)); +void ui_set_shellsize __ARGS((int mustset)); +void ui_new_shellsize __ARGS((void)); +void ui_breakcheck __ARGS((void)); +void clip_init __ARGS((int can_use)); +void clip_update_selection __ARGS((VimClipboard *clip)); +void clip_own_selection __ARGS((VimClipboard *cbd)); +void clip_lose_selection __ARGS((VimClipboard *cbd)); +void clip_auto_select __ARGS((void)); +int clip_isautosel_star __ARGS((void)); +int clip_isautosel_plus __ARGS((void)); +void clip_modeless __ARGS((int button, int is_click, int is_drag)); +void clip_start_selection __ARGS((int col, int row, int repeated_click)); +void clip_process_selection __ARGS((int button, int col, int row, + int_u repeated_click)); +void clip_may_redraw_selection __ARGS((int row, int col, int len)); +void clip_clear_selection __ARGS((VimClipboard *cbd)); +void clip_may_clear_selection __ARGS((int row1, int row2)); +void clip_scroll_selection __ARGS((int rows)); +void clip_copy_modeless_selection __ARGS((int both)); +int clip_gen_own_selection __ARGS((VimClipboard *cbd)); +void clip_gen_lose_selection __ARGS((VimClipboard *cbd)); +void clip_gen_set_selection __ARGS((VimClipboard *cbd)); +void clip_gen_request_selection __ARGS((VimClipboard *cbd)); +int clip_gen_owner_exists __ARGS((VimClipboard *cbd)); +int vim_is_input_buf_full __ARGS((void)); +int vim_is_input_buf_empty __ARGS((void)); +int vim_free_in_input_buf __ARGS((void)); +int vim_used_in_input_buf __ARGS((void)); +char_u *get_input_buf __ARGS((void)); +void set_input_buf __ARGS((char_u *p)); +void add_to_input_buf __ARGS((char_u *s, int len)); +void add_to_input_buf_csi __ARGS((char_u *str, int len)); +void push_raw_key __ARGS((char_u *s, int len)); +void trash_input_buf __ARGS((void)); +int read_from_input_buf __ARGS((char_u *buf, long maxlen)); +void fill_input_buf __ARGS((int exit_on_error)); +void read_error_exit __ARGS((void)); +void ui_cursor_shape __ARGS((void)); +int check_col __ARGS((int col)); +int check_row __ARGS((int row)); +void open_app_context __ARGS((void)); +void x11_setup_atoms __ARGS((Display *dpy)); +void x11_setup_selection __ARGS((Widget w)); +void clip_x11_request_selection __ARGS((Widget myShell, Display *dpy, + VimClipboard *cbd)); +void clip_x11_lose_selection __ARGS((Widget myShell, VimClipboard *cbd)); +int clip_x11_own_selection __ARGS((Widget myShell, VimClipboard *cbd)); +void clip_x11_set_selection __ARGS((VimClipboard *cbd)); +int clip_x11_owner_exists __ARGS((VimClipboard *cbd)); +void yank_cut_buffer0 __ARGS((Display *dpy, VimClipboard *cbd)); +int jump_to_mouse __ARGS((int flags, int *inclusive, int which_button)); +int mouse_comp_pos __ARGS((win_T *win, int *rowp, int *colp, linenr_T *lnump)); +win_T *mouse_find_win __ARGS((int *rowp, int *colp)); +int get_fpos_of_mouse __ARGS((pos_T *mpos)); +int vcol2col __ARGS((win_T *wp, linenr_T lnum, int vcol)); +void ui_focus_change __ARGS((int in_focus)); +void im_save_status __ARGS((long *psave)); +/* vim: set ft=c : */ +#endif /* NEOVIM_UI_H */ |