cyberarm_engine 0.14.0 → 0.15.0

data/lib/cyberarm_engine/ui/elements/edit_box.rb

@@ -1,6 +1,179 @@
 module CyberarmEngine
   class Element
-    class EditBox < Element
+    class EditBox < EditLine
+      def initialize(*args)
+        super(*args)
+
+        @active_line = 0
+
+        @repeatable_keys = [
+          {
+            key: Gosu::KB_UP,
+            down: false,
+            repeat_delay: 50,
+            last_repeat: 0,
+            action: proc { move(:up) }
+          },
+          {
+            key: Gosu::KB_DOWN,
+            down: false,
+            repeat_delay: 50,
+            last_repeat: 0,
+            action: proc { move(:down) }
+          }
+        ]
+      end
+
+      def update
+        super
+
+        caret_stay_left_of_last_newline
+        calculate_active_line
+
+        @repeatable_keys.each do |key|
+          if key[:down] && (Gosu.milliseconds > key[:last_repeat] + key[:repeat_delay])
+            key[:action].call
+            key[:last_repeat] = Gosu.milliseconds
+          end
+        end
+      end
+
+      def draw_caret
+        Gosu.draw_rect(caret_position, @text.y + @active_line * @text.textobject.height, @caret_width, @caret_height,
+                       @caret_color, @z)
+      end
+
+      def draw_selection
+        selection_width = caret_position - selection_start_position
+
+        Gosu.draw_rect(selection_start_position, @text.y, selection_width, @text.textobject.height,
+                       default(:selection_color), @z)
+      end
+
+      def text_input_position_for(_method)
+        line = @text_input.text[0...@text_input.caret_pos].lines.last
+        _x = @text.x + @offset_x
+
+        if @type == :password
+          _x + @text.width(default(:password_character) * line.length)
+        else
+          _x + @text.width(line)
+        end
+      end
+
+      def set_position(int)
+        int = 0 if int < 0
+        @text_input.selection_start = @text_input.caret_pos = int
+      end
+
+      def calculate_active_line
+        sub_text = @text_input.text[0...@text_input.caret_pos]
+        @active_line = sub_text.lines.size - 1
+      end
+
+      def caret_stay_left_of_last_newline
+        @text_input.text += "\n" unless @text_input.text.end_with?("\n")
+
+        eof = @text_input.text.chomp.length
+        set_position(eof) if @text_input.caret_pos > eof
+      end
+
+      def caret_position_under_mouse(mouse_x, mouse_y)
+        active_line = row_at(mouse_y)
+        right_offset = column_at(mouse_x, mouse_y)
+
+        buffer = @text_input.text.lines[0..active_line].join if active_line != 0
+        buffer = @text_input.text.lines.first if active_line == 0
+        line = buffer.lines.last
+
+        if buffer.chars.last == "\n"
+          (buffer.length - line.length) + right_offset - 1
+        else
+          (buffer.length - line.length) + right_offset
+        end
+      end
+
+      def move_caret_to_mouse(mouse_x, mouse_y)
+        set_position(caret_position_under_mouse(mouse_x, mouse_y))
+      end
+
+      def row_at(y)
+        ((y - @text.y) / @text.textobject.height).round
+      end
+
+      def column_at(x, y)
+        row = row_at(y)
+
+        buffer = @text_input.text.lines[0..row].join if row != 0
+        buffer = @text_input.text.lines.first if row == 0
+
+        line = @text_input.text.lines[row]
+        line ||= ""
+        column = 0
+
+        line.length.times do |_i|
+          break if @text.textobject.text_width(line[0...column]) >= (x - @text.x).clamp(0.0, Float::INFINITY)
+
+          column += 1
+        end
+
+        column
+      end
+
+      def button_down(id)
+        super
+
+        @repeatable_keys.detect do |key|
+          next unless key[:key] == id
+
+          key[:down] = true
+          key[:last_repeat] = Gosu.milliseconds + key[:repeat_delay]
+          return true
+        end
+
+        case id
+        when Gosu::KB_ENTER, Gosu::KB_RETURN
+          caret_pos = @text_input.caret_pos
+          @text_input.text = @text_input.text.insert(@text_input.caret_pos, "\n")
+          @text_input.caret_pos = @text_input.selection_start = caret_pos + 1
+        end
+      end
+
+      def button_up(id)
+        super
+
+        @repeatable_keys.detect do |key|
+          if key[:key] == id
+            key[:down] = false
+            return true
+          end
+        end
+      end
+
+      def move(direction)
+        pos = @text_input.caret_pos
+        line = nil
+
+        case direction
+        when :up
+          return if @active_line == 0
+        when :down
+          return if @active_line == @text_input.text.chomp.lines
+
+          text = @text_input.text.chomp.lines[0..@active_line].join("\n")
+          pos = text.length
+        end
+
+        set_position(pos)
+      end
+
+      def drag_update(_sender, x, y, _button)
+        int = caret_position_under_mouse(x, y)
+        int = 0 if int < 0
+        @text_input.caret_pos = int
+
+        :handled
+      end
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/elements/edit_line.rb

@@ -2,28 +2,41 @@ module CyberarmEngine
   class Element
     class EditLine < Button
       def initialize(text, options = {}, block = nil)
+        @filter = options.delete(:filter)
         super(text, options, block)
 
         @type = default(:type)
 
         @caret_width = default(:caret_width)
-        @caret_height= @text.height
+        @caret_height = @text.textobject.height
         @caret_color = default(:caret_color)
         @caret_interval = default(:caret_interval)
         @caret_last_interval = Gosu.milliseconds
-        @show_caret  = true
+        @show_caret = true
 
         @text_input = Gosu::TextInput.new
         @text_input.text = text
+        @last_text_value = text
+
+        if @filter && @filter.respond_to?(:call)
+          @text_input.instance_variable_set(:@filter, @filter)
+
+          def @text_input.filter(text_in)
+            @filter.call(text_in)
+          end
+        end
 
         @offset_x = 0
+        @offset_y = 0
 
-        return self
+        event(:begin_drag)
+        event(:drag_update)
+        event(:end_drag)
       end
 
       def render
-        Gosu.clip_to(@text.x, @text.y, @style.width, @text.height) do
-          Gosu.translate(-@offset_x, 0) do
+        Gosu.clip_to(@text.x, @text.y, @width, @height) do
+          Gosu.translate(-@offset_x, -@offset_y) do
             draw_selection
             draw_caret if @focus && @show_caret
             draw_text
@@ -31,6 +44,10 @@ module CyberarmEngine
         end
       end
 
+      def draw_text
+        @text.draw(:draw_text)
+      end
+
       def draw_caret
         Gosu.draw_rect(caret_position, @text.y, @caret_width, @caret_height, @caret_color, @z)
       end
@@ -42,10 +59,16 @@ module CyberarmEngine
       end
 
       def update
-        if @type == :password
-          @text.text = default(:password_character) * @text_input.text.length
-        else
-          @text.text = @text_input.text
+        @text.text = if @type == :password
+                       default(:password_character) * @text_input.text.length
+                     else
+                       @text_input.text
+                     end
+
+        if @last_text_value != value
+          @last_text_value = value
+
+          publish(:changed, value)
         end
 
         if Gosu.milliseconds >= @caret_last_interval + @caret_interval
@@ -57,15 +80,60 @@ module CyberarmEngine
         keep_caret_visible
       end
 
-      def move_caret_to_mouse(mouse_x)
-        1.upto(@text.text.length) do |i|
-          if mouse_x < @text.x + @text.textobject.text_width(@text.text[0...i])
-            @text_input.caret_pos = @text_input.selection_start = i - 1;
-            return
+      def button_down(id)
+        handle_keyboard_shortcuts(id)
+      end
+
+      def handle_keyboard_shortcuts(id)
+        return unless @focus && @enabled
+
+        if Gosu.button_down?(Gosu::KB_LEFT_CONTROL) || Gosu.button_down?(Gosu::KB_RIGHT_CONTROL)
+          case id
+          when Gosu::KB_A
+            @text_input.selection_start = 0
+            @text_input.caret_pos = @text_input.text.length
+
+          when Gosu::KB_C
+            if @text_input.selection_start < @text_input.caret_pos
+              Clipboard.copy(@text_input.text[@text_input.selection_start...@text_input.caret_pos])
+            else
+              Clipboard.copy(@text_input.text[@text_input.caret_pos...@text_input.selection_start])
+            end
+
+          when Gosu::KB_X
+            chars = @text_input.text.chars
+
+            if @text_input.selection_start < @text_input.caret_pos
+              Clipboard.copy(@text_input.text[@text_input.selection_start...@text_input.caret_pos])
+              chars.slice!(@text_input.selection_start, @text_input.caret_pos)
+            else
+              Clipboard.copy(@text_input.text[@text_input.caret_pos...@text_input.selection_start])
+              chars.slice!(@text_input.caret_pos, @text_input.selection_start)
+            end
+
+            @text_input.text = chars.join
+
+          when Gosu::KB_V
+            if instance_of?(EditLine) # EditLine assumes a single line of text
+              @text_input.text = @text_input.text.insert(@text_input.caret_pos,
+                                                         Clipboard.paste.encode("UTF-8").gsub("\n", ""))
+            else
+              @text_input.text = @text_input.text.insert(@text_input.caret_pos, Clipboard.paste.encode("UTF-8"))
+            end
           end
         end
+      end
+
+      def caret_position_under_mouse(mouse_x)
+        1.upto(@text.text.length) do |i|
+          return i - 1 if mouse_x < @text.x - @offset_x + @text.width(@text.text[0...i])
+        end
+
+        @text_input.text.length
+      end
 
-        @text_input.caret_pos = @text_input.selection_start = @text_input.text.length
+      def move_caret_to_mouse(mouse_x, _mouse_y)
+        @text_input.caret_pos = @text_input.selection_start = caret_position_under_mouse(mouse_x)
       end
 
       def keep_caret_visible
@@ -74,25 +142,21 @@ module CyberarmEngine
         @last_text ||= "/\\"
         @last_pos ||= -1
 
-        puts "caret pos: #{caret_pos}, width: #{@width}, offset: #{@offset_x}" if (@last_text != @text.text) || (@last_pos != caret_pos)
-
         @last_text = @text.text
         @last_pos = caret_pos
 
-
         if caret_pos.between?(@offset_x, @width + @offset_x)
           # Do nothing
 
         elsif caret_pos < @offset_x
-          if caret_pos > @width
-            @offset_x = caret_pos + @width
-          else
-            @offset_x = 0
-          end
+          @offset_x = if caret_pos > @width
+                        caret_pos + @width
+                      else
+                        0
+                      end
 
         elsif caret_pos > @width
           @offset_x = caret_pos - @width
-          puts "triggered"
 
         else
           # Reset to Zero
@@ -110,9 +174,9 @@ module CyberarmEngine
 
       def text_input_position_for(method)
         if @type == :password
-          @text.x + @text.width(default(:password_character) * @text_input.text[0..@text_input.send(method)].length)
+          @text.x + @text.width(default(:password_character) * @text_input.text[0...@text_input.send(method)].length)
         else
-          @text.x + @text.width(@text_input.text[0..@text_input.send(method)])
+          @text.x + @text.width(@text_input.text[0...@text_input.send(method)])
         end
       end
 
@@ -123,12 +187,12 @@ module CyberarmEngine
         @caret_last_interval = Gosu.milliseconds
         @show_caret = true
 
-        move_caret_to_mouse(x)
+        move_caret_to_mouse(x, y)
 
-        return :handled
+        :handled
       end
 
-      def enter(sender)
+      def enter(_sender)
         if @focus
           @style.background_canvas.background = default(:active, :background)
           @text.color = default(:active, :color)
@@ -137,24 +201,44 @@ module CyberarmEngine
           @text.color = default(:hover, :color)
         end
 
-        return :handled
+        :handled
       end
 
       def leave(sender)
-        unless @focus
-          super
-        end
+        super unless @focus
 
-        return :handled
+        :handled
       end
 
-      def blur(sender)
+      def blur(_sender)
         @focus = false
         @style.background_canvas.background = default(:background)
         @text.color = default(:color)
         window.text_input = nil
 
-        return :handled
+        :handled
+      end
+
+      def draggable?(button)
+        button == :left
+      end
+
+      def begin_drag(_sender, x, _y, _button)
+        @drag_start = x
+        @offset_drag_start = @offset_x
+        @drag_caret_position = @text_input.caret_pos
+
+        :handled
+      end
+
+      def drag_update(_sender, x, _y, _button)
+        @text_input.caret_pos = caret_position_under_mouse(x)
+
+        :handled
+      end
+
+      def end_drag(_sender, _x, _y, _button)
+        :handled
       end
 
       def recalculate
@@ -169,4 +253,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/elements/flow.rb

@@ -12,4 +12,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end

data/lib/cyberarm_engine/ui/elements/image.rb

@@ -6,7 +6,8 @@ module CyberarmEngine
         @path = path
 
         @image = Gosu::Image.new(path, retro: @options[:image_retro])
-        @scale_x, @scale_y = 1, 1
+        @scale_x = 1
+        @scale_y = 1
       end
 
       def render
@@ -14,18 +15,19 @@ module CyberarmEngine
           @style.border_thickness_left + @style.padding_left + @x,
           @style.border_thickness_top + @style.padding_top + @y,
           @z + 2,
-          @scale_x, @scale_y) # TODO: Add color support?
+          @scale_x, @scale_y, @style.color
+        )
       end
 
-      def clicked_left_mouse_button(sender, x, y)
+      def clicked_left_mouse_button(_sender, _x, _y)
         @block.call(self) if @block
 
-        return :handled
+        :handled
       end
 
       def recalculate
         _width = dimensional_size(@style.width, :width)
-        _height= dimensional_size(@style.height,:height)
+        _height = dimensional_size(@style.height, :height)
 
         if _width && _height
           @scale_x = _width.to_f / @image.width
@@ -37,11 +39,12 @@ module CyberarmEngine
           @scale_y = _height.to_f / @image.height
           @scale_x = @scale_y
         else
-          @scale_x, @scale_y = 1, 1
+          @scale_x = 1
+          @scale_y = 1
         end
 
-        @width = _width  ? _width  : @image.width.round * @scale_x
-        @height= _height ? _height : @image.height.round * @scale_y
+        @width = _width || @image.width.round * @scale_x
+        @height = _height || @image.height.round * @scale_y
       end
 
       def value
@@ -49,4 +52,4 @@ module CyberarmEngine
       end
     end
   end
-end
+end