potty 0.0.1 → 0.0.2

data/lib/potty/widgets/text_input.rb

@@ -1,28 +1,26 @@
 # frozen_string_literal: true
 
-require 'curses'
 require_relative 'base'
 require_relative '../keys'
+require_relative '../line_editor'
 
 module Potty
   module Widgets
     # Single-line editable text field. Shows a block cursor when focused,
     # a dim placeholder when empty and unfocused, and scrolls horizontally
-    # when the text outgrows the field.
+    # when the text outgrows the field. The editing model is a LineEditor
+    # (shared with the list InputItem); this widget owns rendering + scroll.
     #
     # Emits :change(text) on every edit. ASCII input only for now (matches
     # the rest of the framework); UTF-8 entry would need multibyte getch.
     class TextInput < Base
-      attr_reader :text
-      attr_accessor :placeholder, :max_length, :on_change
+      attr_accessor :placeholder, :on_change
 
       def initialize(app, text: '', placeholder: '', max_length: nil, on_change: nil)
         super(app)
-        @text = text.dup
+        @editor = LineEditor.new(text, max_length: max_length)
         @placeholder = placeholder
-        @max_length = max_length
         @on_change = on_change
-        @cursor = @text.length
         @scroll = 0
       end
 
@@ -30,32 +28,36 @@ module Potty
         true
       end
 
+      def text
+        @editor.text
+      end
+
       def text=(value)
-        @text = value.to_s.dup
-        @cursor = [@cursor, @text.length].min
+        @editor.text = value
         notify_change
       end
 
+      def max_length
+        @editor.max_length
+      end
+
+      def max_length=(value)
+        @editor.max_length = value
+      end
+
       def preferred_height(_width)
         1
       end
 
       def handle_key(ch)
         case ch
-        when Keys::LEFT
-          @cursor = [@cursor - 1, 0].max
-        when Keys::RIGHT
-          @cursor = [@cursor + 1, @text.length].min
-        when Keys::HOME, Keys::CTRL_A
-          @cursor = 0
-        when Keys::END_, Keys::CTRL_E
-          @cursor = @text.length
-        when Keys::DEL_ASCII, Keys::CTRL_H, Keys::BACKSPACE
-          backspace
-        when Keys::DELETE, Keys::CTRL_D
-          delete_forward
-        when Keys::SPACE..(Keys::DEL_ASCII - 1)
-          insert(ch.chr)
+        when Keys::LEFT then @editor.left
+        when Keys::RIGHT then @editor.right
+        when Keys::HOME, Keys::CTRL_A then @editor.home
+        when Keys::END_, Keys::CTRL_E then @editor.to_end
+        when Keys::DEL_ASCII, Keys::CTRL_H, Keys::BACKSPACE then changed(@editor.backspace)
+        when Keys::DELETE, Keys::CTRL_D then changed(@editor.delete_forward)
+        when Keys::SPACE..(Keys::DEL_ASCII - 1) then changed(@editor.insert(ch.chr))
         else
           return false
         end
@@ -68,68 +70,50 @@ module Potty
         width = @rect.width
         adjust_scroll(width)
 
-        if @text.empty? && !@focused
+        if text.empty? && !@focused
           window.setpos(@rect.y, @rect.x)
-          window.attron(theme[:dim]) do
+          window.attron(theme.style(:dim)) do
             window.addstr(@placeholder.to_s[0, width].to_s.ljust(width))
           end
           return
         end
 
-        visible = (@text[@scroll, width] || '').ljust(width)
+        visible = (text[@scroll, width] || '').ljust(width)
         window.setpos(@rect.y, @rect.x)
-        window.attron(theme[:normal]) { window.addstr(visible) }
+        window.attron(theme.style(:normal)) { window.addstr(visible) }
 
         return unless @focused
 
         # Block cursor: reverse-video the cell under the caret.
-        col = @cursor - @scroll
+        col = @editor.cursor - @scroll
         return if col.negative? || col >= width
 
-        char_under = @text[@cursor] || ' '
+        char_under = text[@editor.cursor] || ' '
         window.setpos(@rect.y, @rect.x + col)
-        window.attron(theme[:normal] | ::Curses::A_REVERSE) do
+        window.attron(theme.style(:normal, reverse: true)) do
           window.addstr(char_under)
         end
       end
 
       private
 
-      def insert(str)
-        return if @max_length && @text.length >= @max_length
-
-        @text.insert(@cursor, str)
-        @cursor += str.length
-        notify_change
-      end
-
-      def backspace
-        return if @cursor.zero?
-
-        @text.slice!(@cursor - 1)
-        @cursor -= 1
-        notify_change
-      end
-
-      def delete_forward
-        return if @cursor >= @text.length
-
-        @text.slice!(@cursor)
-        notify_change
+      def changed(did_change)
+        notify_change if did_change
       end
 
       def adjust_scroll(width)
         return if width <= 0
 
-        @scroll = @cursor - width + 1 if @cursor - @scroll >= width
-        @scroll = @cursor if @cursor < @scroll
+        cursor = @editor.cursor
+        @scroll = cursor - width + 1 if cursor - @scroll >= width
+        @scroll = cursor if cursor < @scroll
         @scroll = [@scroll, 0].max
       end
 
       def notify_change
         # Hand listeners a snapshot, not the live internal buffer, so a
         # consumer that stores the value doesn't see it mutate underfoot.
-        snapshot = @text.dup
+        snapshot = text.dup
         @on_change&.call(snapshot)
         emit(:change, snapshot)
       end

data/lib/potty/widgets/toggle.rb

@@ -55,7 +55,7 @@ module Potty
 
         knob = @value ? "[\u25CF]" : "[\u25CB]"
         text = "#{knob} #{@label}"[0, @rect.width]
-        attr = @focused ? theme.attr(:selected, bold: true) : theme[:normal]
+        attr = @focused ? theme.style(:selected, bold: true) : theme.style(:normal)
 
         window.setpos(@rect.y, @rect.x)
         window.attron(attr) { window.addstr(text) }

data/lib/potty/window_manager.rb

@@ -3,53 +3,30 @@
 require 'curses'
 
 module Potty
-  # Manages curses window lifecycle and refresh coordination
+  # Holds the curses stdscr and screen dimensions, and batches the
+  # refresh (noutrefresh + doupdate). Backs CursesSurface.
   class WindowManager
     attr_reader :stdscr, :max_y, :max_x
 
     def initialize
-      @windows = {}
       @stdscr = nil
     end
 
-    # Called during application setup
+    # Called during application setup.
     def setup(stdscr)
       @stdscr = stdscr
       update_dimensions
     end
 
     def update_dimensions
-      @max_y, @max_x = @stdscr.maxy, @stdscr.maxx
+      @max_y = @stdscr.maxy
+      @max_x = @stdscr.maxx
     end
 
-    # Create a new window
-    def create_window(name, height, width, y, x)
-      win = ::Curses::Window.new(height, width, y, x)
-      @windows[name] = win
-      win
-    end
-
-    # Get existing window
-    def get_window(name)
-      @windows[name]
-    end
-
-    # Destroy window
-    def destroy_window(name)
-      @windows[name]&.close
-      @windows.delete(name)
-    end
-
-    # Refresh all windows efficiently
+    # Flush buffered drawing to the screen.
     def refresh_all
       @stdscr.noutrefresh
-      @windows.values.each(&:noutrefresh)
       ::Curses.doupdate
     end
-
-    def clear_all
-      @stdscr.clear
-      @windows.values.each(&:clear)
-    end
   end
 end

data/lib/potty.rb

@@ -4,6 +4,9 @@ require_relative 'potty/version'
 require_relative 'potty/keys'
 require_relative 'potty/events'
 require_relative 'potty/style'
+require_relative 'potty/line_editor'
+require_relative 'potty/ansi'
+require_relative 'potty/input/decoder'
 require_relative 'potty/application'
 require_relative 'potty/theme'
 require_relative 'potty/layout'
@@ -30,6 +33,8 @@ require_relative 'potty/widgets/spinner'
 require_relative 'potty/sprite'
 require_relative 'potty/animator'
 require_relative 'potty/sprites/sample'
+# Mouth's prompt views subclass Potty::View, so load it after the framework.
+require_relative 'potty/mouth'
 
 module Potty
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: potty
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - TwilightCoders
@@ -43,6 +43,7 @@ email:
 - info@twilightcoders.net
 executables:
 - potty_demo
+- potty_inline_demo
 extensions: []
 extra_rdoc_files: []
 files:
@@ -50,14 +51,19 @@ files:
 - LICENSE.txt
 - README.md
 - bin/potty_demo
+- bin/potty_inline_demo
 - examples/test_view.rb
 - lib/potty.rb
 - lib/potty/animator.rb
+- lib/potty/ansi.rb
 - lib/potty/application.rb
 - lib/potty/border.rb
 - lib/potty/events.rb
+- lib/potty/input/decoder.rb
 - lib/potty/keys.rb
 - lib/potty/layout.rb
+- lib/potty/line_editor.rb
+- lib/potty/mouth.rb
 - lib/potty/sprite.rb
 - lib/potty/sprites/sample.rb
 - lib/potty/style.rb