p/json-rpc-shell
1
1
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases 3 Wiki Activity

Compare commits

base: p:d820bc2f23eb736575554e20621b4df80e7b1dc6
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0
..
compare: p:0771c142fe8257aac22db7c02ca473b5fb4b13a1
Branches Tags
p:master
p:v1.2.0
p:v1.1.0
p:v1.0.0

No commits in common. "d820bc2f23eb736575554e20621b4df80e7b1dc6" and "0771c142fe8257aac22db7c02ca473b5fb4b13a1" have entirely different histories.
d820bc2f23 ... 0771c142fe

3 changed files with 6 additions and 24 deletions
Show Stats Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -14,7 +14,7 @@ endif ("${CMAKE_C_COMPILER_ID}" MATCHES "GNU" OR CMAKE_COMPILER_IS_GNUCC)
# Version # Version
set (project_VERSION_MAJOR "1") set (project_VERSION_MAJOR "1")
set (project_VERSION_MINOR "1") set (project_VERSION_MINOR "0")
set (project_VERSION_PATCH "0") set (project_VERSION_PATCH "0")
set (project_VERSION "${project_VERSION_MAJOR}") set (project_VERSION "${project_VERSION_MAJOR}")

11
NEWS
View File

@ -1,14 +1,3 @@
1.1.0 (2020-10-13)
* Add method name tab completion using OpenRPC information
* Bind M-Enter to insert a newline into the command line
* json-rpc-test-server: fix a memory leak and request URI parsing
* Miscellaneous bug fixes
1.0.0 (2020-09-05) 1.0.0 (2020-09-05)
* Initial release * Initial release

17
json-rpc-shell.c
View File

@ -643,15 +643,6 @@ input_el_on_run_editor (EditLine *editline, int key)
return CC_NORM; return CC_NORM;
} }
static unsigned char
input_el_on_newline_insert (EditLine *editline, int key)
{
(void) key;
el_insertstr (editline, "\n");
return CC_REFRESH;
}
static void static void
input_el_install_prompt (struct input_el *self) input_el_install_prompt (struct input_el *self)
{ {
@ -680,17 +671,19 @@ input_el_start (struct input *input, const char *program_name)
// Just what are you doing? // Just what are you doing?
el_set (self->editline, EL_BIND, "^u", "vi-kill-line-prev", NULL); el_set (self->editline, EL_BIND, "^u", "vi-kill-line-prev", NULL);
// It's probably better to handle these ourselves // It's probably better to handle this ourselves
el_set (self->editline, EL_ADDFN, el_set (self->editline, EL_ADDFN,
"send-line", "Send line", input_el_on_return); "send-line", "Send line", input_el_on_return);
el_set (self->editline, EL_BIND, "\n", "send-line", NULL); el_set (self->editline, EL_BIND, "\n", "send-line", NULL);
// It's probably better to handle this ourselves
el_set (self->editline, EL_ADDFN, el_set (self->editline, EL_ADDFN,
"run-editor", "Run editor to edit line", input_el_on_run_editor); "run-editor", "Run editor to edit line", input_el_on_run_editor);
el_set (self->editline, EL_BIND, "M-e", "run-editor", NULL); el_set (self->editline, EL_BIND, "M-e", "run-editor", NULL);
el_set (self->editline, EL_ADDFN, el_set (self->editline, EL_ADDFN,
"newline-insert", "Insert a newline", input_el_on_newline_insert); "complete", "Complete word", input_el_on_complete);
el_set (self->editline, EL_BIND, "M-\n", "newline-insert", NULL); el_set (self->editline, EL_BIND, "\t", "complete", NULL);
// Source the user's defaults file // Source the user's defaults file
el_source (self->editline, NULL); el_source (self->editline, NULL);