Merge pull request jupyter-xeus#171 from MCWertGaming/fixes

Fixed a few smaller things

Author: staxfur

cpp-terminal/CMakeLists.txt

@@ -1,7 +1,7 @@
 # configure version information
 configure_file(version.h.in version.h)
 
-# create and confirgure library target
+# create and configure library target
 add_library(cpp-terminal base.cpp prompt.cpp window.cpp input.cpp private/platform.cpp)
 
 target_include_directories(cpp-terminal BEFORE PUBLIC

cpp-terminal/base.cpp

@@ -129,7 +129,7 @@ Term::Terminal::Terminal(bool _clear_screen,
  hide_cursor{_hide_cursor} {
  if (clear_screen) {
  write(save_screen() +
- // fixes consoles that ignore save_screen()
+ // Fix consoles that ignore save_screen()
  clear_screen_buffer());
  }
  if (hide_cursor)
@@ -139,13 +139,13 @@ Term::Terminal::Terminal(bool _clear_screen)
  : BaseTerminal(false, true), clear_screen{_clear_screen} {
  if (clear_screen) {
  write(save_screen()
- // fixes consoles that ignore save_screen()
+ // Fix consoles that ignore save_screen()
  + clear_screen_buffer());
  }
 }
 Term::Terminal::~Terminal() {
  if (clear_screen) {
- // fixes consoles that ignore save_screen()
+ // Fix consoles that ignore save_screen()
  write(color(Term::style::reset) + clear_screen_buffer() +
  move_cursor(1, 1) +
  // restores the screen, might be ignored by some terminals

cpp-terminal/base.hpp

@@ -115,11 +115,11 @@ class Terminal : public Private::BaseTerminal {
  Terminal(bool _clear_screen,
  bool enable_keyboard,
  bool disable_ctrl_c,
- bool);
+ bool _hide_cursor);
  // providing no parameters will disable the keyboard and ctrl+c
- Terminal(bool _clear_screen);
+ explicit Terminal(bool _clear_screen);
 
- virtual ~Terminal() override;
+ ~Terminal() override;
 };
 
 } // namespace Term

cpp-terminal/private/conversion.hpp

@@ -6,11 +6,9 @@
 #include <vector>
 
 #ifdef _WIN32
-#include <stdio.h>
+#include <cstdio>
 #else
-
 #include <sys/ioctl.h>
-
 #endif
 
 static constexpr uint8_t UTF8_ACCEPT = 0;
@@ -19,31 +17,30 @@ static constexpr uint8_t UTF8_REJECT = 0xf;
 namespace Term::Private {
 
 inline uint8_t utf8_decode_step(uint8_t state, uint8_t octet, uint32_t* cpp) {
- static const uint32_t utf8_classtab[0x10] = {
+ static const uint32_t utf8ClassTab[0x10] = {
  0x88888888UL, 0x88888888UL, 0x99999999UL, 0x99999999UL,
  0xaaaaaaaaUL, 0xaaaaaaaaUL, 0xaaaaaaaaUL, 0xaaaaaaaaUL,
  0x222222ffUL, 0x22222222UL, 0x22222222UL, 0x22222222UL,
  0x3333333bUL, 0x33433333UL, 0xfff5666cUL, 0xffffffffUL,
  };
 
- static const uint32_t utf8_statetab[0x10] = {
+ static const uint32_t utf8StateTab[0x10] = {
  0xfffffff0UL, 0xffffffffUL, 0xfffffff1UL, 0xfffffff3UL,
  0xfffffff4UL, 0xfffffff7UL, 0xfffffff6UL, 0xffffffffUL,
  0x33f11f0fUL, 0xf3311f0fUL, 0xf33f110fUL, 0xfffffff2UL,
  0xfffffff5UL, 0xffffffffUL, 0xffffffffUL, 0xffffffffUL,
  };
 
- const uint8_t reject = (state >> 3), nonascii = (octet >> 7);
+ const uint8_t reject = (state >> 3), nonAscii = (octet >> 7);
  const uint8_t class_ =
- (!nonascii ? 0
-  : (0xf & (utf8_classtab[(octet >> 3) & 0xf] >>
-   (4 * (octet & 7)))));
+ (!nonAscii
+ ? 0
+ : (0xf & (utf8ClassTab[(octet >> 3) & 0xf] >> (4 * (octet & 7)))));
 
  *cpp = (state == UTF8_ACCEPT ? (octet & (0xffU >> class_))
  : ((octet & 0x3fU) | (*cpp << 6)));
 
- return (reject ? 0xf
- : (0xf & (utf8_statetab[class_] >> (4 * (state & 7)))));
+ return (reject ? 0xf : (0xf & (utf8StateTab[class_] >> (4 * (state & 7)))));
 }
 
 inline void codepoint_to_utf8(std::string& s, char32_t c) {
@@ -105,7 +102,7 @@ inline int convert_string_to_int(const char* string,
  int* rows,
  int* cols) {
 #ifdef _WIN32
- // windows provides it's own alternative to sscanf()
+ // Windows provides its own alternative to sscanf()
  return sscanf_s(string, format, rows, cols);
 #else
  // TODO move to a better way

cpp-terminal/private/inputOutputModeFlags.hpp

@@ -13,7 +13,17 @@
 
 #include <stdexcept>
 
-#include "inputOutputModeFlags.hpp"
+#ifndef ENABLE_VIRTUAL_TERMINAL_PROCESSING
+#define ENABLE_VIRTUAL_TERMINAL_PROCESSING 0x0004
+#endif
+
+#ifndef DISABLE_NEWLINE_AUTO_RETURN
+#define DISABLE_NEWLINE_AUTO_RETURN 0x0008
+#endif
+
+#ifndef ENABLE_VIRTUAL_TERMINAL_INPUT
+#define ENABLE_VIRTUAL_TERMINAL_INPUT 0x0200
+#endif
 
 bool Term::Private::is_stdin_a_tty() {
 #ifdef _WIN32
@@ -60,7 +70,7 @@ bool Term::Private::get_term_size(int& rows, int& cols) {
 }
 
 bool Term::Private::read_raw(char* s) {
- // TODO: What if the keyboard is not initialzed?
+ // TODO: What if the keyboard is not initialized?
  if (false) {
  int c = getchar();
  if (c >= 0) {
@@ -175,7 +185,7 @@ Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
 #else
 Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
  bool disable_ctrl_c)
- : orig_termios{std::unique_ptr<termios>(new termios)},
+ : orig_termios{std::make_unique<termios>()},
  keyboard_enabled{enable_keyboard} {
  // Uncomment this to silently disable raw mode for non-tty
  // if (keyboard_enabled) keyboard_enabled = is_stdin_a_tty();
@@ -186,7 +196,7 @@ Term::Private::BaseTerminal::BaseTerminal(bool enable_keyboard,
 
  // Put terminal in raw mode
 
- struct termios raw = termios(*orig_termios.get());
+ auto raw = termios(*orig_termios);
 
  raw.c_iflag &= ~(BRKINT | ICRNL | INPCK | ISTRIP | IXON);
 

cpp-terminal/private/platform.cpp

@@ -34,7 +34,7 @@ enum class Result_simple {
 
 // A simple yes/no prompt, requires the user to press the ENTER key to continue
 // The arguments are used like this: 1 [2/3]4 <user Input>
-// the immediate switch indicates toggles wether pressing enter for
+// the immediate switch indicates toggles whether pressing enter for
 // confirming the input is required or not
 Result prompt(const std::string& message,
  const std::string& first_option,

cpp-terminal/prompt.hpp

@@ -24,11 +24,11 @@ Term::style Term::Window_24bit::get_style(size_t x, size_t y) {
  return m_style[(y - 1) * w + (x - 1)];
 }
 
-size_t Term::Window_24bit::get_w() {
+size_t Term::Window_24bit::get_w() const {
  return w;
 }
 
-size_t Term::Window_24bit::get_h() {
+size_t Term::Window_24bit::get_h() const {
  return h;
 }
 
@@ -260,14 +260,14 @@ std::string Term::Window_24bit::render(int x0, int y0, bool term) {
  }
  }
 
- if (current_fg_reset == false) {
+ if (!current_fg_reset) {
  if (!rgb_equal(current_fg, get_fg(i, j))) {
  current_fg = get_fg(i, j);
  update_fg = true;
  }
  }
 
- if (current_fg_reset == false) {
+ if (!current_fg_reset) {
  if (!rgb_equal(current_bg, get_bg(i, j))) {
  current_bg = get_bg(i, j);
  update_bg = true;
@@ -277,12 +277,12 @@ std::string Term::Window_24bit::render(int x0, int y0, bool term) {
  current_style = get_style(i, j);
  update_style = true;
  if (current_style == style::reset) {
- // style::reset resets fg and bg colors too, we have to
+ // style::reset: reset fg and bg colors too, we have to
  // set them again if they are non-default, but if fg or
  // bg colors are reset, we do not update them, as
  // style::reset already did that.
- update_fg = (current_fg_reset == false);
- update_bg = (current_bg_reset == false);
+ update_fg = !current_fg_reset;
+ update_bg = !current_bg_reset;
  }
  }
  // Set style first, as style::reset will reset colors too
@@ -334,11 +334,11 @@ Term::style Term::Window::get_style(size_t x, size_t y) {
  return m_style[(y - 1) * w + (x - 1)];
 }
 
-size_t Term::Window::get_w() {
+size_t Term::Window::get_w() const {
  return w;
 }
 
-size_t Term::Window::get_h() {
+size_t Term::Window::get_h() const {
  return h;
 }
 
@@ -520,7 +520,7 @@ std::string Term::Window::render(int x0, int y0, bool term) {
  current_style = get_style(i, j);
  update_style = true;
  if (current_style == style::reset) {
- // style::reset resets fg and bg colors too, we have to
+ // style::reset: resets fg and bg colors too, we have to
  // set them again if they are non-default, but if fg or
  // bg colors are reset, we do not update them, as
  // style::reset already did that.

cpp-terminal/window.cpp

@@ -50,9 +50,9 @@ class Window_24bit {
  m_bg_reset(w * h, true),
  m_style(w * h, style::reset){};
 
- size_t get_w();
+ [[nodiscard]] size_t get_w() const;
 
- size_t get_h();
+ [[nodiscard]] size_t get_h() const;
 
  void set_char(size_t, size_t, char32_t);
 
@@ -84,7 +84,7 @@ class Window_24bit {
 
  void clear();
 
- bool rgb_equal(rgb&, rgb);
+ static bool rgb_equal(rgb&, rgb);
 
  // TODO: add Window/Screen parameter here, to be used like this:
  // old_scr = scr;
@@ -130,9 +130,9 @@ class Window {
  m_bg(w * h, bg::reset),
  m_style(w * h, style::reset){};
 
- size_t get_w();
+ [[nodiscard]] size_t get_w() const;
 
- size_t get_h();
+ [[nodiscard]] size_t get_h() const;
 
  void set_char(size_t, size_t, char32_t);
 

cpp-terminal/window.hpp

@@ -10,9 +10,10 @@ using Term::Terminal;
 
 int main() {
  try {
- Terminal term(true, true, false, false);
+ Terminal term(true, true, true, false);
  int rows{}, cols{};
  Term::get_term_size(rows, cols);
+ std::cout << Term::move_cursor(1, 1);
  std::cout << "Dimension:" << cols << " " << rows << std::endl;
  std::cout << "Press any key ('q' to quit):" << std::endl;
  bool on = true;
@@ -24,17 +25,16 @@ int main() {
  if (key == 'q')
  on = false;
  } else if (key >= 'A' && key <= 'Z') {
- s = (char)key; // Already in upper case
- s = "Shift+" + s;
+ s = (std::string) "Shift+" +
+  (char)key; // Already in upper case;
  } else if (key >= Key::CTRL + 'a' && key <= Key::CTRL + 'z') {
- s = (char)((-Key::CTRL + key) - 32); // Convert to upper case
- s = "Ctrl+" + s;
+ s = (std::string) "CTRL+" + (char)((-Key::CTRL + key) - 32);
  } else if (key >= Key::ALT + 'a' && key <= Key::ALT + 'z') {
- s = (char)(key + 'A' -
+ s = (std::string) "Alt+" +
+ (char)(key + 'A' -
  (Key::ALT + 'a')); // Convert to upper case
- s = "Alt+" + s;
  } else if (key > 0 && !iscntrl(key) && key < 128) {
- s = std::to_string(key);
+ s = (char)key;
  } else {
  switch (key) {
  case Key::BACKSPACE: