ruco 0.0.12 → 0.0.13

data/Rakefile

@@ -1,3 +1,5 @@
+# encoding: UTF-8
+
 task :default => :spec
 require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |t|
@@ -20,18 +22,18 @@ end
 task :key do
   require 'curses'
 
-  Curses.cbreak # provide unbuffered input
-  Curses.noecho # turn off input echoing
+  Curses.noecho # do not show typed chars
   Curses.nonl # turn off newline translation
-  Curses.stdscr.keypad(true) # turn on keypad mode
-#  Curses.stdscr.nodelay = 1
+  Curses.stdscr.keypad(true) # enable arrow keys
+  Curses.raw # give us all other keys
+  Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
+  Curses.init_screen
 
-  
   count = 0
   loop do
-    key = Curses.getch
-    next if key == 4294967295 # placeholder key when using nodelay mode
-    break if key == ?\C-c
+    key = Curses.getch || 4294967295
+    next if key == 4294967295
+    exit if key == 3 # Ctrl+c
     count = (count + 1) % 20
     Curses.setpos(count,0)
     Curses.addstr("#{key.inspect}     ");

data/Readme.md

@@ -59,6 +59,8 @@ TODO
  - indentation + paste support
  - warnings / messages
  - syntax highlighting
+ - support more key-combos/codes in keyboard.rb
+ - search & replace
 
 Author
 ======

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/bin/ruco

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# encoding: UTF-8
 require 'curses'
 require 'optparse'
 $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
@@ -38,11 +39,12 @@ def write(line,row,text)
 end
 
 def init_screen
-  Curses.init_screen
   Curses.noecho # do not show typed chars
   Curses.nonl # turn off newline translation
   Curses.stdscr.keypad(true) # enable arrow keys
   Curses.raw # give us all other keys
+  Curses.stdscr.nodelay = 1 # do not block -> we can use timeouts
+  Curses.init_screen
 
   begin
     yield
@@ -86,6 +88,10 @@ def debug_key(key)
   write(@key_line, 0, "#{key}---")
 end
 
+def log(stuff)
+  File.open('ruco.log','a'){|f| f.puts stuff }
+end
+
 @options = parse_options
 
 require 'ruco'

data/lib/ruco/application.rb

@@ -51,7 +51,7 @@ module Ruco
         @focused.reset
         @focused = editor
       else
-        @focused.insert(key)
+        @focused.insert(key) if key.is_a?(String)
       end
     end
 

data/lib/ruco/core_ext/string.rb

@@ -20,4 +20,11 @@ class String
     end
     offset
   end
+
+  # stub for 1.8
+  unless method_defined?(:force_encoding)
+    def force_encoding(encoding)
+      self
+    end
+  end
 end

data/lib/ruco/keyboard.rb

@@ -1,9 +1,25 @@
 class Keyboard
+  SEQUENCE_TIMEOUT = 0.01
+  NOTHING = 4294967295 # getch returns this as 'nothing' on 1.8 but nil on 1.9.2
   A_TO_Z = ('a'..'z').to_a
 
   def self.listen
     loop do
-      key = Curses.getch
+      key = Curses.getch || NOTHING
+
+      if @sequence
+        if sequence_finished?
+          yield @sequence.pack('c*').force_encoding('utf-8')
+          @sequence = nil
+        else
+          @sequence << key unless key == NOTHING
+        end
+        next
+      end
+
+      next if key == NOTHING
+      log(key)
+
 
       code = case key
 
@@ -12,10 +28,18 @@ class Keyboard
       when Curses::Key::DOWN then :down
       when Curses::Key::RIGHT then :right
       when Curses::Key::LEFT then :left
+      when 554 then :"Ctrl+right"
+      when 555 then :"Ctrl+Shift+right"
+      when 539 then :"Ctrl+left"
+      when 540 then :"Ctrl+Shift+left"
+      when 560 then :"Ctrl+up"
+      when 519 then :"Ctrl+down"
       when Curses::KEY_END then :end
       when Curses::KEY_HOME then :home
       when Curses::KEY_NPAGE then :page_down
       when Curses::KEY_PPAGE then :page_up
+      when Curses::KEY_IC then :insert
+      when Curses::KEY_F0..Curses::KEY_F63 then :"F#{key - Curses::KEY_F0}"
 
       # modify
       when 9 then :tab
@@ -27,11 +51,21 @@ class Keyboard
       when 0 then :"Ctrl+space"
       when 1..26 then :"Ctrl+#{A_TO_Z[key-1]}"
       when 27 then :escape
+      when 195..197 # start of unicode sequence
+        @sequence = [key]
+        @sequence_started = Time.now.to_f
+        next
       else
-        key.chr # printable
+        key > 255 ? key : key.chr # output printable chars
       end
 
       yield code
     end
   end
+
+  private
+
+  def self.sequence_finished?
+    (Time.now.to_f - @sequence_started) > SEQUENCE_TIMEOUT
+  end
 end

data/ruco.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ruco}
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Michael Grosser"]

data/spec/ruco/application_spec.rb

@@ -28,6 +28,11 @@ describe Ruco::Application do
     app.view.should == "#{status.sub('.txt ','.txt*')}22\n2\n\n#{command}"
   end
 
+  it "does not enter key-codes" do
+    app.key(888)
+    app.view.should == "#{status}\n\n\n#{command}"
+  end
+
   it "can execute a command" do
     write("123\n456\n789\n")
     app.key(:"Ctrl+g") # go to line

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruco
 version: !ruby/object:Gem::Version 
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 0
-  - 12
-  version: 0.0.12
+  - 13
+  version: 0.0.13
 platform: ruby
 authors: 
 - Michael Grosser
@@ -71,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -363384083
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -80,6 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"