ektoplayer 0.1.6 → 0.1.11

data/lib/ektoplayer/controllers/help.rb

@@ -1,4 +1,4 @@
-require 'curses'
+require_relative '../icurses'
 
 require_relative 'controller'
 

data/lib/ektoplayer/controllers/info.rb

@@ -1,4 +1,4 @@
-require 'curses'
+require_relative '../icurses'
 
 require_relative 'controller'
 

data/lib/ektoplayer/controllers/playlist.rb

@@ -10,7 +10,7 @@ module Ektoplayer
 
             register = view_operations.with_register('playlist.')
             %w(up down page_up page_down top bottom
-               search_up search_down search_next search_prev).
+               search_up search_down search_next search_prev toggle_selection).
                each { |op| register.(op, &@view.method(op)) }
 
             register.(:play) do
@@ -18,24 +18,36 @@ module Ektoplayer
             end
 
             register.(:reload) do
-               operations.send(:'playlist.reload', view.selected)
+               view.get_selection.each do |index|
+                  operations.send(:'playlist.reload', index)
+               end
             end
 
             register.(:download_album) do
-               operations.send(:'playlist.download_album', view.selected)
+               view.get_selection.each do |index|
+                  operations.send(:'playlist.download_album', index)
+               end
             end
 
             register.(:delete) do
-               old_cursor, old_selected = view.cursor, view.selected
-               operations.send(:'playlist.delete', old_selected)
-               view.selected=(old_selected)
-               view.force_cursorpos(old_cursor)
+               view.with_lock do
+                  old_cursor, selection = view.cursor, view.get_selection
+
+                  selection.each do 
+                     operations.send(:'playlist.delete', selection[0])
+                  end
+
+                  view.selected=(selection[0])
+                  view.force_cursorpos(old_cursor)
+               end
             end
 
             register.(:goto_current) do
-               if index = playlist.current_playing
-                  view.selected=(index)
-                  view.center()
+               view.with_lock do
+                  if index = playlist.current_playing
+                     view.selected=(index)
+                     view.center()
+                  end
                end
             end
 
@@ -43,14 +55,14 @@ module Ektoplayer
             view.mouse.on(65536) do view.up(5) end
             view.mouse.on(2097152) do view.down(5) end
 
-            [Curses::BUTTON1_CLICKED, Curses::BUTTON2_CLICKED].
+            [ICurses::BUTTON1_CLICKED, ICurses::BUTTON2_CLICKED].
                each do |button|
                view.mouse.on(button) do |mevent|
                   view.select_from_cursorpos(mevent.y)
                end
             end
 
-            [Curses::BUTTON1_DOUBLE_CLICKED, Curses::BUTTON3_CLICKED].each do |btn|
+            [ICurses::BUTTON1_DOUBLE_CLICKED, ICurses::BUTTON3_CLICKED].each do |btn|
                view.mouse.on(btn) do |mevent|
                   view.select_from_cursorpos(mevent.y)
                   view_operations.send('playlist.play')

data/lib/ektoplayer/icurses.rb

@@ -0,0 +1,21 @@
+%w(ffi-ncurses ncursesw ncurses curses).each do |f|
+   begin
+      $USING_CURSES = f
+      require_relative "icurses/#{f}" 
+      break
+   rescue LoadError
+      $USING_CURSES = nil
+   end
+end
+
+fail %{
+No interface for ncurses found. Please install one of the following gems
+   - curses
+   - ffi-ncurses
+   - ncurses-ruby
+   - ncursesw
+
+Maybe your distribution ships one of these already as a package.
+} unless $USING_CURSES
+
+require_relative 'icurses/sugar'

data/lib/ektoplayer/icurses/curses.rb

@@ -0,0 +1,53 @@
+require 'curses'
+
+module Curses
+   def Curses.initscr; init_screen  end
+   def Curses.endwin;  close_screen end
+
+   def Curses.newwin(*a) Curses::Window.new(*a) end
+   def Curses.newpad(*a) Curses::Pad.new(*a)    end
+
+   class Window
+      def mvaddstr(y, x, s)
+         move(y, x)
+         addstr(s)
+      end
+
+      %w(curx cury maxx maxy begx begy).each do |method|
+         alias_method :"get#{method}", method.to_sym
+      end
+
+      alias :timeout :timeout=
+      alias :notimeout :nodelay= #todo
+      alias :nodelay :nodelay=
+
+      alias :mvwin :move # 'fix' this Gem
+      def move(y, x)
+         setpos(y, x)
+      end
+   end
+
+   class Pad < Window
+      alias :pnoutrefresh :refresh
+   end
+end
+
+module ICurses
+   include Curses
+
+   (Curses.public_methods - public_methods).each do |method|
+      define_singleton_method(method, &Curses.method(method))
+   end
+
+   def mousemask(mask, *a); Curses.mousemask(mask) end
+   module_function :mousemask
+
+   def getmouse(mevent=nil)
+      if mevent = Curses.getmouse()
+         return IMouseEvent.new(mevent)
+      end
+   end
+   module_function :getmouse
+
+   IWindow = Curses::Window
+end

data/lib/ektoplayer/icurses/ffi_ncurses.rb

@@ -0,0 +1,69 @@
+require 'ffi-ncurses'
+
+module FFI::NCurses
+   alias_method :_newwin, :newwin
+   def newwin(*a)
+      IWindow.new(_newwin(*a))
+   end
+   module_function :newwin
+
+   alias_method :_newpad, :newpad
+   def newpad(*a)
+      IWindow.new(_newpad(*a))
+   end
+   module_function :newpad
+
+   alias_method :_stdscr, :stdscr
+   def stdscr
+      IWindow.new(_stdscr)
+   end
+   module_function :stdscr
+
+   alias_method :_mousemask, :mousemask
+   def mousemask(mask, *_)
+      _mousemask(mask, nil)
+   end
+   module_function :mousemask
+
+   alias_method :_getmouse, :getmouse
+   def getmouse(mevent=nil)
+      mevent = FFI::NCurses::Mouse::MEVENT.new
+      if _getmouse(mevent) > -1
+         return IMouseEvent.new(mevent)
+      end
+   end
+   module_function :getmouse
+
+
+   class Window
+      def initialize(w)
+         @w = w
+      end
+
+      FFI::NCurses.public_methods.each do |method|
+         if method =~ /^(mv)?w/ 
+            define_method(method) do |*args|
+               FFI::NCurses.send(method, @w, *args)
+            end
+
+            next if method =~ /win$/
+
+            define_method(method.to_s.sub(?w, '')) do |*args|
+               FFI::NCurses.send(method, @w, *args)
+            end
+         end
+      end
+
+      %w(getcurx getcury getmaxx getmaxy getbegx getbegy
+         keypad nodelay notimeout prefresh pnoutrefresh).each do |meth|
+
+         define_method(meth) do |*args|
+            FFI::NCurses.send(meth, @w, *args)
+         end
+      end
+   end
+
+   IWindow = Window
+end
+
+ICurses = FFI::NCurses

data/lib/ektoplayer/icurses/ncurses.rb

@@ -0,0 +1,79 @@
+require $USING_CURSES
+
+Ncurses.initscr
+
+module Ncurses
+   class IWindow
+      def initialize(w)
+         @w = w
+      end
+
+      def getch
+         return Ncurses::wgetch(self)
+         y, x = Ncurses::getcury(self), Ncurses::getcurx(self)
+         c = Ncurses::wgetch(self)
+         Ncurses::wmove(self, y, x)
+         c
+      end
+
+      %w(getcurx getcury getmaxx getmaxy getbegx getbegy
+         keypad nodelay notimeout prefresh pnoutrefresh).each do |meth|
+         define_method(meth) do |*args|
+            Ncurses.send(meth, @w, *args)
+         end
+      end
+
+      Ncurses.public_methods.each do |meth|
+         if meth =~ /^(mv)?w/ 
+            define_method(meth) do |*args|
+               Ncurses.send(meth, @w, *args)
+            end
+
+            next if meth =~ /win$/
+
+            define_method(meth.to_s.sub(?w, '')) do |*args|
+               Ncurses.send(meth, @w, *args)
+            end
+         end
+      end
+   end
+end
+
+module ICurses
+   include Ncurses
+
+   def method_missing(m, *a)
+      Ncurses.send(m, *a)
+   rescue NoMethodError
+      Ncurses.send(m.downcase, *a)
+   end
+   module_function :method_missing
+
+   def initscr; end # do nothing
+   module_function :initscr
+
+   def newwin(*a)
+      ICurses::IWindow.new( Ncurses.newwin(*a) )
+   end
+   module_function :newwin
+
+   def newpad(*a)
+      ICurses::IWindow.new( Ncurses.newpad(*a) )
+   end
+   module_function :newpad
+
+   def mousemask(mask, *_)
+      Ncurses.mousemask(mask, [])
+   end
+   module_function :mousemask
+
+   def getmouse(mevent=nil)
+      mevent = Ncurses::MEVENT.new
+      if Ncurses.getmouse(mevent) > -1
+         return IMouseEvent.new(mevent)
+      end
+   end
+   module_function :getmouse
+
+   IWindow = Ncurses::IWindow
+end

data/lib/ektoplayer/icurses/ncursesw.rb

@@ -0,0 +1 @@
+require_relative 'ncurses'

data/lib/ektoplayer/icurses/sugar.rb

@@ -0,0 +1,65 @@
+module ICurses
+   class IMouseEvent
+      attr_accessor :x, :y, :z, :bstate
+
+      def initialize(mouse_event=nil)
+         from_mouse_event!(mouse_event)
+      end
+
+      def [](key)          send(key)               end
+      def []=(key, value)  send("#{key}=", value)  end
+
+      def from_mouse_event!(m)
+         @x, @y, @z, @bstate = m.x, m.y, m.z, m.bstate 
+      rescue
+         @x, @y, @z, @bstate = m[:x], m[:y], m[:z], m[:bstate]
+      rescue
+         @x= @y= @z= @bstate = 0
+      end
+
+      def update!(x: nil, y: nil, z: nil, bstate: nil)
+         @x = x if x
+         @y = y if y
+         @z = z if z
+         @bstate = (bstate or @bstate)
+      end
+   end
+end
+
+module ICurses
+   %w(lines cols colors init_pair color_pair).each do |meth| 
+      meth_up = meth.upcase
+
+      if not respond_to? meth
+         alias_method(meth, meth_up) rescue (
+            define_method(meth) do |*args|
+               method_missing(meth_up, *args)
+            end
+         )
+
+         module_function(meth)
+      elsif not respond_to? meth_up
+         alias_method(meth_up, meth) rescue (
+            define_method(meth_up) do |*args|
+               method_missing(meth, *args)
+            end
+         )
+         module_function(meth_up)
+      end
+   end
+
+   class IWindow
+      unless respond_to? :<<
+         alias_method(:<<, :addstr)
+      end
+
+      %w(curx cury maxx maxy begx begy).each do |meth|
+         full = 'get' + meth
+         if not respond_to? meth
+            alias_method(meth, full)
+         elsif not respond_to? full
+            alias_method(full, meth)
+         end
+      end
+   end
+end

data/lib/ektoplayer/icurses/test.rb

@@ -0,0 +1,99 @@
+#!/usr/bin/env ruby
+
+unless ARGV[0]
+   %w(curses ncurses ncursesw ffi_curses).each do |i|
+      puts i
+      fail i unless system($0, i)
+   end
+   exit
+end
+
+$USING_CURSES = ARGV[0]
+require_relative ARGV[0]
+require_relative 'sugar'
+
+begin
+   warn 'call: initscr'
+   ICurses.initscr
+
+   warn 'call: stdscr'
+   s = ICurses.stdscr
+   warn 'call: stdscr.clear, stdscr.refresh'
+   s.clear; s.refresh
+
+   warn 'call: newwin(0,0,0,0)'
+   w = ICurses.newwin(0,0,0,0)
+   warn 'call: win.erase'
+   w.erase
+
+   warn 'call: win.addstr, win.mvaddstr, win.move, win.getcurx, win.getcury'
+   w.addstr(ARGV[0])
+   w.mvaddstr(1,0, 'test 1')
+   w.move(2,0);
+   w.addstr('test 2')
+   x, y = w.getcurx, w.getcury
+   w.mvaddstr(y + 1, 0, 'test 3')
+
+   warn 'call win.getch'
+   w.getch
+
+   warn 'call: LINES COLS'
+   w.addstr("my term is #{ICurses.LINES} lines and #{ICurses.COLS} cols")
+
+   warn 'call: win.resize'
+   w.resize(50, 30)
+
+   warn 'call: win.refresh, win.noutrefresh'
+   w.refresh; w.noutrefresh
+
+   warn 'call: keypad(true)'
+   w.keypad(true)
+
+   warn 'call: timeout(-1)'
+   w.timeout(1000)
+
+   warn 'call: nodelay(false)'
+   w.nodelay(false)
+
+   warn 'call: notimeout(true)'
+   w.notimeout(true)
+
+   warn 'call: curs_set, nl, nonl, echo, noecho'
+   ICurses.curs_set(1); ICurses.curs_set(0)
+   ICurses.nl; ICurses.nonl
+   ICurses.echo; ICurses.noecho
+
+   warn 'call: mousemask'
+   ICurses.mousemask(ICurses::ALL_MOUSE_EVENTS, [])
+
+   # === Colors === #
+   warn 'call: start_color, use_default_colors, init_pair, attron, attroff'
+   ICurses.start_color
+   ICurses.use_default_colors
+   ICurses.init_pair(1, ICurses::COLOR_BLACK, ICurses::COLOR_GREEN)
+   w.attron(ICurses.color_pair(1))
+   w.addstr("my term is has #{ICurses.COLORS}")
+   w.attroff(ICurses.color_pair(1))
+
+   # === Sugar === 
+   warn 'call: <<'
+   w << 'sugar'
+
+   loop do
+      sleep 0.1
+      warn 'call getch()'
+      c = w.getch
+      unless c
+         warn "empty getch"
+         next
+      end
+      warn "returned #{c} (#{c.ord})"
+      ch = c.chr rescue ''
+      w.addstr("#{ch}")
+      break if ch == ?q
+   end
+ensure
+   ICurses.endwin rescue puts $!
+end
+
+exit 0