1
0
Fork 0

using linenoise from yhirose/cpp-linenoise

This commit is contained in:
Jan Steemann 2015-10-27 09:35:31 +01:00
parent d9eb549335
commit e38d547a88
3 changed files with 1246 additions and 1777 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,12 +1,14 @@
/* linenoise.h -- guerrilla line editing library against the idea that a /* linenoise.h -- VERSION 1.0
* line editing lib needs to be 20,000 lines of C code. *
* Guerrilla line editing library against the idea that a line editing lib
* needs to be 20,000 lines of C code.
* *
* See linenoise.c for more information. * See linenoise.c for more information.
* *
* ------------------------------------------------------------------------ * ------------------------------------------------------------------------
* *
* Copyright (c) 2010, Salvatore Sanfilippo <antirez at gmail dot com> * Copyright (c) 2010-2014, Salvatore Sanfilippo <antirez at gmail dot com>
* Copyright (c) 2010, Pieter Noordhuis <pcnoordhuis at gmail dot com> * Copyright (c) 2010-2013, Pieter Noordhuis <pcnoordhuis at gmail dot com>
* *
* All rights reserved. * All rights reserved.
* *
@ -37,26 +39,30 @@
#ifndef __LINENOISE_H #ifndef __LINENOISE_H
#define __LINENOISE_H #define __LINENOISE_H
#ifndef NO_COMPLETION #ifdef __cplusplus
extern "C" {
#endif
typedef struct linenoiseCompletions { typedef struct linenoiseCompletions {
size_t len; size_t len;
char **cvec; char **cvec;
int multiLine;
} linenoiseCompletions; } linenoiseCompletions;
typedef void(linenoiseCompletionCallback)(const char *, linenoiseCompletions *); typedef void(linenoiseCompletionCallback)(const char *, linenoiseCompletions *);
void linenoiseSetCompletionCallback(linenoiseCompletionCallback *); void linenoiseSetCompletionCallback(linenoiseCompletionCallback *);
void linenoiseAddCompletion(linenoiseCompletions *, const char *); void linenoiseAddCompletion(linenoiseCompletions *, const char *);
#endif
char *linenoise(const char *prompt); char *linenoise(const char *prompt);
int linenoiseHistoryAdd(const char *line); int linenoiseHistoryAdd(const char *line);
int linenoiseHistorySetMaxLen(int len); int linenoiseHistorySetMaxLen(int len);
int linenoiseHistoryGetMaxLen(void);
int linenoiseHistorySave(const char *filename); int linenoiseHistorySave(const char *filename);
int linenoiseHistoryLoad(const char *filename); int linenoiseHistoryLoad(const char *filename);
void linenoiseHistoryFree(void); void linenoiseClearScreen(void);
char **linenoiseHistory(int *len); void linenoiseSetMultiLine(int ml);
int linenoiseColumns(void); void linenoisePrintKeyCodes(void);
#ifdef __cplusplus
}
#endif
#endif /* __LINENOISE_H */ #endif /* __LINENOISE_H */

View File

@ -63,8 +63,6 @@ static void LinenoiseCompletionGenerator (char const* text,
linenoiseAddCompletion(lc, it.c_str()); linenoiseAddCompletion(lc, it.c_str());
} }
} }
lc->multiLine = 1;
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@ -83,6 +81,7 @@ LinenoiseShell::LinenoiseShell (std::string const& history,
Completer* completer) Completer* completer)
: ShellBase(history, completer) { : ShellBase(history, completer) {
COMPLETER = completer; COMPLETER = completer;
linenoiseSetMultiLine(1);
linenoiseSetCompletionCallback(LinenoiseCompletionGenerator); linenoiseSetCompletionCallback(LinenoiseCompletionGenerator);
} }