Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add readline library replacement for MSVC #1264

Merged
merged 2 commits into from
Jan 5, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,8 @@ endif()
find_library(HAVE_LIBREADLINE NAMES ${PREFERRED_LIBREADLINE})
if(HAVE_LIBREADLINE)
set(LIB_LIBREADLINE ${HAVE_LIBREADLINE})
elseif(MSVC)
set(HAVE_LIBREADLINE 1)
endif()

# =====================================
Expand Down
1 change: 1 addition & 0 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ if(MSVC)
"msvc/getopt.c"
"msvc/gettimeofday.c"
"msvc/usleep.cpp"
"msvc/readline.cpp"
)
set(EXTRA_WINDOWS_INCLUDES ${EXTRA_WINDOWS_INCLUDES}
"msvc"
Expand Down
95 changes: 95 additions & 0 deletions src/msvc/readline.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,95 @@
//
// readline.cpp
// Copyright (C) 2022 Marius Greuel
// SPDX-License-Identifier: GPL-2.0-or-later
//

#include <string.h>
#include <iostream>
#include <memory>
#include <mutex>
#include <string>
#include <thread>
#include "readline/readline.h"
#include "readline/history.h"

int rl_readline_version = 0x0502;

static rl_vcpfunc_t* rl_handler;
static std::unique_ptr<std::thread> rl_thread;
static std::mutex rl_mutex;
static std::string rl_line;
static bool rl_has_line = false;

static void get_line_thread()
{
std::string line;
std::getline(std::cin, line);

const std::lock_guard<std::mutex> lock(rl_mutex);
rl_line = line;
rl_has_line = true;
}

static void call_handler(const char* string)
{
if (rl_thread)
{
rl_thread->join();
rl_thread = nullptr;
}

if (rl_handler != nullptr)
{
if (string == nullptr)
{
rl_handler(nullptr);
}
else
{
rl_handler(_strdup(string));
}
}
}

int rl_input_available(void)
{
return 1;
}

void rl_callback_read_char(void)
{
if (std::cin.eof())
{
call_handler(nullptr);
}
else if (!rl_thread)
{
rl_thread = std::make_unique<std::thread>(get_line_thread);
}
else
{
const std::lock_guard<std::mutex> lock(rl_mutex);
if (rl_has_line)
{
rl_has_line = false;
call_handler(rl_line.c_str());
}
}
}

void rl_callback_handler_install(char* prompt, rl_vcpfunc_t* handler)
{
rl_handler = handler;

std::cout << prompt;
}

void rl_callback_handler_remove(void)
{
rl_handler = nullptr;
}

void add_history(const char*)
{
}
17 changes: 17 additions & 0 deletions src/msvc/readline/history.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
//
// history.h
// Copyright (C) 2022 Marius Greuel
// SPDX-License-Identifier: GPL-2.0-or-later
//

#pragma once

#ifdef __cplusplus
extern "C" {
#endif

void add_history(const char* string);

#ifdef __cplusplus
}
#endif
24 changes: 24 additions & 0 deletions src/msvc/readline/readline.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
//
// readline.h
// Copyright (C) 2022 Marius Greuel
// SPDX-License-Identifier: GPL-2.0-or-later
//

#pragma once

#ifdef __cplusplus
extern "C" {
#endif

typedef void (rl_vcpfunc_t)(char* line);

extern int rl_readline_version;

int rl_input_available(void);
void rl_callback_read_char(void);
void rl_callback_handler_install(char* prompt, rl_vcpfunc_t* handler);
void rl_callback_handler_remove(void);

#ifdef __cplusplus
}
#endif
4 changes: 3 additions & 1 deletion src/term.c
Original file line number Diff line number Diff line change
Expand Up @@ -1314,7 +1314,9 @@ static int term_running;

// Any character in standard input available (without sleeping)?
static int readytoread() {
#ifdef WIN32
#ifdef _MSC_VER
return rl_input_available();
#elif defined(WIN32)
HANDLE hStdin = GetStdHandle(STD_INPUT_HANDLE);

while(1) {
Expand Down