diff options
| -rw-r--r-- | lib/efl/ecore.rb | 12 | ||||
| -rw-r--r-- | lib/efl/ecore_evas.rb (renamed from lib/efl/ecore/ecore_evas.rb) | 7 | ||||
| -rw-r--r-- | lib/efl/ecore_getopt.rb (renamed from lib/efl/ecore/ecore_getopt.rb) | 119 | ||||
| -rw-r--r-- | lib/efl/ecore_input.rb (renamed from lib/efl/ecore/ecore_input.rb) | 7 | ||||
| -rw-r--r-- | lib/efl/edje.rb | 2 | ||||
| -rw-r--r-- | spec/ecore_evas_spec.rb (renamed from spec/ecore/ecore_evas_spec.rb) | 2 | ||||
| -rw-r--r-- | spec/ecore_getopt_spec.rb (renamed from spec/ecore/ecore_getopt_spec.rb) | 5 | ||||
| -rw-r--r-- | spec/ecore_input_spec.rb (renamed from spec/ecore/ecore_input_spec.rb) | 2 | ||||
| -rw-r--r-- | spec/ecore_spec.rb | 2 |
9 files changed, 80 insertions, 78 deletions
diff --git a/lib/efl/ecore.rb b/lib/efl/ecore.rb index 0e7d88b..b4d8aaa 100644 --- a/lib/efl/ecore.rb +++ b/lib/efl/ecore.rb @@ -15,15 +15,15 @@ module Efl EVENT_SIGNAL_REALTIME = 5 # Realtime signal event EVENT_COUNT = 6 # - class EcorePipe + class REcorePipe def initialize cb, data - @ptr = Efl::FFI.ecore_pipe_add cb, data + @ptr = Efl::Ecore.ecore_pipe_add cb, data end - def del; Efl::FFI.ecore_pipe_del @ptr; end - def read_close; Efl::FFI.ecore_pipe_read_close @ptr; end - def write_close; Efl::FFI.ecore_pipe_write_close @ptr; end + def del; Efl::Ecore.ecore_pipe_del @ptr; end + def read_close; Efl::Ecore.ecore_pipe_read_close @ptr; end + def write_close; Efl::Ecore.ecore_pipe_write_close @ptr; end def write data - Efl::FFI.ecore_pipe_write @ptr, ::FFI::MemoryPointer.from_string(data.to_s), data.to_s.length+1 + Efl::Ecore.ecore_pipe_write @ptr, FFI::MemoryPointer.from_string(data.to_s), data.to_s.length+1 end # end diff --git a/lib/efl/ecore/ecore_evas.rb b/lib/efl/ecore_evas.rb index 32b4d4e..46aa706 100644 --- a/lib/efl/ecore/ecore_evas.rb +++ b/lib/efl/ecore_evas.rb @@ -1,13 +1,14 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ffi/ecore/ecore_evas' +require 'efl/ffi/ecore_evas' # module Efl - module EcoreEvas - # # + module EcoreEvas + # end + # end # # EOF diff --git a/lib/efl/ecore/ecore_getopt.rb b/lib/efl/ecore_getopt.rb index be4a958..3b98eeb 100644 --- a/lib/efl/ecore/ecore_getopt.rb +++ b/lib/efl/ecore_getopt.rb @@ -1,12 +1,13 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ffi/ecore/ecore_getopt' +require 'efl/ffi/ecore_getopt' # module Efl - module FFI + # + module EcoreGetopt # - class EcoreGetoptValue < ::FFI::Union + class Value < FFI::Union layout :strp, :pointer, :boolp, :eina_bool_p, :shortp, :short_p, @@ -20,7 +21,7 @@ module Efl :ptrp, :void_p, end # - class EcoreGetoptDescStoreDef < ::FFI::Union + class DescStoreDef < FFI::Union layout :strv, :pointer, :boolv, :uchar, :shortv, :short, @@ -32,40 +33,40 @@ module Efl :doublev, :double, end # - class EcoreGetoptDescStore < ::FFI::Struct + class DescStore < FFI::Struct layout :type, :ecore_getopt_type, # enum :arg_req, :ecore_getopt_desc_arg_requirement, # enum - :def, EcoreGetoptDescStoreDef, + :def, DescStoreDef, end # callback :ecore_getopt_desc_cb, [:ecore_getopt_p, :ecore_getopt_desc_p, :string, :pointer, :ecore_getopt_value_p ], :eina_bool # - class EcoreGetoptDescCallback < ::FFI::Struct + class DescCallback < FFI::Struct layout :func, :ecore_getopt_desc_cb, :data, :pointer, :arg_req, :ecore_getopt_desc_arg_requirement, # enum :def, :pointer, end # - class EcoreActionParam < ::FFI::Union - layout :store, EcoreGetoptDescStore, + class ActionParam < FFI::Union + layout :store, DescStore, :store_const, :pointer, :choices, :pointer, :append_type, :ecore_getopt_type, # enum - :callback, EcoreGetoptDescCallback, + :callback, DescCallback, :dummy, :pointer, end # - class EcoreGetoptDesc < ::FFI::Struct + class Desc < FFI::Struct layout :shortname, :char, :longname, :pointer, :help, :pointer, :metavar, :pointer, :action, :ecore_getopt_action, # enum - :action_param, EcoreActionParam, + :action_param, ActionParam, end # - class EcoreGetopt < ::FFI::Struct + class EcoreGetopt < FFI::Struct layout :prog, :pointer, :usage, :pointer, :version, :pointer, @@ -76,27 +77,25 @@ module Efl # :descs, :pointer, # NULL terminated EcoreGetopt_Desc[] def desc_ptr idx - EcoreGetoptDesc.new to_ptr+Efl::FFI::EcoreGetopt.size+(idx*Efl::FFI::EcoreGetoptDesc.size) + Efl::EcoreGetopt::Desc.new to_ptr+Efl::EcoreGetopt::EcoreGetopt.size+(idx*Efl::EcoreGetopt::Desc.size) end end # - end - # - module EcoreGetopt - class Parser + class REcoreGetopt def initialize desc + @ecore_getopt = nil @desc = desc @options = [ - [ 0, ::FFI::Pointer::NULL, ::FFI::Pointer::NULL, ::FFI::Pointer::NULL, 0, {:dummy=>::FFI::Pointer::NULL} ] + [ 0, FFI::Pointer::NULL, FFI::Pointer::NULL, FFI::Pointer::NULL, 0, {:dummy=>FFI::Pointer::NULL} ] ] @values = [ - [ :ptrp, ::FFI::Pointer::NULL ] + [ :ptrp, FFI::Pointer::NULL ] ] - @refs = [] # to prevent ::FFI::MemoryPointer.from_string from beeing GC'ed + @refs = [] # to prevent FFI::MemoryPointer.from_string from beeing GC'ed end def p_from_string r - return r if r==::FFI::Pointer::NULL - p = ::FFI::MemoryPointer.from_string r + return r if r==FFI::Pointer::NULL + p = FFI::MemoryPointer.from_string r @refs << p p end @@ -107,16 +106,16 @@ module Efl @values.insert -2, [ type, ptr ] end def to_ptr - @parser_p.to_ptr + @ecore_getopt.to_ptr end def create - @parser_p = Efl::FFI::EcoreGetopt.new ::FFI::MemoryPointer.new (Efl::FFI::EcoreGetopt.size+Efl::FFI::EcoreGetoptDesc.size*@options.length), 1 + @ecore_getopt = Efl::EcoreGetopt::EcoreGetopt.new FFI::MemoryPointer.new (Efl::EcoreGetopt::EcoreGetopt.size+Efl::EcoreGetopt::Desc.size*@options.length), 1 [:prog,:usage,:version,:copyright,:license,:description].each do |sym| - @parser_p[sym] = ( @desc.has_key?(sym) ? ::FFI::MemoryPointer.from_string(@desc[sym]) : ::FFI::Pointer::NULL ) + @ecore_getopt[sym] = ( @desc.has_key?(sym) ? FFI::MemoryPointer.from_string(@desc[sym]) : FFI::Pointer::NULL ) end - @parser_p[:strict] = @desc[:strict] if @desc.has_key? :strict + @ecore_getopt[:strict] = @desc[:strict] if @desc.has_key? :strict @options.each_with_index do |o,i| - d = @parser_p.desc_ptr i + d = @ecore_getopt.desc_ptr i d[:shortname] = o[0].ord d[:longname] = p_from_string o[1] d[:help] = p_from_string o[2] @@ -150,27 +149,27 @@ module Efl when :append d[:action_param][:append_type] = v else - d[:action_param][:dummy] = ::FFI::Pointer::NULL + d[:action_param][:dummy] = FFI::Pointer::NULL end end - @values_p = ::FFI::MemoryPointer.new Efl::FFI::EcoreGetoptValue, @values.length, false + @values_p = FFI::MemoryPointer.new Efl::EcoreGetopt::Value, @values.length, false @values.each_with_index do |v,i| - Efl::FFI::EcoreGetoptValue.new(@values_p+(i*Efl::FFI::EcoreGetoptValue.size))[v[0]] = v[1] + Efl::EcoreGetopt::Value.new(@values_p+(i*Efl::EcoreGetopt::Value.size))[v[0]] = v[1] end end def parse argv - ptr = ::FFI::MemoryPointer.new(:pointer, argv.length+1) + ptr = FFI::MemoryPointer.new(:pointer, argv.length+1) argv.each_with_index do |s, i| ptr[i].put_pointer 0, p_from_string(s) end - ptr[argv.length].put_pointer 0, ::FFI::Pointer::NULL - Efl::EcoreGetopt.parse @parser_p, @values_p, argv.length, ptr + ptr[argv.length].put_pointer 0, FFI::Pointer::NULL + Efl::EcoreGetopt.ecore_getopt_parse @ecore_getopt, @values_p, argv.length, ptr end def store_full short, long, help, meta, type, arg_req, def_val self << [ short, long, help, meta, :ecore_getopt_action_store, [:store, [type,arg_req, def_val] ] ] end def store short, long, help, type - store_full short, long, help, ::FFI::Pointer::NULL, type, :ecore_getopt_desc_arg_requirement_yes, nil + store_full short, long, help, FFI::Pointer::NULL, type, :ecore_getopt_desc_arg_requirement_yes, nil end def store_type type, short, long, help store short, long, help, ('ecore_getopt_type_'+type.to_s).to_sym @@ -182,7 +181,7 @@ module Efl store_metavar short, long, help, meta, ('ecore_getopt_type_'+type.to_s).to_sym end def store_def short, long, help, type, def_val - store_full short, long, help, ::FFI::Pointer::NULL, type, :ecore_getopt_desc_arg_requirement_optional, def_val + store_full short, long, help, FFI::Pointer::NULL, type, :ecore_getopt_desc_arg_requirement_optional, def_val end def store_def_type type, short, long, help, def_val store_def short, long, help, ('ecore_getopt_type_'+type.to_s).to_sym, [ (type.to_s+'v').to_sym, def_val ] @@ -191,79 +190,79 @@ module Efl store_full short, long, help, meta, ('ecore_getopt_type_'+type.to_s).to_sym, arg_req, [ (type.to_s+'v').to_sym, def_val ] end def store_const short, long, help, value - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_store_const, [:store_const, value] ] + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_store_const, [:store_const, value] ] end def store_true short, long, help - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_store_true, [:dummy,::FFI::MemoryPointer::NULL] ] + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_store_true, [:dummy,FFI::MemoryPointer::NULL] ] end def store_false short, long, help - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_store_false, [:dummy,::FFI::MemoryPointer::NULL] ] + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_store_false, [:dummy,FFI::MemoryPointer::NULL] ] end def choice short, long, help, choices - ptr = ::FFI::MemoryPointer.new(:pointer, choices.length+1) + ptr = FFI::MemoryPointer.new(:pointer, choices.length+1) choices.each_with_index do |s, i| ptr[i].put_pointer 0, p_from_string(s) end - ptr[choices.length].put_pointer 0, ::FFI::Pointer::NULL - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_choice, [:choices,ptr] ] + ptr[choices.length].put_pointer 0, FFI::Pointer::NULL + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_choice, [:choices,ptr] ] end def choice_metavar short, long, help, meta, choices - ptr = ::FFI::MemoryPointer.new(:pointer, choices.length+1) + ptr = FFI::MemoryPointer.new(:pointer, choices.length+1) choices.each_with_index do |s, i| ptr[i].put_pointer 0, p_from_string(s) end - ptr[choices.length].put_pointer 0, ::FFI::Pointer::NULL + ptr[choices.length].put_pointer 0, FFI::Pointer::NULL self << [ short, long, help, meta, :ecore_getopt_action_choice, [:choices,ptr] ] end def append short, long, help, sub_type - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_append, [:append,sub_type] ] + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_append, [:append,sub_type] ] end def append_metavar short, long, help, meta, sub_type self << [ short, long, help, meta, :ecore_getopt_action_append, [:append,sub_type] ] end def count short, long, help - self << [ short, long, help, ::FFI::Pointer::NULL, :ecore_getopt_action_count, [:dummy,::FFI::Pointer::NULL] ] + self << [ short, long, help, FFI::Pointer::NULL, :ecore_getopt_action_count, [:dummy,FFI::Pointer::NULL] ] end def callback_full short, long, help, meta, cb, data, arg_req, def_val self << [ short, long, help, meta, :ecore_getopt_action_callback, [:callback, [cb, data, arg_req,def_val] ] ] end def callback_noargs short, long, help, cb, data - callback_full short, long, help, ::FFI::Pointer::NULL, cb, data, :ecore_getopt_desc_arg_requirement_no, ::FFI::Pointer::NULL + callback_full short, long, help, FFI::Pointer::NULL, cb, data, :ecore_getopt_desc_arg_requirement_no, FFI::Pointer::NULL end def callback_args short, long, help, meta, cb, data - callback_full short, long, help, meta, cb, data, :ecore_getopt_desc_arg_requirement_yes, ::FFI::Pointer::NULL + callback_full short, long, help, meta, cb, data, :ecore_getopt_desc_arg_requirement_yes, FFI::Pointer::NULL end def help short, long - self << [ short, long, 'show this message.', ::FFI::Pointer::NULL, :ecore_getopt_action_help, [:dummy,::FFI::Pointer::NULL] ] + self << [ short, long, 'show this message.', FFI::Pointer::NULL, :ecore_getopt_action_help, [:dummy,FFI::Pointer::NULL] ] end def version short, long - self << [ short, long, 'show program version.', ::FFI::Pointer::NULL, :ecore_getopt_action_version, [:dummy,::FFI::Pointer::NULL] ] + self << [ short, long, 'show program version.', FFI::Pointer::NULL, :ecore_getopt_action_version, [:dummy,FFI::Pointer::NULL] ] end def copyright short, long - self << [ short, long, 'show copyright.', ::FFI::Pointer::NULL, :ecore_getopt_action_copyright, [:dummy,::FFI::Pointer::NULL] ] + self << [ short, long, 'show copyright.', FFI::Pointer::NULL, :ecore_getopt_action_copyright, [:dummy,FFI::Pointer::NULL] ] end def license short, long - self << [ short, long, 'show license.', ::FFI::Pointer::NULL, :ecore_getopt_action_license, [:dummy,::FFI::Pointer::NULL] ] + self << [ short, long, 'show license.', FFI::Pointer::NULL, :ecore_getopt_action_license, [:dummy,FFI::Pointer::NULL] ] end # def sentinel -# self << [ 0, ::FFI::Pointer::NULL, ::FFI::Pointer::NULL, ::FFI::Pointer::NULL, 0, {:dummy=>::FFI::Pointer::NULL} ] +# self << [ 0, FFI::Pointer::NULL, FFI::Pointer::NULL, FFI::Pointer::NULL, 0, {:dummy=>FFI::Pointer::NULL} ] # end # def debug r = '' - r << "#{self.class} : #{@parser_p.to_ptr}\n" + r << "#{self.class} : #{@ecore_getopt.to_ptr}\n" [:prog,:usage,:version,:copyright,:license,:description].each do |sym| - r<< " #{sym.to_s} : #{@parser_p[sym]==FFI::Pointer::NULL ? 'NULL' : @parser_p[sym].read_string}\n" + r<< " #{sym.to_s} : #{@ecore_getopt[sym]==FFI::Pointer::NULL ? 'NULL' : @ecore_getopt[sym].read_string}\n" end - r << " strict : #{@parser_p[:strict]}\n" + r << " strict : #{@ecore_getopt[:strict]}\n" i=0 while true - d = @parser_p.desc_ptr i - break if d[:shortname]==0 and d[:longname] == ::FFI::Pointer::NULL + d = @ecore_getopt.desc_ptr i + break if d[:shortname]==0 and d[:longname] == FFI::Pointer::NULL r << " desc #{d.to_ptr}\n" r << " short: #{d[:shortname].chr}\n" unless d[:shortname]==0 - r << " long: #{d[:longname].read_string}\n" unless d[:longname]==::FFI::Pointer::NULL - r << " help: #{d[:help].read_string}\n" unless d[:help]==::FFI::Pointer::NULL + r << " long: #{d[:longname].read_string}\n" unless d[:longname]==FFI::Pointer::NULL + r << " help: #{d[:help].read_string}\n" unless d[:help]==FFI::Pointer::NULL i+=1 end r diff --git a/lib/efl/ecore/ecore_input.rb b/lib/efl/ecore_input.rb index b7f579d..48cf8e9 100644 --- a/lib/efl/ecore/ecore_input.rb +++ b/lib/efl/ecore_input.rb @@ -1,13 +1,14 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ffi/ecore/ecore_input' +require 'efl/ffi/ecore_input' # module Efl - module EcoreInput - # # + module EcoreInput + # end + # end # # EOF diff --git a/lib/efl/edje.rb b/lib/efl/edje.rb index cee5f8e..cd062ff 100644 --- a/lib/efl/edje.rb +++ b/lib/efl/edje.rb @@ -4,9 +4,11 @@ require 'efl/ffi/edje' # module Efl + # module Edje # end + # end # # EOF diff --git a/spec/ecore/ecore_evas_spec.rb b/spec/ecore_evas_spec.rb index c380613..c4d2275 100644 --- a/spec/ecore/ecore_evas_spec.rb +++ b/spec/ecore_evas_spec.rb @@ -1,7 +1,7 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ecore/ecore_evas' +require 'efl/ecore_evas' # describe Efl::EcoreEvas do # diff --git a/spec/ecore/ecore_getopt_spec.rb b/spec/ecore_getopt_spec.rb index 155362e..7e6e5d9 100644 --- a/spec/ecore/ecore_getopt_spec.rb +++ b/spec/ecore_getopt_spec.rb @@ -1,15 +1,14 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ecore' -require 'efl/ecore/ecore_getopt' +require 'efl/ecore_getopt' # describe Efl::EcoreGetopt do # before(:all) do Efl::Ecore.init # - @p = Efl::EcoreGetopt::Parser.new :prog =>"Prog", :usage => "Usage", :version => "0.0.0", :copyright => "less", :license => "MIT", :description => "description", :strict => 1 + @p = Efl::EcoreGetopt::REcoreGetopt.new :prog =>"Prog", :usage => "Usage", :version => "0.0.0", :copyright => "less", :license => "MIT", :description => "description", :strict => 1 @callback = Proc.new do |parser, desc, string, data, value| parser.address.should eql @p.to_ptr.address string.should eql "my_data" diff --git a/spec/ecore/ecore_input_spec.rb b/spec/ecore_input_spec.rb index 041f422..095d11a 100644 --- a/spec/ecore/ecore_input_spec.rb +++ b/spec/ecore_input_spec.rb @@ -1,7 +1,7 @@ #! /usr/bin/env ruby # -*- coding: UTF-8 -*- # -require 'efl/ecore/ecore_input' +require 'efl/ecore_input' # describe Efl::EcoreInput do # diff --git a/spec/ecore_spec.rb b/spec/ecore_spec.rb index 3fcf6fb..fb68c37 100644 --- a/spec/ecore_spec.rb +++ b/spec/ecore_spec.rb @@ -50,7 +50,7 @@ describe Efl::Ecore do bytes.should eql 12 end Ecore.init - pipe = Ecore::EcorePipe.new cb, data + pipe = Ecore::REcorePipe.new cb, data pipe.write("hello world").should be_true Ecore.main_loop_iterate pipe.read_close |