Thread (jupyter-xeus#284)

 Co-authored-by: flagarde <flagarde.program@pm.me>

Author: flagarde

.clang-format

@@ -48,7 +48,7 @@ BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: AfterColon
 BreakAfterJavaFieldAnnotations: false
 BreakStringLiterals: false
-ColumnLimit: 260
+ColumnLimit: 450
 CommentPragmas: '^ IWYU pragma:'
 CompactNamespaces: false
 ConstructorInitializerIndentWidth: 2

.clang-tidy

@@ -0,0 +1,4 @@
+---
+Checks: 'abseil-*,altera-*,android-*,boost-*,bugprone-*,cert-*,clang-analyzer-*,concurrency-*,cppcoreguidelines-*,darwin-*,fuchsia-*,google-*,hicpp-*,linuxkernel-*,llvm-*,misc-*,modernize-*,mpi-*,openmp-*,performance-*,portability-*,readability-*,zircon-*'
+WarningsAsErrors: false
+...

CMakeLists.txt

@@ -9,7 +9,6 @@ project(cpp-terminal
  LANGUAGES CXX)
 
 # see https://cmake.org/cmake/help/latest/policy/CMP0092.html
-message(STATUS "${CMAKE_CXX_FLAGS}")
 if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
  set(CMAKE_CXX_FLAGS_OLD "${CMAKE_CXX_FLAGS}")
  if(CMAKE_CXX_FLAGS MATCHES "/W[0-4]")

cmake/Warnings.cmake

@@ -24,17 +24,16 @@ set(GCC_LIKE_WARNINGS
 set(GCC_LIKE_CXX_WARNINGS)
 #GCC
 set(GCC_WARNINGS
- "$<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,4.8.0>:-Wpedantic>"
- "$<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,4.9.0>:-fdiagnostics-color=auto>"
- "-Wno-implicit-fallthrough"
- "-Wno-maybe-uninitialized"
- "-Wno-strict-overflow"
+ "$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.8.0>:-Wpedantic>"
+ "$<$<VERSION_GREATER_EQUAL:$<C_COMPILER_VERSION>,4.9.0>:-fdiagnostics-color=auto>"
  "-Wpointer-arith"
  "-Wredundant-decls"
  "-Wundef"
  "-Wwrite-strings")
 set(GCC_CXX_WARNINGS
  "-Wdelete-non-virtual-dtor"
+ "$<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,4.8.0>:-Wpedantic>"
+ "$<$<VERSION_GREATER_EQUAL:$<CXX_COMPILER_VERSION>,4.9.0>:-fdiagnostics-color=auto>"
  "-Wnoexcept")
 #Clang like
 set(CLANG_LIKE_WARNINGS

cpp-terminal/CMakeLists.txt

@@ -4,7 +4,7 @@ configure_file(version.cpp.in version.cpp)
 add_subdirectory(platforms)
 
 # create and configure library target
-add_library(cpp-terminal args.cpp buffer.cpp iostream.cpp stream.cpp prompt.cpp window.cpp input.cpp terminal.cpp color.cpp key.cpp event.cpp screen.cpp options.cpp cursor.cpp style.cpp "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
+add_library(cpp-terminal args.cpp buffer.cpp iostream.cpp stream.cpp prompt.cpp window.cpp terminal.cpp color.cpp key.cpp event.cpp screen.cpp options.cpp cursor.cpp style.cpp "${CMAKE_CURRENT_BINARY_DIR}/version.cpp")
 target_link_libraries(cpp-terminal PRIVATE Warnings::Warnings cpp-terminal::cpp-terminal-platforms)
 target_compile_options(cpp-terminal PRIVATE $<$<CXX_COMPILER_ID:MSVC>:/utf-8>)
 target_include_directories(cpp-terminal PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}> $<INSTALL_INTERFACE:include>)

cpp-terminal/event.cpp

@@ -310,13 +310,19 @@ void Term::Event::parse(const std::string& str)
  m_container.m_Key = Key(Term::Key::Value::Numeric5);
  else if(Term::Private::is_valid_utf8_code_unit(str))
  m_container.m_Key = Key(static_cast<Term::Key::Value>(Term::Private::utf8_to_utf32(str)[0]));
+ else
+ {
+ m_Type = Type::CopyPaste;
+ m_str = str;
+ return;
+ }
+ m_Type = Type::Key;
  }
  else
  {
  m_Type = Type::CopyPaste;
  m_str = str;
  }
- if(!m_container.m_Key.empty()) { m_Type = Type::Key; }
 }
 
 Term::Event::operator Term::Key() const

cpp-terminal/input.cpp

@@ -2,19 +2,9 @@
 
 #include "cpp-terminal/event.hpp"
 
-#include <string>
-
 namespace Term
 {
 
-namespace Platform
-{
-// Returns true if a character is read, otherwise immediately returns false
-// This can't be made inline
-Term::Event read_raw();
-} // namespace Platform
-
-// Waits for an event (key press, screen resizing ...)
 Term::Event read_event();
 
 } // namespace Term

cpp-terminal/input.hpp

@@ -32,6 +32,12 @@ bool Term::MetaKey::operator==(const Term::MetaKey& meta) const { return (meta.m
 
 bool Term::MetaKey::operator!=(const Term::MetaKey& meta) const { return !(meta == *this); }
 
+Term::MetaKey& Term::MetaKey::operator+=(const MetaKey& meta)
+{
+ this->m_value = static_cast<Term::MetaKey::Value>(static_cast<Term::MetaKey::Value>(this->m_value) + static_cast<Term::MetaKey::Value>(meta.m_value));
+ return *this;
+}
+
 Term::Key::Key(const Term::Key::Value& value) : m_value(value) {}
 
 Term::Key::operator Term::Key::Value() const { return m_value; }

cpp-terminal/key.cpp

@@ -250,12 +250,13 @@ class MetaKey
  };
  MetaKey() = default;
  MetaKey(const MetaKey::Value& value);
- Term::MetaKey operator+(const MetaKey& meta) const;
- Term::Key operator+(const Key& key) const;
- bool operator==(const Term::MetaKey& meta) const;
- bool operator!=(const Term::MetaKey& meta) const;
- bool hasAlt() const;
- bool hasCtrl() const;
+ Term::MetaKey operator+(const MetaKey& meta) const;
+ Term::Key operator+(const Key& key) const;
+ Term::MetaKey& operator+=(const MetaKey& meta);
+ bool operator==(const Term::MetaKey& meta) const;
+ bool operator!=(const Term::MetaKey& meta) const;
+ bool hasAlt() const;
+ bool hasCtrl() const;
 
 private:
  MetaKey::Value m_value{Value::None};