X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/61c7112146ed7cc27b0a921843efdaaa7878d449..a61a2713e0da8cffde645b2655df4bf7c04e32c5:/Console.cpp diff --git a/Console.cpp b/Console.cpp index 93df749..76ad553 100644 --- a/Console.cpp +++ b/Console.cpp @@ -389,17 +389,12 @@ static Type_ *CYmemrchr(Type_ *data, Type_ value, size_t size) { return NULL; } -static int CYConsoleKeyBypass(int count, int key) { - rl_point = rl_end; - rl_insert(count, '\n'); - return rl_newline(count, key); -} - static int CYConsoleKeyReturn(int count, int key) { if (rl_point != rl_end) { if (memchr(rl_line_buffer, '\n', rl_end) == NULL) - return CYConsoleKeyBypass(count, key); + return rl_newline(count, key); + insert: char *before(CYmemrchr(rl_line_buffer, '\n', rl_point)); if (before == NULL) before = rl_line_buffer; @@ -419,13 +414,12 @@ static int CYConsoleKeyReturn(int count, int key) { return 0; } - rl_insert(count, '\n'); - bool done(false); if (rl_line_buffer[0] == '?') done = true; else { std::string command(rl_line_buffer, rl_end); + command += '\n'; std::istringstream stream(command); size_t last(std::string::npos); @@ -446,7 +440,9 @@ static int CYConsoleKeyReturn(int count, int key) { if (done) return rl_newline(count, key); - return 0; + + // XXX: this was the most obvious fix, but is seriously dumb + goto insert; } static int CYConsoleKeyUp(int count, int key) { @@ -514,6 +510,8 @@ static int CYConsoleLineBegin(int count, int key) { static int CYConsoleLineEnd(int count, int key) { while (rl_point != rl_end && rl_line_buffer[rl_point] != '\n') ++rl_point; + if (rl_point != rl_end && rl_editing_mode == 0) + --rl_point; return 0; } @@ -549,23 +547,36 @@ static int CYConsoleKeyTab(int count, int key) { return rl_insert(4 - (rl_point - start) % 4, ' '); } -static void CYConsoleRemapBind(rl_command_func_t *from, rl_command_func_t *to) { - char **keyseqs(rl_invoking_keyseqs(from)); +static void CYConsoleRemapBind(Keymap map, rl_command_func_t *from, rl_command_func_t *to) { + char **keyseqs(rl_invoking_keyseqs_in_map(from, map)); if (keyseqs == NULL) return; for (char **keyseq(keyseqs); *keyseq != NULL; ++keyseq) { - rl_bind_keyseq(*keyseq, to); + rl_bind_keyseq_in_map(*keyseq, to, map); free(*keyseq); } free(keyseqs); } +static void CYConsoleRemapKeys(Keymap map) { + CYConsoleRemapBind(map, &rl_beg_of_line, &CYConsoleLineBegin); + CYConsoleRemapBind(map, &rl_end_of_line, &CYConsoleLineEnd); + + CYConsoleRemapBind(map, &rl_get_previous_history, &CYConsoleKeyUp); + CYConsoleRemapBind(map, &rl_get_next_history, &CYConsoleKeyDown); + + CYConsoleRemapBind(map, &rl_rubout, &CYConsoleKeyBack); + CYConsoleRemapBind(map, &rl_complete, &CYConsoleKeyTab); +} + static void CYConsolePrepTerm(int meta) { rl_prep_terminal(meta); - CYConsoleRemapBind(&rl_beg_of_line, &CYConsoleLineBegin); - CYConsoleRemapBind(&rl_end_of_line, &CYConsoleLineEnd); - CYConsoleRemapBind(&rl_rubout, &CYConsoleKeyBack); + CYConsoleRemapKeys(emacs_standard_keymap); + CYConsoleRemapKeys(emacs_meta_keymap); + CYConsoleRemapKeys(emacs_ctlx_keymap); + CYConsoleRemapKeys(vi_insertion_keymap); + CYConsoleRemapKeys(vi_movement_keymap); } static void Console(CYOptions &options) { @@ -599,26 +610,9 @@ static void Console(CYOptions &options) { rl_completer_word_break_characters = break_; rl_attempted_completion_function = &Complete; - rl_bind_key(TAB, &CYConsoleKeyTab); - rl_redisplay_function = CYDisplayUpdate; rl_prep_term_function = CYConsolePrepTerm; -#if defined (__MSDOS__) - rl_bind_keyseq("\033[0A", &CYConsoleKeyUp); - rl_bind_keyseq("\033[0D", &CYConsoleKeyDown); -#endif - rl_bind_keyseq("\033[A", &CYConsoleKeyUp); - rl_bind_keyseq("\033[B", &CYConsoleKeyDown); - rl_bind_keyseq("\033OA", &CYConsoleKeyUp); - rl_bind_keyseq("\033OB", &CYConsoleKeyDown); -#if defined (__MINGW32__) - rl_bind_keyseq("\340H", &CYConsoleKeyUp); - rl_bind_keyseq("\340P", &CYConsoleKeyDown); - rl_bind_keyseq("\\000H", &CYConsoleKeyUp); - rl_bind_keyseq("\\000P", &CYConsoleKeyDown); -#endif - struct sigaction action; sigemptyset(&action.sa_mask); action.sa_handler = &sigint; @@ -633,8 +627,8 @@ static void Console(CYOptions &options) { } if (bypass) { - rl_bind_key('\r', &CYConsoleKeyBypass); - rl_bind_key('\n', &CYConsoleKeyBypass); + rl_bind_key('\r', &rl_newline); + rl_bind_key('\n', &rl_newline); } else { rl_bind_key('\r', &CYConsoleKeyReturn); rl_bind_key('\n', &CYConsoleKeyReturn); @@ -651,11 +645,9 @@ static void Console(CYOptions &options) { std::string command(line); free(line); - _assert(!command.empty()); - _assert(command[command.size() - 1] == '\n'); - command.resize(command.size() - 1); if (command.empty()) continue; + history += command; if (command[0] == '?') { std::string data(command.substr(1)); @@ -681,14 +673,13 @@ static void Console(CYOptions &options) { *out_ << "lower == " << (lower ? "true" : "false") << std::endl; } - history += command; continue; } std::string code; if (bypass) code = command; - else { + else try { std::istringstream stream(command); CYPool pool; @@ -717,7 +708,6 @@ static void Console(CYOptions &options) { std::cerr << " | "; std::cerr << error->message_ << std::endl; - history += command; break; } @@ -732,10 +722,12 @@ static void Console(CYOptions &options) { Setup(out, driver, options, lower); out << *driver.script_; code = str.str(); + } catch (const CYException &error) { + CYPool pool; + std::cout << error.PoolCString(pool) << std::endl; + continue; } - history += command; - if (debug) { std::cout << "cy= "; CYLexerHighlight(code.c_str(), code.size(), std::cout); @@ -1108,6 +1100,7 @@ int Main(int argc, char * const argv[], char const * const envp[]) { if (failed || !driver.errors_.empty()) { for (CYDriver::Errors::const_iterator i(driver.errors_.begin()); i != driver.errors_.end(); ++i) std::cerr << i->location_.begin << ": " << i->message_ << std::endl; + return 1; } else if (driver.script_ != NULL) { std::stringbuf str; CYOutput out(str, options);