twterm 2.5.0 → 2.9.0

data/lib/twterm/screen.rb

@@ -6,18 +6,18 @@ require 'twterm/subscriber'
 module Twterm
   class Screen
     include Subscriber
-    include Curses
 
     def initialize(app, client)
       @app, @client = app, client
 
-      @screen = init_screen
-      noecho
-      raw
-      curs_set(0)
-      stdscr.keypad(true)
-      start_color
-      use_default_colors
+      @screen = Curses.init_screen
+      Curses.noecho
+      Curses.raw
+      Curses.curs_set(0)
+      Curses.stdscr.keypad(true)
+      Curses.start_color
+      Curses.use_default_colors
+      Curses.mousemask(Curses::BUTTON1_CLICKED | 65536 | 2097152)
 
       subscribe(Event::Screen::Refresh) { refresh }
       subscribe(Event::Screen::Resize, :resize)
@@ -53,6 +53,42 @@ module Twterm
 
     attr_reader :app, :client
 
+    # @param [Integer, String] key
+    def handle_keyboard_event(key)
+      return if app.tab_manager.current_tab.respond_to_key(key)
+      return if app.tab_manager.respond_to_key(key)
+      respond_to_key(key)
+    end
+
+    # @param [Curses::MouseEvent] e
+    def handle_mouse_event(e)
+      x = e.x
+      y = e.y
+
+      case e.bstate
+      when Curses::BUTTON1_CLICKED
+        return app.tab_manager.handle_left_click(x, y) if app.tab_manager.enclose?(x, y)
+      when 65536
+        scroll_direction = app.preferences[:control, :scroll_direction]
+
+        case scroll_direction
+        when 'natural'
+          return app.tab_manager.handle_scroll_up(x, y) if app.tab_manager.enclose?(x, y)
+        when 'traditional'
+          return app.tab_manager.handle_scroll_down(x, y) if app.tab_manager.enclose?(x, y)
+        end
+      when 2097152
+        scroll_direction = app.preferences[:control, :scroll_direction]
+
+        case scroll_direction
+        when 'natural'
+          return app.tab_manager.handle_scroll_down(x, y) if app.tab_manager.enclose?(x, y)
+        when 'traditional'
+          return app.tab_manager.handle_scroll_up(x, y) if app.tab_manager.enclose?(x, y)
+        end
+      end
+    end
+
     def refresh
       app.tab_manager.refresh_window
       app.tab_manager.current_tab.render
@@ -60,10 +96,10 @@ module Twterm
     end
 
     def resize(event)
-      return if closed?
+      return if Curses.closed?
 
       lines, cols = event.lines, event.cols
-      resizeterm(lines, cols)
+      Curses.resizeterm(lines, cols)
       @screen.resize(lines, cols)
 
       refresh
@@ -72,11 +108,15 @@ module Twterm
     def scan
       app.reset_interruption_handler
 
-      key = getch
+      key = Curses.getch
 
-      return if app.tab_manager.current_tab.respond_to_key(key)
-      return if app.tab_manager.respond_to_key(key)
-      respond_to_key(key)
+      if key == Curses::Key::MOUSE
+        e = Curses.getmouse
+
+        handle_mouse_event(e) unless e.nil?
+      else
+        handle_keyboard_event(key)
+      end
     end
   end
 end

data/lib/twterm/search_query_window.rb

@@ -3,7 +3,6 @@ require 'twterm/subscriber'
 
 module Twterm
   class SearchQueryWindow
-    include Curses
     include Singleton
     include Subscriber
 
@@ -12,7 +11,7 @@ module Twterm
     attr_reader :last_query
 
     def initialize
-      @window = stdscr.subwin(1, stdscr.maxx, stdscr.maxy - 1, 0)
+      @window = Curses.stdscr.subwin(1, Curses.stdscr.maxx, Curses.stdscr.maxy - 1, 0)
       @searching_down = true
       @str = ''
       @last_query = ''
@@ -29,7 +28,7 @@ module Twterm
       chars = []
 
       loop do
-        char = getch
+        char = Curses.getch
 
         if char.nil?
           case chars.first
@@ -117,8 +116,8 @@ module Twterm
     attr_reader :window
 
     def resize(_event)
-      window.resize(1, stdscr.maxx)
-      window.move(stdscr.maxy - 1, 0)
+      window.resize(1, Curses.stdscr.maxx)
+      window.move(Curses.stdscr.maxy - 1, 0)
     end
 
     def render(str)

data/lib/twterm/status.rb

@@ -12,6 +12,7 @@ class Twitter::Tweet
 end
 
 module Twterm
+  # A tweet
   class Status
     attr_reader :created_at, :favorite_count, :favorited, :hashtags, :id,
       :in_reply_to_status_id, :media, :retweet_count, :retweeted,
@@ -23,11 +24,13 @@ module Twterm
       other.is_a?(self.class) && id == other.id
     end
 
+    # @todo This should be done in a presenter
     def date
       format = Time.now - @created_at < 86_400 ? '%H:%M:%S' : '%Y-%m-%d %H:%M:%S'
       @created_at.strftime(format)
     end
 
+    # @todo This can be marked as private
     def expand_url!
       sub = -> (x) { @text.sub!(x.url, x.display_url) }
       (@media + @urls).each(&sub)
@@ -69,10 +72,16 @@ module Twterm
       expand_url!
     end
 
+    # Is this status a quote?
+    #
+    # @return [Boolean]
     def quote?
       !quoted_status_id.nil?
     end
 
+    # Is this status a retweet?
+    #
+    # @return [Boolean]
     def retweet?
       !retweeted_status_id.nil?
     end
@@ -93,6 +102,7 @@ module Twterm
       @retweeted = false
     end
 
+    # @return [self]
     def update!(tweet, is_retweeted_status = false)
       @retweet_count = tweet.retweet_count
       @favorite_count = tweet.favorite_count

data/lib/twterm/tab/abstract_tab.rb

@@ -7,20 +7,31 @@ require 'twterm/subscriber'
 module Twterm
   module Tab
     class AbstractTab
-      include Curses
       include Subscriber
 
-      attr_reader :window, :title
+      # @return [String]
+      attr_reader :title
 
+      # @return [Curses::Window]
+      # @todo This can be (and should be) private
+      attr_reader :window
+
+      # @param other [Twterm::Tab::AbstractTab]
+      #
+      # @return [Boolean]
       def ==(other)
         self.equal?(other)
       end
 
+      # @return [void]
       def close
         unsubscribe
         window.close
       end
 
+      # A utility method to find a status by its ID
+      #
+      # @return [Concurrent::Promise<Twterm::Status>]
       def find_or_fetch_status(id)
         status = app.status_repository.find(id)
 
@@ -31,6 +42,9 @@ module Twterm
         end
       end
 
+      # A utility method to find a list by their ID
+      #
+      # @return [Concurrent::Promise<Twterm::List>]
       def find_or_fetch_list(id)
         list = app.list_repository.find(id)
 
@@ -41,6 +55,9 @@ module Twterm
         end
       end
 
+      # A utility method to find a user by their id
+      #
+      # @return [Concurrent::Promise<Twterm::User>]
       def find_or_fetch_user(id)
         user = app.user_repository.find(id)
 
@@ -54,7 +71,7 @@ module Twterm
       def initialize(app, client)
         @app, @client = app, client
 
-        @window = stdscr.subwin(stdscr.maxy - 5, stdscr.maxx, 3, 0)
+        @window = Curses.stdscr.subwin(Curses.stdscr.maxy - 3, Curses.stdscr.maxx, 2, 0)
 
         subscribe(Event::Screen::Resize, :resize)
       end
@@ -72,7 +89,7 @@ module Twterm
               end
             end
 
-            view.at(1, 2).render
+            view.render
           end if refreshable?
         end
       end
@@ -88,8 +105,13 @@ module Twterm
 
       private
 
-      attr_reader :app, :client
+      # @return [Twterm::App]
+      attr_reader :app
+
+      # @return [Twterm::Client]
+      attr_reader :client
 
+      # @return [Twterm::Image]
       def image
         Image.string('view method is not implemented')
       end
@@ -98,19 +120,22 @@ module Twterm
         @refresh_mutex ||= Mutex.new
       end
 
+      # @return [Boolean]
       def refreshable?
         !(
           refresh_mutex.locked? ||
-            closed? ||
+            Curses.closed? ||
             app.tab_manager.current_tab.object_id != object_id
         )
       end
 
+      # @return [void]
       def resize(_event)
-        window.resize(stdscr.maxy - 5, stdscr.maxx)
-        window.move(3, 0)
+        window.resize(Curses.stdscr.maxy - 3, Curses.stdscr.maxx)
+        window.move(2, 0)
       end
 
+      # @return [Twterm::View]
       def view
         View.new(window, image)
       end

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

@@ -1,5 +1,4 @@
 require 'twterm/tab/abstract_tab'
-require 'twterm/tab/direct_message/conversation_list'
 require 'twterm/tab/rate_limit_status'
 require 'twterm/tab/preferences/index'
 
@@ -19,7 +18,6 @@ module Twterm
 
         def items
           %i(
-            direct_messages
             list_tab
             search_tab
             user_tab
@@ -60,8 +58,6 @@ module Twterm
 
               desc =
                 case item
-                when :direct_messages
-                  'Direct messages'
                 when :list_tab
                   'List tab'
                 when :search_tab
@@ -82,10 +78,6 @@ module Twterm
             .reduce(Image.empty, :|)
         end
 
-        def open_direct_messages
-          switch(Tab::DirectMessage::ConversationList.new(app, client))
-        end
-
         def open_list_tab
           switch(Tab::New::List.new(app, client))
         end
@@ -114,8 +106,6 @@ module Twterm
 
         def perform_selected_action
           case current_item
-          when :direct_messages
-            open_direct_messages
           when :list_tab
             open_list_tab
           when :search_tab

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

@@ -33,10 +33,10 @@ module Twterm
           @@lists || []
         end
 
-        def matches?(_list, query)
+        def matches?(list, query)
           [
-            other.description,
-            other.full_name,
+            list.description,
+            list.full_name,
           ].any? { |x| x.downcase.include?(query.downcase) }
         end
 

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

@@ -32,13 +32,13 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             app.completion_manager.set_search_mode!
             puts "\ninput search query"
             query = (readline('> ', true) || '').strip

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

@@ -16,7 +16,7 @@ module Twterm
 
         def invoke_input
           resetter = proc do
-            reset_prog_mode
+            Curses.reset_prog_mode
             sleep 0.1
             publish(Event::Screen::Refresh.new)
           end
@@ -24,7 +24,7 @@ module Twterm
           app.completion_manager.set_screen_name_mode!
 
           input_thread = Thread.new do
-            close_screen
+            Curses.close_screen
             puts "\nSearch user"
             screen_name = (readline('> @', true) || '').strip
             resetter.call

data/lib/twterm/tab/preferences/control.rb

@@ -0,0 +1,77 @@
+require 'twterm/image'
+require 'twterm/preferences'
+require 'twterm/publisher'
+require 'twterm/tab/abstract_tab'
+require 'twterm/tab/scrollable'
+
+module Twterm
+  module Tab
+    module Preferences
+      class Control < AbstractTab
+        include Scrollable
+        include Publisher
+
+        def drawable_item_count
+          1
+        end
+
+        def image
+          drawable_items.map.with_index do |item, i|
+            curr = scroller.current_index?(i)
+            cursor = Image.cursor(2, curr)
+            options = Image.toggle_switch(['traditional', 'natural'], app.preferences[:control, item])
+            desc =
+              case item
+              when :scroll_direction
+                header = Image.string('Scroll direction')
+                body = Image.string('  ') - options
+                cursor - Image.whitespace - (header | body)
+              end
+          end
+            .intersperse(Image.blank_line)
+            .reduce(Image.empty) { |acc, x| acc | x }
+        end
+
+        def items
+          [
+            :scroll_direction,
+          ]
+        end
+
+        def respond_to_key(key)
+          return true if scroller.respond_to_key(key)
+
+          case key
+          when 10
+            perform_selected_action
+          end
+
+          false
+        end
+
+        def title
+          'Control preferences'
+        end
+
+        private
+
+        def perform_selected_action
+          item = scroller.current_item
+
+          case item
+          when :scroll_direction
+            app.preferences[:control, :scroll_direction] =
+              case app.preferences[:control, :scroll_direction]
+              when 'natural'
+                'traditional'
+              when 'traditional'
+                'natural'
+              end
+          end
+
+          render
+        end
+      end
+    end
+  end
+end