twterm 1.0.9 → 1.0.10

data/lib/twterm/tab/new/list.rb

@@ -3,84 +3,95 @@ module Twterm
     module New
       class List
         include Base
-        include Scrollable
 
         @@lists = nil
 
+        def ==(other)
+          other.is_a?(self.class)
+        end
+
         def initialize
           super
 
           @title = 'New tab'
+          refresh
         end
 
         def respond_to_key(key)
-          return true if super
-
           case key
+          when ?g
+            scroll_manager.move_to_top
+          when ?G
+            scroll_manager.move_to_bottom
+          when ?j, 14, Curses::Key::DOWN
+            scroll_manager.move_down
           when 10
             return true if current_list.nil?
             list_tab = Tab::ListTab.new(current_list.id)
             TabManager.instance.switch(list_tab)
+          when ?k, 16, Curses::Key::UP
+            scroll_manager.move_up
           else
             return false
           end
           true
         end
 
-        def ==(other)
-          other.is_a?(self.class)
-        end
-
         private
 
+        def count
+          @@lists.nil? ? 0 : @@lists.count
+        end
+
         def current_list
-          @@lists.nil? ? nil : @@lists[index]
+          @@lists.nil? ? nil : @@lists[scroll_manager.index]
         end
 
-        def update
-          @window.clear
+        def offset_from_bottom
+          0
+        end
 
-          @window.bold do
-            @window.setpos(2, 3)
-            @window.addstr('Open list tab')
+        def show_lists
+          return if @@lists.nil?
+
+          @@lists.each.with_index(0) do |list, i|
+            window.with_color(:black, :magenta) do
+              window.setpos(i * 3 + 5, 4)
+              window.addstr(' ')
+              window.setpos(i * 3 + 6, 4)
+              window.addstr(' ')
+            end if i == scroll_manager.index
+
+            window.setpos(i * 3 + 5, 6)
+            window.addstr("#{list.full_name} (#{list.member_count} members / #{list.subscriber_count} subscribers)")
+            window.setpos(i * 3 + 6, 8)
+            window.addstr(list.description)
           end
+        end
+
+        def scroll_manager
+          return @scroll_manager unless @scroll_manager.nil?
+
+          @scroll_manager = ScrollManager.new
+          @scroll_manager.delegate = self
+          @scroll_manager.after_move { refresh }
+          @scroll_manager
+        end
+
+        def update
+          window.setpos(2, 3)
+          window.bold { window.addstr('Open list tab') }
 
           Thread.new do
             Notifier.instance.show_message('Loading lists ...')
             Client.current.lists do |lists|
               @@lists = lists.sort_by(&:full_name)
               show_lists
-              update_scrollbar_length
-              @window.refresh if TabManager.instance.current_tab == self
+              window.refresh if TabManager.instance.current_tab == self
             end
           end if @@lists.nil?
 
           show_lists
-          draw_scroll_bar
-
-          @window.refresh
-        end
-
-        def show_lists
-          return if @@lists.nil?
-
-          @@lists.each.with_index(0) do |list, i|
-            @window.with_color(:black, :magenta) do
-              @window.setpos(i * 3 + 5, 4)
-              @window.addstr(' ')
-              @window.setpos(i * 3 + 6, 4)
-              @window.addstr(' ')
-            end if i == index
-
-            @window.setpos(i * 3 + 5, 6)
-            @window.addstr("#{list.full_name} (#{list.member_count} members / #{list.subscriber_count} subscribers)")
-            @window.setpos(i * 3 + 6, 8)
-            @window.addstr(list.description)
-          end
-        end
-
-        def count
-          @@lists.nil? ? 0 : @@lists.count
         end
       end
     end

data/lib/twterm/tab/new/search.rb

@@ -5,15 +5,14 @@ module Twterm
         include Base
         include Readline
 
+        def ==(other)
+          other.is_a?(self.class)
+        end
+
         def initialize
           super
 
           @title = 'New tab'
-          @window.refresh
-        end
-
-        def respond_to_key(_)
-          false
         end
 
         def invoke_input
@@ -44,6 +43,10 @@ module Twterm
           input_thread.join
         end
 
+        def respond_to_key(_)
+          false
+        end
+
         private
 
         def update; end

data/lib/twterm/tab/new/start.rb

@@ -4,6 +4,10 @@ module Twterm
       class Start
         include Base
 
+        def ==(other)
+          other.is_a?(self.class)
+        end
+
         def initialize
           super
           @title = 'New tab'
@@ -23,54 +27,41 @@ module Twterm
             tab = Tab::New::User.new
             TabManager.instance.switch(tab)
             tab.invoke_input
+          when 'x'
+            tab = Tab::New::Track.new
+            TabManager.instance.switch(tab)
+            tab.invoke_input
           else
             return false
           end
           true
         end
 
-        def ==(other)
-          other.is_a?(self.class)
-        end
-
         private
 
         def update
-          @window.clear
-
-          @window.bold do
-            @window.setpos(2, 3)
-            @window.addstr("You've opened a new tab")
-          end
+          window.setpos(2, 3)
+          window.bold { window.addstr("You've opened a new tab") }
 
-          @window.setpos(4, 5)
-          @window.addstr('- [L] Open list tab')
-          @window.bold do
-            @window.setpos(4, 7)
-            @window.addstr('[L]')
-          end
+          window.setpos(4, 5)
+          window.addstr('- [L] Open list tab')
+          window.setpos(4, 7)
+          window.bold { window.addstr('[L]') }
 
-          @window.setpos(6, 5)
-          @window.addstr('- [S] Open search tab')
-          @window.bold do
-            @window.setpos(6, 7)
-            @window.addstr('[S]')
-          end
+          window.setpos(6, 5)
+          window.addstr('- [S] Open search tab')
+          window.setpos(6, 7)
+          window.bold { window.addstr('[S]') }
 
-          @window.setpos(8, 5)
-          @window.addstr('- [U] Open user tab')
-          @window.bold do
-            @window.setpos(8, 7)
-            @window.addstr('[U]')
-          end
+          window.setpos(8, 5)
+          window.addstr('- [U] Open user tab')
+          window.setpos(8, 7)
+          window.bold { window.addstr('[U]') }
 
-          @window.setpos(11, 3)
-          @window.addstr('To cancel opening a new tab, just press [w] to close this tab.')
-          @window.bold do
-            @window.setpos(11, 43)
-            @window.addstr('[w]')
-          end
-          @window.refresh
+          window.setpos(11, 3)
+          window.addstr('To cancel opening a new tab, just press [w] to close this tab.')
+          window.setpos(11, 43)
+          window.bold { window.addstr('[w]') }
         end
       end
     end

data/lib/twterm/tab/new/user.rb

@@ -5,15 +5,14 @@ module Twterm
         include Base
         include Readline
 
+        def ==(other)
+          other.is_a?(self.class)
+        end
+
         def initialize
           super
 
           @title = 'New tab'
-          @window.refresh
-        end
-
-        def respond_to_key(_)
-          false
         end
 
         def invoke_input
@@ -56,6 +55,10 @@ module Twterm
           input_thread.join
         end
 
+        def respond_to_key(_)
+          false
+        end
+
         private
 
         def update; end

data/lib/twterm/tab/scroll_manager.rb

@@ -0,0 +1,84 @@
+module Twterm
+  module Tab
+    class ScrollManager
+      extend Forwardable
+
+      attr_reader :index, :offset
+      attr_accessor :last
+
+      attr_accessor :delegate
+      def_delegators :delegate, :count, :offset_from_bottom
+
+      def after_move(&block)
+        add_hook(:after_move, &block)
+      end
+
+      def initialize
+        @index = 0
+        @offset = 0
+        @last = 0
+      end
+
+      def item_appended!
+        @index -= 1
+        @offset -= 1 if @offset > 0
+      end
+
+      def item_prepended!
+        @index += 1
+        @offset += 1
+      end
+
+      def move_down
+        return if count == 0 || index == count - 1
+
+        @index = [index + 1, count - 1].min
+        @offset = [
+          offset + 1,
+          count - 1,
+          count - offset_from_bottom
+        ].min if index > last - 4
+
+        hook :after_move
+      end
+
+      def move_to_bottom
+        return if count == 0 || index == count - 1
+
+        @index = count - 1
+        @offset = count - 1 - offset_from_bottom
+
+        hook :after_move
+      end
+
+      def move_to_top
+        return if count == 0 || index == 0
+
+        @index = 0
+        @offset = 0
+
+        hook :after_move
+      end
+
+      def move_up
+        return if count == 0 || index == 0
+
+        @index = [index - 1, 0].max
+        @offset = [offset - 1, 0].max if index - 4 < offset
+
+        hook :after_move
+      end
+
+      private
+
+      def add_hook(name, &block)
+        @hooks ||= {}
+        @hooks[name] = block
+      end
+
+      def hook(name)
+        @hooks[name].call unless @hooks[name].nil?
+      end
+    end
+  end
+end

data/lib/twterm/tab/search_tab.rb

@@ -6,34 +6,34 @@ module Twterm
 
       attr_reader :query
 
-      def initialize(query)
-        super()
+      def ==(other)
+        other.is_a?(self.class) && query == other.query
+      end
 
-        @query = query
-        @title = "\"#{@query}\""
+      def close
+        @auto_reloader.kill if @auto_reloader
+        super
+      end
 
-        fetch { move_to_top }
-        @auto_reloader = Scheduler.new(300) { fetch }
+      def dump
+        @query
       end
 
       def fetch
         Client.current.search(@query) do |statuses|
-          statuses.reverse.each { |status| prepend(status) }
+          statuses.reverse.each(&method(:prepend))
           yield if block_given?
         end
       end
 
-      def close
-        @auto_reloader.kill if @auto_reloader
-        super
-      end
+      def initialize(query)
+        super()
 
-      def ==(other)
-        other.is_a?(self.class) && query == other.query
-      end
+        @query = query
+        @title = "\"#{@query}\""
 
-      def dump
-        @query
+        fetch { scroll_manager.move_to_top }
+        @auto_reloader = Scheduler.new(300) { fetch }
       end
     end
   end