talezero/integration
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First steps of implementing command-line processing in the ascii driver.

Browse Source
This commit is contained in:
jyelon
2025-12-18 19:42:05 -05:00
parent 3dd6894305
commit 2646e4d4ac
3 changed files with 71 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
luprex/cpp/drv/driver.cpp
View File

@@ -16,6 +16,9 @@ static void if_error_print_and_exit(const std::string_view str) {
}
}
// DPrints are currently not going through the readline device.
// doing so would not currently be thread-safe. Do I care about
// that? I'm not sure.
static void dprint_callback(const char *oneline, size_t size) {
fwrite("**", 1, 2, stderr);
fwrite(oneline, 1, size, stderr);
@@ -91,6 +94,7 @@ class Driver {
std::unique_ptr<struct pollfd[]> pollvec_;
std::unique_ptr<char[]> chbuf_;
ReadlineDevice readline_device_;
std::string console_command_;
sslutil::UniqueCTX ssl_server_ctx_;
sslutil::UniqueCTX ssl_client_secure_ctx_;
@@ -197,34 +201,58 @@ class Driver {
}
}
void handle_console_output() {
void channel_printbuffer() {
if (engw.get_have_prints(&engw)) {
uint32_t ndata;
const char *data;
engw.play_access(&engw, AccessKind::CHANNEL_PRINTS, 0, 0, "", &ndata, &data);
if (ndata > 0) {
if (ndata > DRV_SHORTSTRING_SIZE) ndata = DRV_SHORTSTRING_SIZE;
std::string_view src(data, ndata);
int consumed;
std::u32string cps = drvutil::utf8_to_utf32(src, &consumed);
readline_device_.print(cps);
readline_device_.printline(std::string_view(data, ndata));
}
}
}
void add_console_command(std::string_view addition)
{
std::string cmd = console_command_ + std::string(addition);
console_command_.clear();
uint32_t ndata;
const char *data;
engw.play_access(&engw, AccessKind::VALIDATE_LUA_EXPR,
0, cmd.size(), cmd.c_str(), &ndata, &data);
std::string_view message(data, ndata);
// Handle the command.
if (message == "truncated lua") {
console_command_ = cmd;
} else if (message == "white space") {
readline_device_.printline("white space.");
} else if (message == "slash command") {
readline_device_.printline("slash command.");
} else if (message.empty()) {
readline_device_.printline("valid lua");
} else {
readline_device_.printline(message);
}
if (console_command_.empty()) {
readline_device_.set_prompt(">");
} else {
readline_device_.set_prompt(">>");
}
}
void handle_console_input() {
read_console_recently_ = false;
std::u32string prompt = drvutil::utf8_to_utf32(">", nullptr);
readline_device_.set_prompt(prompt);
while (true) {
std::u32string cps = console_read();
if (cps.size() == 0) break;
read_console_recently_ = true;
for (char32_t c : cps) {
std::u32string line = readline_device_.putcode(c);
std::string line = readline_device_.putcode(c);
if (!line.empty()) {
std::string utf8 = drvutil::utf32_to_utf8(line);
engw.play_recv_incoming(&engw, 0, utf8.size(), utf8.c_str());
add_console_command(line);
}
}
}
@@ -588,7 +616,9 @@ class Driver {
int drive(int argc, char *argv[]) {
// Set up the console readline device.
readline_device_.set_print_callback(console_write);
readline_device_.set_prompt(">");
console_command_.clear();
// Remove the program name from argv.
std::string program = argv[0];
argc -= 1;
@@ -659,12 +689,11 @@ class Driver {
// Main loop.
while (!engw.get_stop_driver(&engw)) {
handle_lua_source();
handle_console_output();
handle_new_outgoing_sockets();
handle_socket_input_output();
handle_console_input();
engw.play_update(&engw, drvutil::get_monotonic_clock());
handle_console_output();
channel_printbuffer();
}
// Cleanup