Skip to content

Windows support #2

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.

Sign up for GitHub

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

Merged
ericcurtin merged 1 commit into from
Nov 27, 2025
Merged

Windows support #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 15 additions & 3 deletions include/readline/terminal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
#pragma once

#include <termios.h>
#include <unistd.h>
#include <optional>
#include <thread>
#include <queue>
#include <mutex>
#include <condition_variable>
#include <atomic>

#ifdef _WIN32
#include <windows.h>
#else
#include <termios.h>
#include <unistd.h>
#endif

namespace readline {

class Terminal {
Expand All @@ -25,9 +30,16 @@ class Terminal {
private:
void io_loop();

#ifdef _WIN32
HANDLE input_handle_;
HANDLE output_handle_;
DWORD original_input_mode_;
DWORD original_output_mode_;
#else
int fd_;
bool raw_mode_;
struct termios original_termios_;
#endif
bool raw_mode_;
std::thread io_thread_;
std::queue<char> char_queue_;
std::mutex queue_mutex_;
Expand Down
56 changes: 36 additions & 20 deletions src/buffer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,38 @@
#include "readline/buffer.h"
#include "readline/types.h"
#include <iostream>
#include <sys/ioctl.h>
#include <unistd.h>
#include <algorithm>
#include <cstring>

#ifdef _WIN32
#define NOMINMAX
#include <windows.h>
#include <io.h>
#define STDOUT_FILENO _fileno(stdout)
#else
#include <sys/ioctl.h>
#include <unistd.h>
#endif

namespace readline {

Buffer::Buffer(const Prompt& prompt)
: prompt_(prompt) {

// Get terminal size
#ifdef _WIN32
CONSOLE_SCREEN_BUFFER_INFO csbi;
if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &csbi)) {
width_ = csbi.srWindow.Right - csbi.srWindow.Left + 1;
height_ = csbi.srWindow.Bottom - csbi.srWindow.Top + 1;
}
#else
struct winsize ws;
if (ioctl(STDOUT_FILENO, TIOCGWINSZ, &ws) == 0) {
width_ = ws.ws_col;
height_ = ws.ws_row;
}
#endif

line_width_ = width_ - static_cast<int>(prompt_.get_prompt().length());
}
Expand Down Expand Up @@ -95,7 +111,7 @@ void Buffer::move_left() {
std::cout << cursor_left_n(1);
}

int line = display_pos_ / line_width_ - 1;
int line = static_cast<int>(display_pos_ / line_width_) - 1;
bool has_space = get_line_spacing(line);
if (has_space) {
display_pos_ -= 1;
Expand All @@ -120,14 +136,14 @@ void Buffer::move_right() {

if (display_pos_ % line_width_ == 0) {
std::cout << cursor_down_n(1) << CURSOR_BOL
<< cursor_right_n(prompt_.get_prompt().length());
<< cursor_right_n(static_cast<int>(prompt_.get_prompt().length()));
} else if ((display_pos_ - r_length) % line_width_ == line_width_ - 1 && has_space) {
std::cout << cursor_down_n(1) << CURSOR_BOL
<< cursor_right_n(prompt_.get_prompt().length() + r_length);
<< cursor_right_n(static_cast<int>(prompt_.get_prompt().length()) + r_length);
display_pos_ += 1;
} else if (!line_has_space_.empty() && display_pos_ % line_width_ == line_width_ - 1 && has_space) {
std::cout << cursor_down_n(1) << CURSOR_BOL
<< cursor_right_n(prompt_.get_prompt().length());
<< cursor_right_n(static_cast<int>(prompt_.get_prompt().length()));
display_pos_ += 1;
} else {
std::cout << cursor_right_n(r_length);
Expand Down Expand Up @@ -165,27 +181,27 @@ void Buffer::move_right_word() {

void Buffer::move_to_start() {
if (pos_ > 0) {
int curr_line = display_pos_ / line_width_;
int curr_line = static_cast<int>(display_pos_ / line_width_);
if (curr_line > 0) {
std::cout << cursor_up_n(curr_line);
}
std::cout << CURSOR_BOL << cursor_right_n(prompt_.get_prompt().length());
std::cout << CURSOR_BOL << cursor_right_n(static_cast<int>(prompt_.get_prompt().length()));
pos_ = 0;
display_pos_ = 0;
}
}

void Buffer::move_to_end() {
if (pos_ < buffer_.size()) {
int curr_line = display_pos_ / line_width_;
int total_lines = display_size() / line_width_;
int curr_line = static_cast<int>(display_pos_ / line_width_);
int total_lines = static_cast<int>(display_size() / line_width_);
if (curr_line < total_lines) {
std::cout << cursor_down_n(total_lines - curr_line);
int remainder = display_size() % line_width_;
int remainder = static_cast<int>(display_size() % line_width_);
std::cout << CURSOR_BOL
<< cursor_right_n(prompt_.get_prompt().length() + remainder);
<< cursor_right_n(static_cast<int>(prompt_.get_prompt().length()) + remainder);
} else {
std::cout << cursor_right_n(display_size() - display_pos_);
std::cout << cursor_right_n(static_cast<int>(display_size() - display_pos_));
}

pos_ = buffer_.size();
Expand Down Expand Up @@ -260,7 +276,7 @@ int Buffer::count_remaining_line_width(int place) {
if (pos_ + counter < buffer_.size()) {
char32_t r = buffer_[pos_ + counter];
place += char_width(r);
prev_len = to_utf8(r).length();
prev_len = static_cast<int>(to_utf8(r).length());
} else {
break;
}
Expand All @@ -282,7 +298,7 @@ void Buffer::draw_remaining() {
remaining_text.length()));

if (!curr_line.empty()) {
std::cout << CLEAR_TO_EOL << curr_line << cursor_left_n(curr_line.length());
std::cout << CLEAR_TO_EOL << curr_line << cursor_left_n(static_cast<int>(curr_line.length()));
} else {
std::cout << CLEAR_TO_EOL;
}
Expand Down Expand Up @@ -369,7 +385,7 @@ void Buffer::delete_word() {
void Buffer::replace(const std::u32string& text) {
display_pos_ = 0;
pos_ = 0;
int line_nums = display_size() / line_width_;
int line_nums = static_cast<int>(display_size() / line_width_);

buffer_.clear();

Expand All @@ -390,20 +406,20 @@ void Buffer::clear_screen() {
std::cout << CLEAR_SCREEN << CURSOR_RESET << prompt_.get_prompt();
if (is_empty()) {
std::string ph = prompt_.get_placeholder();
std::cout << COLOR_GREY << ph << cursor_left_n(ph.length()) << COLOR_DEFAULT;
std::cout << COLOR_GREY << ph << cursor_left_n(static_cast<int>(ph.length())) << COLOR_DEFAULT;
} else {
size_t curr_pos = display_pos_;
size_t curr_index = pos_;
pos_ = 0;
display_pos_ = 0;
draw_remaining();
std::cout << CURSOR_RESET << cursor_right_n(prompt_.get_prompt().length());
std::cout << CURSOR_RESET << cursor_right_n(static_cast<int>(prompt_.get_prompt().length()));
if (curr_pos > 0) {
int target_line = curr_pos / line_width_;
int target_line = static_cast<int>(curr_pos / line_width_);
if (target_line > 0) {
std::cout << cursor_down_n(target_line);
}
int remainder = curr_pos % line_width_;
int remainder = static_cast<int>(curr_pos % line_width_);
if (remainder > 0) {
std::cout << cursor_right_n(remainder);
}
Expand Down
11 changes: 8 additions & 3 deletions src/history.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
#include <sstream>
#include <stdexcept>
#include <cstdlib>
#include <sys/stat.h>

namespace readline {

Expand All @@ -12,9 +11,15 @@ History::History() {
}

void History::init() {
const char* home = std::getenv("HOME");
#ifdef _WIN32
const char* env_var = "USERPROFILE";
#else
const char* env_var = "HOME";
#endif

const char* home = std::getenv(env_var);
if (!home) {
throw std::runtime_error("HOME environment variable not set");
return;
}

std::filesystem::path history_dir = std::filesystem::path(home) / ".readline";
Expand Down
4 changes: 3 additions & 1 deletion src/readline.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ std::string Readline::readline() {
bool show_placeholder = !pasting_ || prompt_.use_alt;
if (buf.is_empty() && show_placeholder) {
std::string ph = prompt_.get_placeholder();
std::cout << COLOR_GREY << ph << cursor_left_n(ph.length())
std::cout << COLOR_GREY << ph << cursor_left_n(static_cast<int>(ph.length()))
<< COLOR_DEFAULT << std::flush;
}

Expand Down Expand Up @@ -226,7 +226,9 @@ std::string Readline::readline() {
buf.delete_word();
break;
case CHAR_CTRL_Z:
#ifndef _WIN32
kill(0, SIGSTOP);
#endif
return "";
case CHAR_ENTER:
case CHAR_CTRL_J: {
Expand Down
Loading
Loading