refactor(misc1): move out high-level input functions to a new file: input.c

Possibly dialog code is messages.c could be moved here as well.
misc1.c is now empty, so delete it.
This commit is contained in:
Björn Linse 2021-12-10 18:05:49 +01:00
parent dc37beed75
commit df54d82b7c
64 changed files with 67 additions and 167 deletions

View File

@ -29,7 +29,6 @@
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/ops.h" #include "nvim/ops.h"
#include "nvim/undo.h" #include "nvim/undo.h"

View File

@ -8,7 +8,6 @@
#include "nvim/ex_getln.h" #include "nvim/ex_getln.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/misc1.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/ui.h" #include "nvim/ui.h"
#include "nvim/vim.h" #include "nvim/vim.h"

View File

@ -15,7 +15,6 @@
#include "nvim/ex_docmd.h" #include "nvim/ex_docmd.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/regexp.h" #include "nvim/regexp.h"

View File

@ -57,7 +57,6 @@
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -19,7 +19,6 @@
#include "nvim/indent_c.h" #include "nvim/indent_c.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/plines.h" #include "nvim/plines.h"

View File

@ -10,7 +10,6 @@
#include "nvim/event/socket.h" #include "nvim/event/socket.h"
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/misc1.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"
#include "nvim/msgpack_rpc/server.h" #include "nvim/msgpack_rpc/server.h"
#include "nvim/os/shell.h" #include "nvim/os/shell.h"

View File

@ -21,7 +21,6 @@
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os_unix.h" #include "nvim/os_unix.h"

View File

@ -14,7 +14,6 @@
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/plines.h" #include "nvim/plines.h"
#include "nvim/screen.h" #include "nvim/screen.h"

View File

@ -29,7 +29,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -20,7 +20,6 @@
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/screen.h" #include "nvim/screen.h"

View File

@ -35,7 +35,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -35,7 +35,6 @@
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/ops.h" #include "nvim/ops.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -33,12 +33,12 @@
#include "nvim/if_cscope.h" #include "nvim/if_cscope.h"
#include "nvim/indent.h" #include "nvim/indent.h"
#include "nvim/indent_c.h" #include "nvim/indent_c.h"
#include "nvim/input.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/macros.h" #include "nvim/macros.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/math.h" #include "nvim/math.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"

View File

@ -32,8 +32,6 @@
#include "nvim/pos.h" #include "nvim/pos.h"
#include "nvim/types.h" #include "nvim/types.h"
#include "nvim/vim.h" #include "nvim/vim.h"
// TODO(ZyX-I): Move line_breakcheck out of misc1
#include "nvim/misc1.h" // For line_breakcheck
#include "nvim/os/fileio.h" #include "nvim/os/fileio.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS

View File

@ -17,7 +17,6 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/misc1.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/regexp.h" #include "nvim/regexp.h"
#include "nvim/search.h" #include "nvim/search.h"

View File

@ -13,7 +13,6 @@
#include "nvim/log.h" #include "nvim/log.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/misc1.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS

View File

@ -39,6 +39,7 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/highlight.h" #include "nvim/highlight.h"
#include "nvim/indent.h" #include "nvim/indent.h"
#include "nvim/input.h"
#include "nvim/log.h" #include "nvim/log.h"
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/mark.h" #include "nvim/mark.h"
@ -46,7 +47,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -35,7 +35,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/ops.h" #include "nvim/ops.h"

View File

@ -39,6 +39,7 @@
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/hardcopy.h" #include "nvim/hardcopy.h"
#include "nvim/if_cscope.h" #include "nvim/if_cscope.h"
#include "nvim/input.h"
#include "nvim/keymap.h" #include "nvim/keymap.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/main.h" #include "nvim/main.h"
@ -48,7 +49,6 @@
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/menu.h" #include "nvim/menu.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -48,7 +48,6 @@
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/menu.h" #include "nvim/menu.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/ops.h" #include "nvim/ops.h"

View File

@ -28,7 +28,6 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/keymap.h" #include "nvim/keymap.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -57,7 +57,6 @@
#include "nvim/globals.h" #include "nvim/globals.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/fs_defs.h" #include "nvim/os/fs_defs.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -30,12 +30,12 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/hashtab.h" #include "nvim/hashtab.h"
#include "nvim/iconv.h" #include "nvim/iconv.h"
#include "nvim/input.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memfile.h" #include "nvim/memfile.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -28,7 +28,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/ops.h" #include "nvim/ops.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -29,6 +29,7 @@
#include "nvim/func_attr.h" #include "nvim/func_attr.h"
#include "nvim/garray.h" #include "nvim/garray.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/input.h"
#include "nvim/keymap.h" #include "nvim/keymap.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/main.h" #include "nvim/main.h"
@ -36,7 +37,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/ops.h" #include "nvim/ops.h"

View File

@ -17,7 +17,6 @@
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/plines.h" #include "nvim/plines.h"

View File

@ -8,7 +8,6 @@
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/ascii.h" #include "nvim/ascii.h"
#include "nvim/misc1.h"
#include "nvim/charset.h" #include "nvim/charset.h"
#include "nvim/cursor.h" #include "nvim/cursor.h"
#include "nvim/edit.h" #include "nvim/edit.h"

View File

@ -1,64 +1,24 @@
// This is an open source non-commercial project. Dear PVS-Studio, please check // This is an open source non-commercial project. Dear PVS-Studio, please check
// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
/* // input.c: high level functions for prompting the user or input
* misc1.c: functions that didn't seem to fit elsewhere // like yes/no or number prompts.
*/
#include <assert.h>
#include <inttypes.h> #include <inttypes.h>
#include <limits.h>
#include <stdbool.h> #include <stdbool.h>
#include <string.h>
#include "nvim/ascii.h"
#include "nvim/buffer.h"
#include "nvim/buffer_updates.h"
#include "nvim/charset.h"
#include "nvim/cursor.h"
#include "nvim/diff.h"
#include "nvim/edit.h"
#include "nvim/eval.h"
#include "nvim/event/stream.h"
#include "nvim/ex_cmds.h"
#include "nvim/ex_docmd.h"
#include "nvim/ex_getln.h"
#include "nvim/fileio.h"
#include "nvim/fold.h"
#include "nvim/func_attr.h" #include "nvim/func_attr.h"
#include "nvim/garray.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/indent.h"
#include "nvim/indent_c.h"
#include "nvim/main.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/input.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h"
#include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h"
#include "nvim/os/shell.h"
#include "nvim/os/signal.h"
#include "nvim/os/time.h"
#include "nvim/os_unix.h"
#include "nvim/quickfix.h"
#include "nvim/regexp.h"
#include "nvim/screen.h"
#include "nvim/search.h"
#include "nvim/state.h"
#include "nvim/strings.h"
#include "nvim/tag.h"
#include "nvim/ui.h" #include "nvim/ui.h"
#include "nvim/undo.h"
#include "nvim/vim.h" #include "nvim/vim.h"
#include "nvim/window.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS #ifdef INCLUDE_GENERATED_DECLARATIONS
# include "misc1.c.generated.h" # include "input.c.generated.h"
#endif #endif
/// Ask for a reply from the user, 'y' or 'n' /// Ask for a reply from the user, 'y' or 'n'
@ -106,43 +66,13 @@ int ask_yesno(const char *const str, const bool direct)
return r; return r;
} }
/* /// Get a key stroke directly from the user.
* Return TRUE if "c" is a mouse key. ///
*/ /// Ignores mouse clicks and scrollbar events, except a click for the left
int is_mouse_key(int c) /// button (used at the more prompt).
{ /// Doesn't use vgetc(), because it syncs undo and eats mapped characters.
return c == K_LEFTMOUSE /// Disadvantage: typeahead is ignored.
|| c == K_LEFTMOUSE_NM /// Translates the interrupt character for unix to ESC.
|| c == K_LEFTDRAG
|| c == K_LEFTRELEASE
|| c == K_LEFTRELEASE_NM
|| c == K_MOUSEMOVE
|| c == K_MIDDLEMOUSE
|| c == K_MIDDLEDRAG
|| c == K_MIDDLERELEASE
|| c == K_RIGHTMOUSE
|| c == K_RIGHTDRAG
|| c == K_RIGHTRELEASE
|| c == K_MOUSEDOWN
|| c == K_MOUSEUP
|| c == K_MOUSELEFT
|| c == K_MOUSERIGHT
|| c == K_X1MOUSE
|| c == K_X1DRAG
|| c == K_X1RELEASE
|| c == K_X2MOUSE
|| c == K_X2DRAG
|| c == K_X2RELEASE;
}
/*
* Get a key stroke directly from the user.
* Ignores mouse clicks and scrollbar events, except a click for the left
* button (used at the more prompt).
* Doesn't use vgetc(), because it syncs undo and eats mapped characters.
* Disadvantage: typeahead is ignored.
* Translates the interrupt character for unix to ESC.
*/
int get_keystroke(MultiQueue *events) int get_keystroke(MultiQueue *events)
{ {
char_u *buf = NULL; char_u *buf = NULL;
@ -180,7 +110,7 @@ int get_keystroke(MultiQueue *events)
len += n; len += n;
waited = 0; waited = 0;
} else if (len > 0) { } else if (len > 0) {
++waited; // keep track of the waiting time waited++; // keep track of the waiting time
} }
if (n > 0) { // found a termcode: adjust length if (n > 0) { // found a termcode: adjust length
len = n; len = n;
@ -232,7 +162,7 @@ int get_number(int colon, int *mouse_used)
int typed = 0; int typed = 0;
if (mouse_used != NULL) { if (mouse_used != NULL) {
*mouse_used = FALSE; *mouse_used = false;
} }
// When not printing messages, the user won't know what to type, return a // When not printing messages, the user won't know what to type, return a
@ -248,15 +178,15 @@ int get_number(int colon, int *mouse_used)
if (ascii_isdigit(c)) { if (ascii_isdigit(c)) {
n = n * 10 + c - '0'; n = n * 10 + c - '0';
msg_putchar(c); msg_putchar(c);
++typed; typed++;
} else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) { } else if (c == K_DEL || c == K_KDEL || c == K_BS || c == Ctrl_H) {
if (typed > 0) { if (typed > 0) {
msg_puts("\b \b"); msg_puts("\b \b");
--typed; typed--;
} }
n /= 10; n /= 10;
} else if (mouse_used != NULL && c == K_LEFTMOUSE) { } else if (mouse_used != NULL && c == K_LEFTMOUSE) {
*mouse_used = TRUE; *mouse_used = true;
n = mouse_row + 1; n = mouse_row + 1;
break; break;
} else if (n == 0 && c == ':' && colon) { } else if (n == 0 && c == ':' && colon) {
@ -278,11 +208,10 @@ int get_number(int colon, int *mouse_used)
return n; return n;
} }
/* /// Ask the user to enter a number.
* Ask the user to enter a number. ///
* When "mouse_used" is not NULL allow using the mouse and in that case return /// When "mouse_used" is not NULL allow using the mouse and in that case return
* the line number. /// the line number.
*/
int prompt_for_number(int *mouse_used) int prompt_for_number(int *mouse_used)
{ {
int i; int i;
@ -297,8 +226,8 @@ int prompt_for_number(int *mouse_used)
msg_puts(_("Type number and <Enter> (q or empty cancels): ")); msg_puts(_("Type number and <Enter> (q or empty cancels): "));
} }
/* Set the state such that text can be selected/copied/pasted and we still // Set the state such that text can be selected/copied/pasted and we still
* get mouse events. */ // get mouse events.
save_cmdline_row = cmdline_row; save_cmdline_row = cmdline_row;
cmdline_row = 0; cmdline_row = 0;
save_State = State; save_State = State;
@ -306,7 +235,7 @@ int prompt_for_number(int *mouse_used)
// May show different mouse shape. // May show different mouse shape.
setmouse(); setmouse();
i = get_number(TRUE, mouse_used); i = get_number(true, mouse_used);
if (KeyTyped) { if (KeyTyped) {
// don't call wait_return() now // don't call wait_return() now
if (msg_row > 0) { if (msg_row > 0) {
@ -324,4 +253,3 @@ int prompt_for_number(int *mouse_used)
return i; return i;
} }

9
src/nvim/input.h Normal file
View File

@ -0,0 +1,9 @@
#ifndef NVIM_INPUT_H
#define NVIM_INPUT_H
#include "nvim/vim.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "input.h.generated.h"
#endif
#endif // NVIM_INPUT_H

View File

@ -31,7 +31,6 @@
#include "nvim/map.h" #include "nvim/map.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/screen.h" #include "nvim/screen.h"

View File

@ -34,7 +34,6 @@
#include "nvim/map.h" #include "nvim/map.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/regexp.h" #include "nvim/regexp.h"

View File

@ -39,7 +39,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -49,7 +49,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/path.h" #include "nvim/path.h"

View File

@ -51,6 +51,7 @@
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/func_attr.h" #include "nvim/func_attr.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/input.h"
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
@ -58,7 +59,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -17,7 +17,6 @@
#include "nvim/memfile.h" #include "nvim/memfile.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/sign.h" #include "nvim/sign.h"
#include "nvim/ui.h" #include "nvim/ui.h"
#include "nvim/vim.h" #include "nvim/vim.h"

View File

@ -22,7 +22,6 @@
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/menu.h" #include "nvim/menu.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/screen.h" #include "nvim/screen.h"
#include "nvim/state.h" #include "nvim/state.h"
#include "nvim/strings.h" #include "nvim/strings.h"

View File

@ -23,12 +23,12 @@
#include "nvim/garray.h" #include "nvim/garray.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/highlight.h" #include "nvim/highlight.h"
#include "nvim/input.h"
#include "nvim/keymap.h" #include "nvim/keymap.h"
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/ops.h" #include "nvim/ops.h"

View File

@ -1,10 +0,0 @@
#ifndef NVIM_MISC1_H
#define NVIM_MISC1_H
#include "nvim/os/shell.h"
#include "nvim/vim.h"
#ifdef INCLUDE_GENERATED_DECLARATIONS
# include "misc1.h.generated.h"
#endif
#endif // NVIM_MISC1_H

View File

@ -10,7 +10,6 @@
#include "nvim/diff.h" #include "nvim/diff.h"
#include "nvim/fold.h" #include "nvim/fold.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/os_unix.h" #include "nvim/os_unix.h"
@ -31,6 +30,32 @@
static linenr_T orig_topline = 0; static linenr_T orig_topline = 0;
static int orig_topfill = 0; static int orig_topfill = 0;
/// Return true if "c" is a mouse key.
bool is_mouse_key(int c)
{
return c == K_LEFTMOUSE
|| c == K_LEFTMOUSE_NM
|| c == K_LEFTDRAG
|| c == K_LEFTRELEASE
|| c == K_LEFTRELEASE_NM
|| c == K_MOUSEMOVE
|| c == K_MIDDLEMOUSE
|| c == K_MIDDLEDRAG
|| c == K_MIDDLERELEASE
|| c == K_RIGHTMOUSE
|| c == K_RIGHTDRAG
|| c == K_RIGHTRELEASE
|| c == K_MOUSEDOWN
|| c == K_MOUSEUP
|| c == K_MOUSELEFT
|| c == K_MOUSERIGHT
|| c == K_X1MOUSE
|| c == K_X1DRAG
|| c == K_X1RELEASE
|| c == K_X2MOUSE
|| c == K_X2DRAG
|| c == K_X2RELEASE;
}
/// Move the cursor to the specified row and column on the screen. /// Move the cursor to the specified row and column on the screen.
/// Change current window if necessary. Returns an integer with the /// Change current window if necessary. Returns an integer with the
/// CURSOR_MOVED bit set if the cursor has moved or unset otherwise. /// CURSOR_MOVED bit set if the cursor has moved or unset otherwise.

View File

@ -26,7 +26,6 @@
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/plines.h" #include "nvim/plines.h"

View File

@ -24,7 +24,6 @@
#include "nvim/map.h" #include "nvim/map.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"
#include "nvim/msgpack_rpc/helpers.h" #include "nvim/msgpack_rpc/helpers.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -40,7 +40,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -38,7 +38,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -55,7 +55,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -21,7 +21,6 @@
#include "nvim/assert.h" #include "nvim/assert.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/os/os_defs.h" #include "nvim/os/os_defs.h"

View File

@ -17,7 +17,6 @@
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/msgpack_rpc/channel.h" #include "nvim/msgpack_rpc/channel.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/state.h" #include "nvim/state.h"

View File

@ -21,7 +21,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option_defs.h" #include "nvim/option_defs.h"
#include "nvim/os/shell.h" #include "nvim/os/shell.h"
#include "nvim/os/signal.h" #include "nvim/os/signal.h"

View File

@ -18,7 +18,6 @@
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/os/signal.h" #include "nvim/os/signal.h"
#include "nvim/vim.h" #include "nvim/vim.h"

View File

@ -20,7 +20,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/msgpack_rpc/helpers.h" #include "nvim/msgpack_rpc/helpers.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -18,7 +18,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -27,7 +27,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -64,7 +64,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/plines.h" #include "nvim/plines.h"
#include "nvim/garray.h" #include "nvim/garray.h"

View File

@ -12,7 +12,6 @@
#include "nvim/ex_cmds.h" #include "nvim/ex_cmds.h"
#include "nvim/ex_cmds2.h" #include "nvim/ex_cmds2.h"
#include "nvim/lua/executor.h" #include "nvim/lua/executor.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"
#include "nvim/runtime.h" #include "nvim/runtime.h"

View File

@ -98,7 +98,6 @@
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/menu.h" #include "nvim/menu.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -32,7 +32,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"

View File

@ -94,12 +94,12 @@
#include "nvim/garray.h" #include "nvim/garray.h"
#include "nvim/getchar.h" #include "nvim/getchar.h"
#include "nvim/hashtab.h" #include "nvim/hashtab.h"
#include "nvim/input.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -237,7 +237,6 @@
#include "nvim/fileio.h" #include "nvim/fileio.h"
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -31,7 +31,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/ops.h" #include "nvim/ops.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -32,7 +32,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -25,11 +25,11 @@
#include "nvim/fold.h" #include "nvim/fold.h"
#include "nvim/garray.h" #include "nvim/garray.h"
#include "nvim/if_cscope.h" #include "nvim/if_cscope.h"
#include "nvim/input.h"
#include "nvim/mark.h" #include "nvim/mark.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"

View File

@ -64,7 +64,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -23,7 +23,6 @@
#include "nvim/main.h" #include "nvim/main.h"
#include "nvim/mbyte.h" #include "nvim/mbyte.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/misc1.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"
#include "nvim/option.h" #include "nvim/option.h"

View File

@ -99,7 +99,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/option.h" #include "nvim/option.h"
#include "nvim/os/input.h" #include "nvim/os/input.h"
#include "nvim/os/os.h" #include "nvim/os/os.h"

View File

@ -30,7 +30,6 @@
#include "nvim/memline.h" #include "nvim/memline.h"
#include "nvim/memory.h" #include "nvim/memory.h"
#include "nvim/message.h" #include "nvim/message.h"
#include "nvim/misc1.h"
#include "nvim/mouse.h" #include "nvim/mouse.h"
#include "nvim/move.h" #include "nvim/move.h"
#include "nvim/normal.h" #include "nvim/normal.h"