Fix

Author: flagarde

cpp-terminal/cursor.cpp

@@ -21,15 +21,6 @@ void Term::Cursor::setRow(const std::size_t& row) { m_position.first = row; }
 
 void Term::Cursor::setColum(const std::size_t& column) { m_position.second = column; }
 
-Term::Cursor Term::cursor_position()
-{
-  // write cursor position report
-  std::cout << cursor_position_report() << std::flush;
-  Term::Event c;
-  while((c = Platform::read_raw()).empty()) continue;
-  return c;
-}
-
 std::string Term::cursor_off() { return "\x1b[?25l"; }
 
 std::string Term::cursor_on() { return "\x1b[?25h"; }
@@ -44,6 +35,6 @@ std::string Term::cursor_right(std::size_t columns) { return "\033[" + std::to_s
 
 std::string Term::cursor_left(std::size_t columns) { return "\033[" + std::to_string(columns) + 'D'; }
 
-std::string Term::cursor_position_report() { return "\x1b[6n"; }
+std::string Term::cursor_position_report() { return "\033[6n"; }
 
 std::string Term::clear_eol() { return "\033[K"; }

cpp-terminal/event.cpp

@@ -2,6 +2,8 @@
 
 #include "cpp-terminal/cursor.hpp"
 
+#include <iostream>
+
 bool Term::Event::empty()
 {
   if(m_Type == Type::Empty) return true;
@@ -33,6 +35,7 @@ Term::Event::Event(const std::string& str) : m_Type(Type::CopyPaste), m_str(str)
 
 void Term::Event::parse()
 {
+  std::cout<<"LL "<<m_str<<std::endl;
   if(m_str.size() == 1)
   {
     m_Type = Type::Key;
@@ -53,6 +56,7 @@ void Term::Event::parse()
     if(found != std::string::npos)
     {
       m_Type   = Type::Cursor;
+
       m_Cursor = Cursor(std::stoi(m_str.substr(2, found - 2)), std::stoi(m_str.substr(found + 1, m_str.size() - (found + 2))));
     }
   }

cpp-terminal/platforms/CMakeLists.txt

@@ -1,4 +1,4 @@
-add_library(cpp-terminal-platforms terminal.cpp tty.cpp terminfo.cpp input.cpp screen.cpp)
+add_library(cpp-terminal-platforms terminal.cpp tty.cpp terminfo.cpp input.cpp screen.cpp cursor.cpp)
 target_link_libraries(cpp-terminal-platforms PRIVATE Warnings::Warnings)
 target_compile_options(cpp-terminal-platforms PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
 target_include_directories(cpp-terminal-platforms PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)

cpp-terminal/platforms/cursor.cpp

@@ -0,0 +1,26 @@
+#include "cpp-terminal/cursor.hpp"
+
+#if defined(_WIN32)
+  #include "windows.h"
+#else
+  #include "cpp-terminal/event.hpp"
+  #include "cpp-terminal/input.hpp"
+  #include <iostream>
+#endif
+
+Term::Cursor Term::cursor_position()
+{
+#if defined(_WIN32)
+  Term::Cursor             ret;
+  HANDLE                   hConOut{CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)};
+  CONSOLE_SCREEN_BUFFER_INFO inf;
+  if(GetConsoleScreenBufferInfo(hConOut, &inf)) { ret = {static_cast<std::size_t>(inf.dwCursorPosition.Y+1), static_cast<std::size_t>(inf.dwCursorPosition.X+1)}; }
+  CloseHandle(hConOut);
+  return ret;
+#else
+  std::cout << Term::cursor_position_report() << std::flush;
+  Term::Event c;
+  while((c = Platform::read_raw()).empty());
+  return c;
+#endif
+}

cpp-terminal/platforms/screen.cpp

@@ -14,7 +14,7 @@ Term::Screen Term::screen_size()
   Term::Screen               ret;
   HANDLE                     hConOut{CreateFile("CONOUT$", GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL)};
   CONSOLE_SCREEN_BUFFER_INFO inf;
-  if(GetConsoleScreenBufferInfo(hConOut, &inf)) { ret = {inf.srWindow.Bottom - inf.srWindow.Top + 1, inf.srWindow.Right - inf.srWindow.Left + 1}; }
+  if(GetConsoleScreenBufferInfo(hConOut, &inf)) { ret = {static_cast<std::size_t>(inf.srWindow.Bottom - inf.srWindow.Top + 1), static_cast<std::size_t>(inf.srWindow.Right - inf.srWindow.Left + 1)}; }
   CloseHandle(hConOut);
   return ret;
 #else