wyj/neovim
1
0
Fork 0
mirror of https://github.com/neovim/neovim.git synced 2024-09-17 20:58:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

trying out changes from issue thread

Browse Source
This commit is contained in:
JD Rudie 2024-01-29 09:07:08 -05:00
parent 48b3e99be2
commit bcf9653814
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/nvim/ex_getln.c
View File

@ -17,6 +17,7 @@
#include "nvim/ascii_defs.h"
#include "nvim/autocmd.h"
#include "nvim/buffer.h"
#include "nvim/change.h"
#include "nvim/charset.h"
#include "nvim/cmdexpand.h"
#include "nvim/cmdhist.h"
@ -74,6 +75,7 @@
#include "nvim/viml/parser/expressions.h"
#include "nvim/viml/parser/parser.h"
#include "nvim/window.h"
#include "nvim/winfloat.h"
/// Last value of prompt_id, incremented when doing new prompt
static unsigned last_prompt_id = 0;
@ -692,7 +694,30 @@ static uint8_t *command_line_enter(int firstc, int count, int indent, bool clear
s->break_ctrl_c = true;
}
init_ccline(s->firstc, s->indent);
bool useNew = true;
if (useNew) {
FloatConfig fconfig = FLOAT_CONFIG_INIT;
fconfig.height = 1;
fconfig.width = Columns;
fconfig.row = Rows;
fconfig.zindex = kZIndexCmdlinePopupMenu;
fconfig.style = kWinStyleMinimal;
ccline.cmdlinewin = win_new_float(NULL, false, fconfig, NULL);
ccline.cmdfilebuf = buflist_new(NULL, NULL, 1, BLN_NOOPT | BLN_DUMMY);
win_enter(ccline.cmdlinewin, true);
set_curbuf(ccline.cmdfilebuf, DOBUF_SPLIT);
set_option_value(kOptFiletype, STATIC_CSTR_AS_OPTVAL("vim"), OPT_LOCAL);
set_option_value(kOptWinhighlight, STATIC_CSTR_AS_OPTVAL("NormalFloat:Normal"), OPT_LOCAL);
init_ccline(s->firstc, s->indent);
ccline.prompt_id = last_prompt_id++;
ccline.level = cmdline_level;
} else {
init_ccline(s->firstc, s->indent);
}
ccline.prompt_id = last_prompt_id++;
ccline.level = cmdline_level;
@ -3776,9 +3801,24 @@ static void redrawcmdprompt(void)
// Redraw what is currently on the command line.
void redrawcmd(void)
{
if (cmd_silent) {
return;
}
// TODO(rudiejd) source from config
bool useNew = true;
// TODO(rudiejd) - move to diff function
if (useNew) {
char buf[MAXPATHL];
buf[0] = (char)ccline.cmdfirstc;
xstrlcpy(buf + 1, ccline.cmdbuff, MAXPATHL);
ml_replace_buf(ccline.cmdfilebuf, 1, buf, true);
changed_lines(ccline.cmdfilebuf, 1, 0, 1, 0, false);
ccline.cmdspos = cmd_screencol(ccline.cmdpos);
ccline.cmdlinewin->w_cursor.col = ccline.cmdspos;
update_screen();
return;
}
if (ui_has(kUICmdline)) {
draw_cmdline(0, ccline.cmdlen);

3
src/nvim/ex_getln_defs.h
View File

@ -41,8 +41,9 @@ typedef enum {
/// structure.
typedef struct cmdline_info CmdlineInfo;
struct cmdline_info {
char *cmdbuff; ///< pointer to command line buffer
char *cmdbuff; ///< pointer to command line buffer
buf_T *cmdfilebuf; ///< dummy, read-only file-buffer with command line
win_T *cmdlinewin; ///< floating window where cmdline contents live
int cmdbufflen; ///< length of cmdbuff
int cmdlen; ///< number of chars in command line
int cmdpos; ///< current cursor position