reflex-terminal 0.1.0 → 0.2.0

data/include/reflex/terminal.h

@@ -13,6 +13,10 @@
 #include <reflex/defs.h>
 #include <reflex/event.h>
 
+#ifdef COLOR_BACKGROUND
+#undef COLOR_BACKGROUND // by Win32's winuser.h
+#endif
+
 
 namespace Reflex
 {
@@ -53,6 +57,23 @@ namespace Reflex
 
 				};// Attribute
 
+				enum Underline
+				{
+
+					UNDERLINE_NONE = 0,
+
+					UNDERLINE_SINGLE,
+
+					UNDERLINE_DOUBLE,
+
+					UNDERLINE_CURLY,
+
+					UNDERLINE_DOTTED,
+
+					UNDERLINE_DASHED
+
+				};// Underline
+
 				enum {COLOR_NONE = -1};
 
 				int x, width;// in cells
@@ -61,7 +82,7 @@ namespace Reflex
 
 				uint cell_offset, cell_size;
 
-				int fg, bg;// 0xRRGGBB, or COLOR_NONE
+				int fg, bg, ul;// 0xRRGGBB, or COLOR_NONE
 
 				uint attribs;
 
@@ -89,11 +110,13 @@ namespace Reflex
 
 				};// Style
 
-				int x, y;
+				int x = 0, y = 0;
+
+				Style style  = BLOCK;
 
-				Style style;
+				bool visible = false;
 
-				bool visible;
+				bool operator == (const Cursor&) const = default;
 
 			};// Cursor
 
@@ -141,7 +164,7 @@ namespace Reflex
 
 			void resize (
 				int columns, int rows,
-				int   cell_width, int   cell_height,
+				coord cell_width, coord cell_height,
 				int screen_width, int screen_height);
 
 			void feed (const char* bytes, size_t size);
@@ -164,6 +187,8 @@ namespace Reflex
 
 			bool is_alive () const;
 
+			bool is_blinking () const;
+
 			bool is_mouse_tracking () const;
 
 			void     select (int x1, int y1, int x2, int y2);

data/include/reflex-terminal/renderer.h

@@ -40,6 +40,14 @@ namespace ReflexTerminal
 
 			size_t    glyph_count () const;
 
+			void set_blink_visible (bool visible);
+
+			bool     blink_visible () const;
+
+			void set_background_alpha (float alpha);
+
+			float    background_alpha () const;
+
 			void draw (
 				Painter* painter, const Reflex::Terminal& terminal,
 				const Bounds& bounds);

data/lib/reflex/terminal.rb

@@ -48,9 +48,10 @@ module Reflex
 
     # Yields each style span of the visible screen.
     #
-    # @yield [x, y, width, text, fg, bg, flags] a run of cells sharing
+    # @yield [x, y, width, text, fg, bg, ul, flags] a run of cells sharing
     #   the same style; x, y and width are in cells, and fg/bg are
-    #   0xRRGGBB or nil for the terminal's default color
+    #   0xRRGGBB or nil for the terminal's default color. ul is the
+    #   underline color (SGR 58), 0xRRGGBB or nil to draw with fg
     #
     # @return [Enumerator] when no block is given
     #

data/lib/reflex/terminal_view.rb

@@ -11,6 +11,8 @@ module Reflex
 
   class TerminalView < View
 
+    include HasTextPreedit
+
     DEFAULT_FONT_SIZE     = 14
 
     DEFAULT_FONT_NAME     =
@@ -21,6 +23,8 @@ module Reflex
 
     CURSOR_BLINK_INTERVAL = 0.5
 
+    TEXT_BLINK_INTERVAL   = 0.5
+
     def initialize(
       *args,
       terminal:  nil, # attach this instead of spawning one
@@ -30,13 +34,11 @@ module Reflex
       font_size: DEFAULT_FONT_SIZE,
       **kwargs, &block)
 
+      @terminal, @command, @envs, @font_size   = terminal, command, envs, font_size
+      @scroll_rows, @cursor_blink, @prev_bells = 0, true, (terminal&.bells || 0)
+      @renderer                                = ReflexTerminal::Renderer.new
+      self.font                                = font || DEFAULT_FONT_NAME
       super(*args, **kwargs, &block)
-      @terminal, @command, @envs = terminal, command, envs
-      @renderer                  = ReflexTerminal::Renderer.new
-      @cursor_blink              = true
-      @prev_bells                = terminal&.bells || 0
-      @font_size                 = font_size
-      self.font                  = font || DEFAULT_FONT_NAME
     end
 
     attr_reader :terminal
@@ -64,17 +66,26 @@ module Reflex
       font.size
     end
 
+    def background_alpha=(alpha)
+      @renderer.background_alpha = alpha
+      redraw
+    end
+
+    def background_alpha()
+      @renderer.background_alpha
+    end
+
     def on_attach(e)
       unless @terminal
         @terminal = Terminal.new
         @terminal.spawn(@envs, *[@command].compact)
       end
       resize_terminal
-      focus
     end
 
     def on_detach(e)
       stop_cursor_blink
+      stop_text_blink
     end
 
     def on_activate(e)
@@ -95,6 +106,7 @@ module Reflex
         @renderer.bake_glyphs t
         redraw
       end
+      update_text_blink t
       if t.bells > @prev_bells
         bells, @prev_bells = t.bells - @prev_bells, t.bells
         on_bell BellEvent.new(bells)
@@ -105,7 +117,8 @@ module Reflex
       t = @terminal || return
 
       @renderer.draw e.painter, t, e.bounds
-      draw_cursor e.painter, t
+      draw_cursor  e.painter, t
+      draw_preedit e.painter, t
     end
 
     def on_key_down(e)
@@ -125,6 +138,13 @@ module Reflex
       @terminal&.write_key e
     end
 
+    # tells the input method where to put the candidate window.
+    def text_input_bounds()
+      x, y,  = @terminal&.cursor || [0, 0]
+      cw, ch = @renderer.cell_width, @renderer.cell_height
+      [x * cw, y * ch, preedit_width, ch]
+    end
+
     def on_pointer_down(e)
       focus
       t = @terminal || return
@@ -149,6 +169,8 @@ module Reflex
       @selecting = false
     end
 
+    alias on_pointer_cancel on_pointer_up
+
     def on_pointer_move(e)
       t = @terminal || return
       return t.write_pointer(e) unless @selecting
@@ -169,8 +191,11 @@ module Reflex
       if t.mouse_tracking?
         t.write_wheel e
       else
-        rows = (e.dy / @renderer.cell_height).round
+        @scroll_rows += e.dy / @renderer.cell_height
+        rows          = @scroll_rows.truncate
         return if rows == 0
+
+        @scroll_rows -= rows
         t.scroll_by rows
         redraw
       end
@@ -216,6 +241,26 @@ module Reflex
       @cursor_blinker = nil
     end
 
+    def update_text_blink(terminal)
+      if terminal.blinking?
+        @text_blinker ||= interval TEXT_BLINK_INTERVAL do
+          @renderer.blink_visible = !@renderer.blink_visible?
+          redraw
+        end
+      elsif @text_blinker
+        stop_text_blink
+      end
+    end
+
+    def stop_text_blink()
+      @text_blinker&.stop
+      @text_blinker = nil
+      unless @renderer.blink_visible?
+        @renderer.blink_visible = true
+        redraw
+      end
+    end
+
     def draw_cursor(painter, terminal)
       x, y, style, visible = terminal.cursor
       return unless visible
@@ -244,6 +289,27 @@ module Reflex
       end
     end
 
+    def preedit_width()
+      preedit? ? font.width(preedit) : @renderer.cell_width
+    end
+
+    def draw_preedit(painter, terminal)
+      return unless preedit?
+
+      x, y,  = terminal.cursor
+      cw, ch = @renderer.cell_width, @renderer.cell_height
+      x, y   = x * cw, y * ch
+      fore   = terminal.foreground_color || Color.new(1, 1, 1)
+      back   = terminal.background_color || Color.new(0, 0, 0)
+
+      painter.push fill: back, stroke: nil, font: font do |p|
+        p.rect x, y, preedit_width, ch
+
+        p.fill fore
+        super p, x, y, height: ch
+      end
+    end
+
     def to_cell(x, y)
       # Clamped to the screen so that a drag leaving the view keeps selecting
       # up to the edge, rather than asking for a cell the terminal will refuse.
@@ -258,7 +324,7 @@ module Reflex
       @terminal.resize(
         (width  / cw).floor.clamp(1..),
         (height / ch).floor.clamp(1..),
-          cell_width: cw.round,     cell_height: ch,
+          cell_width: cw,           cell_height: ch,
         screen_width: width.to_i, screen_height: height.to_i)
     end
 

data/reflex-terminal.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   ext   = ReflexTerminal::Extension
   name  = ext.name true
-  rdocs = glob.call *%w[README .doc/ext/**/*.cpp]
+  rdocs = glob.call(*%w[README .doc/ext/**/*.cpp])
 
   s.name        = name
   s.version     = ext.version
@@ -25,10 +25,10 @@ Gem::Specification.new do |s|
   s.platform              = Gem::Platform::RUBY
   s.required_ruby_version = '>= 3.0.0'
 
-  s.add_dependency 'xot',       '~> 0.4.0'
-  s.add_dependency 'rucy',      '~> 0.4.0'
-  s.add_dependency 'rays',      '~> 0.4.0'
-  s.add_dependency 'reflexion', '~> 0.6.0'
+  s.add_dependency 'xot',       '~> 0.5.0'
+  s.add_dependency 'rucy',      '~> 0.5.0'
+  s.add_dependency 'rays',      '~> 0.5.0'
+  s.add_dependency 'reflexion', '~> 0.7.0'
 
   s.files            = `git ls-files`.split $/
   s.executables      = s.files.grep(%r{^bin/}) {|f| File.basename f}

data/src/pty.cpp

@@ -103,7 +103,7 @@ namespace Reflex
 			}
 
 			// exec the real path; argv[0] may be the login shell name
-			execvp(args[0].c_str(), (char* const*) &argv[0]);
+			execvp(args[0].c_str(), (char* const*) argv.data());
 			_exit(127);// exec failed
 		}
 
@@ -197,10 +197,32 @@ namespace Reflex
 			::close(self->fd);
 			self->fd = -1;
 		}
+
 		if (self->pid >= 0)
 		{
-			waitpid(self->pid, NULL, WNOHANG);// reap if already exited
+			pid_t pid = self->pid;
 			self->pid = -1;
+
+			// closing the master is not a hangup: the kernel revokes the
+			// terminal when the process that owned it goes away, and none has.
+			// The group, not the child, so that its own children leave too
+			::kill(-pid, SIGHUP);
+
+			enum {HANGUP_WAIT_MSEC = 100};
+			for (int i = 0; i < HANGUP_WAIT_MSEC; ++i)
+			{
+				// zero is the only answer that means one is still to come:
+				// is_child_alive() reaps, and a reaped child is gone already
+				if (waitpid(pid, NULL, WNOHANG) != 0) return;
+				usleep(1000);
+			}
+
+			// polled rather than waited on, because a signal arriving
+			// meanwhile would cut a blocking wait short and leave the child
+			// unreaped. Nothing refuses SIGKILL, so this is not a long wait
+			::kill(-pid, SIGKILL);
+			while (waitpid(pid, NULL, WNOHANG) == 0)
+				usleep(1000);
 		}
 	}
 
@@ -213,9 +235,16 @@ namespace Reflex
 	bool
 	PTY::is_child_alive () const
 	{
-		if (self->pid < 0) return false;
+		if (self->pid < 0)
+			return false;
+
+		if (waitpid(self->pid, NULL, WNOHANG) == 0)
+			return true;
 
-		return waitpid(self->pid, NULL, WNOHANG) == 0;
+		// waitpid reaps as it answers, and a pid the kernel is free to hand
+		// out again is not one for close() to signal later
+		self->pid = -1;
+		return false;
 	}
 
 	PTY::operator bool () const