ektoplayer 0.1.6 → 0.1.11

data/lib/ektoplayer/ui/colors.rb

@@ -1,4 +1,4 @@
-require 'curses'
+require_relative '../icurses'
 
 module UI
    class ColorFader
@@ -29,14 +29,14 @@ module UI
    class Colors
       COLORS = {
          none: -1, default: -1, nil => -1,
-         white:    Curses::COLOR_WHITE,
-         black:    Curses::COLOR_BLACK,
-         red:      Curses::COLOR_RED,
-         blue:     Curses::COLOR_BLUE,
-         cyan:     Curses::COLOR_CYAN,
-         green:    Curses::COLOR_GREEN,
-         yellow:   Curses::COLOR_YELLOW,
-         magenta:  Curses::COLOR_MAGENTA
+         white:    ICurses::COLOR_WHITE,
+         black:    ICurses::COLOR_BLACK,
+         red:      ICurses::COLOR_RED,
+         blue:     ICurses::COLOR_BLUE,
+         cyan:     ICurses::COLOR_CYAN,
+         green:    ICurses::COLOR_GREEN,
+         yellow:   ICurses::COLOR_YELLOW,
+         magenta:  ICurses::COLOR_MAGENTA
       }
       COLORS.default_proc = proc do |h, key|
          fail "Unknown color #{key}" unless key.is_a?Integer
@@ -45,8 +45,8 @@ module UI
       COLORS.freeze
 
       ATTRIBUTES = {
-         bold:  Curses::A_BOLD,  standout:  Curses::A_STANDOUT,
-         blink: Curses::A_BLINK, underline: Curses::A_UNDERLINE
+         bold:  ICurses::A_BOLD,  standout:  ICurses::A_STANDOUT,
+         blink: ICurses::A_BLINK, underline: ICurses::A_UNDERLINE
       }
       ATTRIBUTES.default_proc = proc { |h,k| k }
       ATTRIBUTES.freeze
@@ -68,8 +68,8 @@ module UI
             @@id += 1
          end
 
-         Curses.init_pair(id, fg, bg) #or fail
-         Curses.color_pair(id)
+         ICurses.init_pair(id, fg, bg) #or fail
+         ICurses.color_pair(id)
       end
 
       def self.add_attributes(*attrs)
@@ -99,7 +99,7 @@ module UI
             @@id += 1
          end
 
-         @@volatile[name] = Curses.init_pair(id, fg, bg)
+         @@volatile[name] = ICurses.init_pair(id, fg, bg)
       end
    end
 end

data/lib/ektoplayer/ui/widgets.rb

@@ -143,8 +143,8 @@ module UI
 
       def initialize(**opts)
          super(**opts)
-         @win = Curses::Window.new(@size.height, @size.width, @pos.y, @pos.x)
-         @win.keypad=(true)
+         @win = ICurses.newwin(@size.height, @size.width, @pos.y, @pos.x)
+         @win.keypad(true)
       end
 
       def layout
@@ -163,7 +163,7 @@ module UI
 
       def initialize(**opts)
          super(**opts)
-         @win = Curses::Pad.new(@size.height, @size.width)
+         @win = ICurses.newpad(@size.height, @size.width)
          @pad_minrow = @pad_mincol = 0
       end
 
@@ -230,7 +230,7 @@ module UI
       end
 
       def refresh
-         @win.noutrefresh(
+         @win.pnoutrefresh(
             @pad_minrow, @pad_mincol,
             @pos.y, @pos.x,
             @pos.y + @size.height - 1, @pos.x + @size.width - 1

data/lib/ektoplayer/ui/widgets/labelwidget.rb

@@ -28,7 +28,7 @@ module UI
       def draw
          @win.erase
          @text.split(?\n).each_with_index do |l, i|
-            @win.setpos(@pad[:top] + i, @pad[:left])
+            @win.move(@pad[:top] + i, @pad[:left])
             @win.attron(@attributes) { @win << l }
          end
       end

data/lib/ektoplayer/ui/widgets/listwidget.rb

@@ -12,12 +12,28 @@ module UI
 
       def layout; end
 
-      def render(scr, item, selected: false, marked: false)
+      def render(scr, item, selected: false, marked: false, selection: false)
          scr << (selected ? ?> : ' ')
          scr << item_to.s
       end
    end
 
+   class ListSelector
+      attr_reader :start_pos
+      def start(pos)
+         @start_pos = pos
+      end
+      
+      def started?; @start_pos end
+
+      def stop(pos)
+         return [] unless @start_pos
+         r = [pos, @start_pos].min.upto([pos, @start_pos].max).to_a
+         @start_pos = nil
+         r
+      end
+   end
+
    class ListSearch
       attr_accessor :direction, :source
 
@@ -28,7 +44,7 @@ module UI
       end
 
       def comp(item, search)
-         if item.is_a?String
+         if item.is_a?String or item.is_a?Symbol
             return item.downcase =~ Regexp.new(search.downcase)
          elsif item.is_a?Hash
             %w(title artist album).each do |key|
@@ -46,24 +62,29 @@ module UI
          @result = @source.size.times.select {|i| self.comp(@source[i], search) }
       end
 
-      def current; @result[@current] or 0                         end
-      def next;    @direction == :up ? search_up   : search_down  end
-      def prev;    @direction == :up ? search_down : search_up    end
+      def current; @current or 0 end #or 0                         end
+      def next(p)  @direction == :up ? search_up(p): search_down(p)  end
+      def prev(p)  @direction == :up ? search_down(p) : search_up(p) end
+
+      def search_up(p)
+         @current = (
+            @result.reverse.select { |v| v < p }[0] or @result[-1]
+         )
 
-      def search_up
-         @current -= 1
-         @current = @result.size - 1 if @current < 0
          self
       end
 
-      def search_down
-         @current = 0 if (@current += 1) >= @result.size
+      def search_down(p)
+         @current = (
+            @result.select { |v| v > p }[0] or @result[0]
+         )
+
          self
       end
    end
 
    class ListWidget < Window
-      attr_reader :list, :selected, :cursor
+      attr_reader :list, :selected, :cursor, :selection
       attr_accessor :item_renderer
 
       def initialize(list: [], item_renderer: nil, **opts)
@@ -72,13 +93,14 @@ module UI
          @item_renderer = (item_renderer or ListItemRenderer.new)
          @cursor = @selected = 0
          @search = ListSearch.new
+         @selection = ListSelector.new
       end
 
-      def search_next;  self.selected=(@search.next.current)  end
-      def search_prev;  self.selected=(@search.prev.current)  end
+      def search_next;  self.selected=(@search.next(@selected).current)  end
+      def search_prev;  self.selected=(@search.prev(@selected).current)  end
       def search_up;    self.search_start(:up)                end
       def search_down;  self.search_start(:down)              end
-      def search_start(direction=:down)
+      def search_start(direction)
          UI::Input.readline(@pos, @size.update(height: 1), prompt: '> ', add_hist: true) do |result|
             if result
                @search.source=(@list)
@@ -89,9 +111,39 @@ module UI
          end
       end
 
+      def toggle_selection
+         with_lock do
+            if @selection.started?
+               @selection.stop(@selected)
+               want_redraw
+            else
+               @selection.start(@selected)
+            end
+         end
+      end
+
+      def get_selection
+         self.lock
+         r = @selection.stop(@selected)
+         r << @selected if r.empty?
+         r
+      ensure
+         want_redraw
+         self.unlock
+      end
+
       def render(index, **opts)
          return unless @item_renderer
-         return unless @list[index] # TODO...?
+         return Ektoplayer::Application.log(self, 'render todo') unless @list[index]
+
+         opts[:selection] = (@selection.started? and (
+               opts[:selected] or index.between?(
+                  [@selection.start_pos, @selected].min,
+                  [@selection.start_pos, @selected].max
+               )
+            )
+         )
+
          @item_renderer.render(@win, @list[index], index, **opts)
       end
 
@@ -119,56 +171,64 @@ module UI
 
       def selected=(new_index)
          fail ArgumentError unless new_index
-         new_index = new_index.clamp(0, index_last)
-         return if @selected == new_index or @list.empty?
+         old_index_bottom = index_bottom
+         old_index_top = index_top
+         old_selected, @selected = @selected, new_index.clamp(0, index_last)
+         return if old_selected == @selected or @list.empty?
 
          self.lock
 
-         new_cursor = @cursor + new_index - @selected
+         old_cursor, new_cursor = @cursor, @cursor + @selected - old_selected
+
          if new_cursor.between?(0, @size.height - 1)
             # new selected item resides in current screen,
             # just want_redraw the old line and the newly selected one
-            write_at(@cursor);    render(@selected)
+            @cursor = new_cursor
+
+            # redraw whole screen in selection mode!
+            return want_redraw if @selection.started?
+
+            write_at(old_cursor); render(old_selected)
             write_at(new_cursor); render(new_index, selected: true)
-            @selected, @cursor = new_index, new_cursor
             _check
             want_refresh
          elsif (new_cursor.between?(-(@size.height - 1), (2 * @size.height - 1)))
             # new selected item is max a half screen size away
-            if new_index < @selected
-               if lines_after_cursor > (@selected - new_index)
-                  write_at(@cursor); render(@selected)
+            if @selected < old_selected
+               if lines_after_cursor > (old_selected - @selected)
+                  write_at(old_cursor); render(old_selected)
                end
 
-               (index_top - 1).downto(new_index + 1).each do |index|
+               (old_index_top - 1).downto(@selected + 1).each do |index|
                   @win.insert_top; render(index)
                end
 
-               @win.insert_top; render(new_index, selected: true)
-               @selected, @cursor = new_index, 0
+               @win.insert_top; render(@selected, selected: true)
+               @cursor = 0
                _check
             else
-               if lines_before_cursor > (new_index - @selected)
-                  write_at(@cursor); render(@selected)
+               if lines_before_cursor > (@selected - old_selected)
+                  write_at(old_cursor); render(old_selected)
                end
 
-               (index_bottom + 1).upto(new_index - 1).each do |index|
+               (old_index_bottom + 1).upto(@selected - 1).each do |index|
                   @win.append_bottom; render(index)
                end
 
-               @win.append_bottom; render(new_index, selected: true)
-               @selected, @cursor = new_index, cursor_max
+               @win.append_bottom; render(@selected, selected: true)
+               @cursor = cursor_max
                _check
             end
 
             want_refresh
          else
-            @selected = new_index
-            @cursor = new_index.clamp(0, cursor_max)
+            #@selected = new_index
+            @cursor = new_index.clamp(0, cursor_max) # todo new_index<>new_cursor? ne muess scho pasn
             _check
             want_redraw
          end
 
+      ensure
          self.unlock
       end
 
@@ -179,12 +239,17 @@ module UI
          return if (new_cursor == @cursor) or @list.empty?
 
          with_lock do
-            new_index = (@selected - (@cursor - new_cursor)).clamp(0, index_last)
-            write_at(@cursor);    render(@selected)
-            write_at(new_cursor); render(new_index, selected: true)
-            @selected, @cursor = new_index, new_cursor
+            old_cursor, @cursor = @cursor, new_cursor
+            old_selected, @selected = @selected, (@selected - (old_cursor - @cursor)).clamp(0, index_last)
             _check
-            want_refresh
+
+            if @selection.started?
+               want_redraw
+            else
+               write_at(old_cursor); render(old_selected)
+               write_at(new_cursor); render(@selected, selected: true)
+               want_refresh
+            end
          end
       end
 
@@ -211,23 +276,25 @@ module UI
             # list is already on top
             select_from_cursorpos((@cursor - n).clamp(0, cursor_max))
          elsif n < @size.height
+            old_index_top = index_top
+            old_selected, @selected = @selected, @selected - n
+
             if lines_after_cursor > n
-               write_at(@cursor); render(@selected) 
+               write_at(@cursor); render(old_selected) 
             end
 
-            (index_top - 1).downto(index_top - n).each do |index|
+            (old_index_top - 1).downto(old_index_top - n).each do |index|
                @win.insert_top; render(index)
             end
 
-            @selected -= n
             write_at(@cursor); render(@selected, selected: true)
 
             _check
             want_refresh
          else
-            @selected -= n
+            @selected -= n # TODO: move up?
             force_cursorpos(@cursor)
-            _check
+            _check # todo: move up
             want_redraw
          end
 
@@ -244,15 +311,17 @@ module UI
             select_from_cursorpos((@cursor + n).clamp(0, cursor_max))
             _check
          elsif n < @size.height
+            old_index_bottom = index_bottom
+            old_selected, @selected = @selected, @selected + n
+
             if lines_before_cursor > n
-               write_at(@cursor); render(@selected)
+               write_at(@cursor); render(old_selected)
             end
 
-            (index_bottom + 1).upto(index_bottom + n).each do |index|
+            (old_index_bottom + 1).upto(old_index_bottom + n).each do |index|
                @win.append_bottom; render(index)
             end
 
-            @selected += n
             write_at(@cursor); render(@selected, selected: true)
 
             _check

data/lib/ektoplayer/views/help.rb

@@ -15,9 +15,8 @@ module Ektoplayer
             @win.erase
 
             Bindings.bindings.each do |widget, commands|
-               @win.with_attr(Theme[:'help.widget_name']) do
-                  @win << "\n#{widget}\n"
-               end
+               @win.attrset(Theme[:'help.widget_name'])
+               @win.addstr("\n#{widget}\n")
 
                commands.each do |name, keys|
                   next if keys.empty?
@@ -29,15 +28,13 @@ module Ektoplayer
                      @win.with_attr(Theme[:'help.key_name']) { @win << key }
                   end
 
-                  @win.with_attr(Theme[:'help.command_name']) do
-                     @win.on_column(18).addstr(name.to_s)
-                  end
+                  @win.attrset(Theme[:'help.command_name'])
+                  @win.mvaddstr(@win.cury, 18, name.to_s)
 
-                  @win.with_attr(Theme[:'help.command_desc']) do
-                     @win.on_column(43).addstr(Bindings.commands[name.to_sym])
-                  end
+                  @win.attrset(Theme[:'help.command_desc'])
+                  @win.mvaddstr(@win.cury, 43, Bindings.commands[name.to_sym])
 
-                  @win.addch(?\n)
+                  @win.next_line
                end
             end
          end

data/lib/ektoplayer/views/info.rb

@@ -25,55 +25,47 @@ module Ektoplayer
          end
 
          def draw_heading(heading)
-            @win.with_attr(Theme[:'info.head']) do
-               @win.next_line.from_left(START_HEADING).addstr(heading)
-            end
+            @win.attrset(Theme[:'info.head'])
+            @win.mvaddstr(@win.cury + 1, START_HEADING, heading)
          end
 
          def draw_tag(tag, value=nil)
-            @win.with_attr(Theme[:'info.tag']) do
-               @win.next_line.from_left(START_TAG).addstr(tag)
-            end
+            @win.attrset(Theme[:'info.tag'])
+            @win.mvaddstr(@win.cury + 1, START_TAG, tag)
 
-            @win.from_left(START_TAG_VALUE)
-            @win.with_attr(Theme[:'info.value']) do
-               @win.addstr(value.to_s)
-            end
+            @win.attrset(Theme[:'info.value'])
+            @win.mvaddstr(@win.cury, START_TAG_VALUE, value.to_s)
          end
          
          def draw_info(string, value=nil)
-            @win.with_attr(Theme[:'info.tag']) do
-               @win.next_line.from_left(START_INFO).addstr(string)
-            end
+            @win.attrset(Theme[:'info.tag'])
+            @win.mvaddstr(@win.cury + 1, START_INFO, string)
 
-            @win.from_left(START_INFO_VALUE)
-            @win.with_attr(Theme[:'info.value']) do
-               @win.addstr(value.to_s)
-            end
+            @win.attrset(Theme[:'info.value'])
+            @win.mvaddstr(@win.cury, START_INFO_VALUE, value.to_s)
          end
 
          def draw_url(url, title=nil)
             title ||= url
             mevent = with_mouse_section_event do
-               @win.with_attr(Theme[:url]) { @win << title }
+               @win.attrset(Theme[:url])
+               @win << title
             end
-            mevent.on(Curses::BUTTON1_CLICKED) do
+            mevent.on(ICurses::BUTTON1_CLICKED) do
                Common::open_url_extern(url)
             end
          end
          
          def draw_download(file, percent, error)
-            @win.with_attr(Theme[:'info.download.file']) do
-               @win.next_line.from_left(START_TAG).addstr(file)
-            end
-            @win.with_attr(Theme[:'info.download.percent']) do
-               @win.addstr(" #{percent}")
-            end
+            @win.attrset(Theme[:'info.download.file'])
+            @win.mvaddstr(@win.cury + 1, START_TAG, file)
+
+            @win.attrset(Theme[:'info.download.percent'])
+            @win.addstr(" #{percent}")
 
             if error
-               @win.with_attr(Theme[:'info.download.error']) do
-                  @win.addstr(" #{error}")
-               end
+               @win.attrset(Theme[:'info.download.error'])
+               @win.addstr(" #{error}")
             end
          end
 
@@ -87,7 +79,7 @@ module Ektoplayer
 
             mouse_section.clear
             @win.erase
-            @win.setpos(0,0)
+            @win.move(0,0)
 
             if @track = (@playlist[@playlist.current_playing] rescue nil)
                draw_heading('Current track')
@@ -123,30 +115,29 @@ module Ektoplayer
                draw_heading('Description')
                line_length = START_TAG
                wrap_length = @size.width.clamp(1, LINE_WRAP)
-               @win.next_line.from_left(START_TAG)
+               @win.move(@win.cury + 1, START_TAG)
 
                Nokogiri::HTML("<p>#{@track['description']}</p>").css(?p).each do |p|
                   p.children.each do |element|
                      if element[:href]
                         if (line_length += element.text.size) > wrap_length
-                           @win.next_line.from_left(START_TAG)
+                           @win.move(@win.cury + 1, START_TAG)
                            line_length = START_TAG
                         end
 
                         draw_url(element[:href], element.text.strip)
-                        @win.addch(' ')
+                        @win.addch(32) # ' '
                      else
                         element.text.split(' ').each do |text|
                            if (line_length += text.size) > wrap_length
-                              @win.next_line.from_left(START_TAG)
+                              @win.move(@win.cury + 1, START_TAG)
                               line_length = START_TAG
                            end
 
-                           @win.with_attr(Theme[:'info.description']) do
-                              @win.mv_left(1) if text =~ /^[\.,:;]$/ 
-                              @win << text
-                              @win << ' '
-                           end
+                           @win.attrset(Theme[:'info.description'])
+                           @win.mv_left(1) if text =~ /^[\.,:;]$/ 
+                           @win << text
+                           @win.addch(32) # ' '
                         end
                      end
                   end