ffi-efl 0.0.4 → 0.0.5

data/tasks/gem.rake

@@ -128,7 +128,6 @@ namespace :gem do
         end
         s.rdoc_options = PROJ.rdoc.opts + ['--main', PROJ.rdoc.main]
         s.extra_rdoc_files = rdoc_files
-        s.has_rdoc = true
 
         if test ?f, PROJ.test.file
             s.test_file = PROJ.test.file

data/tasks/helpers.rb

@@ -39,7 +39,7 @@ end
 # will be used.
 #
 def depend_on( name, version = nil )
-    spec = Gem.source_index.find_name(name).last
+    spec = Gem::Specification.find_by_name(name)
     version = spec.version.to_s if version.nil? and !spec.nil?
 
     PROJ.gem.dependencies << case version

data/test/test_edje.rb

@@ -1,35 +1,38 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eina'
-require 'efl/evas'
 require 'efl/ecore'
 require 'efl/ecore_evas'
 require 'efl/edje'
 #
-Efl::Eina::init
-Efl::Evas::init
-Efl::Ecore::init
 Efl::EcoreEvas::init
 Efl::Edje::init
 #
 WIDTH=320
 HEIGHT=240
+#
 EDC_FILE=File.join '/tmp','edje_test.edc'
 EDJE_FILE=File.join '/tmp','edje_test.edj'
 #
-if not File.exists? EDJE_FILE
-    File.open(EDC_FILE,'w') do |f| f << DATA.read end
-    system "edje_cc #{EDC_FILE}"
-end
+txt = ( ARGV.length>0 ? ARGV[0] : nil )
 #
+# compile edje_file
+puts "write #{EDC_FILE}"
+content = DATA.read
+File.open(EDC_FILE,'w') do |f| f << content end
+puts "compile #{EDJE_FILE}"
+system "edje_cc #{EDC_FILE}"
+#
+# load edje
 def create_my_group canvas, txt
-    #edje = edje_object_add(canvas);
     edje = canvas.edje_object_add
     if not edje.file_set EDJE_FILE, "my_group"
         puts "unable to open #{EDJE_FILE}"
         exit 1
     end
+    puts "file and group : #{edje.file_get.join ' ; ' }"
+    puts "key1 : #{Efl::Native.edje_file_data_get EDJE_FILE, "key1"}"
+    puts "key2 : #{Efl::Native.edje_object_data_get edje, "key2"}"
     edje.part_text_set "text", txt unless txt.nil?
     edje.move 0, 0
     edje.resize WIDTH, HEIGHT
@@ -37,12 +40,15 @@ def create_my_group canvas, txt
     edje
 end
 #
-txt = ( ARGV.length>0 ? ARGV[0] : nil )
+def del_cb ecore_evas
+    Efl::Ecore.main_loop_quit
+end
 #
 window = Efl::EcoreEvas::REcoreEvas.new { |w|
     w.resize WIDTH, HEIGHT
+    w.move 100, 100
 }
-#
+window.ecore_evas_callback_delete_request_set  method(:del_cb)
 canvas = window.get
 edje = create_my_group canvas, txt
 window.show
@@ -52,28 +58,33 @@ Efl::Ecore.main_loop_begin
 edje.free
 window.free
 #
+Efl::Edje::shutdown
+Efl::EcoreEvas::shutdown
 
 __END__
 
-// compile: edje_cc edje_example.edc
+data {
+    item: "key1" "val1";
+}
 collections {
    group {
-        name: "my_group"; // must be the same as in edje_example.c
+        name: "my_group";
+        data {
+            item: "key2" "val2";
+        }
         parts {
             part {
                 name: "background";
-                type: RECT; // plain boring rectangle
-                mouse_events: 0; // we don't need any mouse event on the background
-                // just one state "default"
+                type: RECT;
+                mouse_events: 0;
                 description {
-                    state: "default" 0.0; // must always exist
-                    color: 255 255 255 255; // white
-                    // define part coordinates:
-                    rel1 { // top-left point at (0, 0) [WIDTH * 0 + 0, HEIGHT * 0 + 0]
+                    state: "default" 0.0;
+                    color: 255 255 255 255;
+                    rel1 {
                         relative: 0.0 0.0;
                         offset: 0 0;
                     }
-                    rel2 { // bottom-right point at (WIDTH * 1.0 - 1, HEIGHT * 1.0 - 1)
+                    rel2 {
                         relative: 1.0 1.0;
                         offset: -1 -1;
                     }
@@ -82,56 +93,43 @@ collections {
             part {
                 name: "text";
                 type: TEXT;
-                mouse_events: 1; // we want to change the color on mouse-over
-                // 2 states, one "default" and another "over" to be used
-                // on mouse over effect
+                mouse_events: 1;
                 description {
                     state: "default" 0.0;
-                    color: 255 0 0 255; // red
-                    // define part coordinates:
-                    rel1 { // top-left at (WIDTH * 0.1 + 5, HEIGHT * 0.2 + 10)
+                    color: 255 0 0 255;
+                    rel1 {
                         relative: 0.1 0.2;
                         offset: 5 10;
                     }
-                    rel2 { // bottom-right at (WIDTH * 0.9 - 6, HEIGHT * 0.8 - 11)
+                    rel2 {
                         relative: 0.9 0.8;
                         offset: -6 -11;
                     }
-                    // define text specific state details
                     text {
-                        font: "Sans"; /* using fontconfig name! */
+                        font: "Sans";
                         size: 10;
                         text: "hello world";
                     }
                 }
                 description {
                     state: "over" 0.0;
-                    inherit: "default" 0.0; // copy everything from "default" at this point
-                    color: 0 255 0 255; // override color, now it is green
+                    inherit: "default" 0.0;
+                    color: 0 255 0 255;
                 }
             }
-            // do programs to change color on text mouse in/out (over)
             programs {
                 program {
-                    // what triggers this program:
                     signal: "mouse,in";
                     source: "text";
-                    // what this program does:
                     action: STATE_SET "over" 0.0;
                     target: "text";
-                    // do the state-set in a nice interpolation animation
-                    // using linear time in 0.1 second
                     transition: LINEAR 0.1;
                 }
                 program {
-                    // what triggers this program:
                     signal: "mouse,out";
                     source: "text";
-                    // what this program does:
                     action: STATE_SET "default" 0.0;
                     target: "text";
-                    // do the state-set in a nice interpolation animation
-                    // using linear time in 0.1 second
                     transition: LINEAR 0.1;
                 }
             }

data/test/test_evas.rb

@@ -2,6 +2,8 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/evas'
+require 'efl/eina_list'
+require 'efl/eina_rectangle'
 #
 include Efl
 #
@@ -19,28 +21,19 @@ def create_canvas w, h
     einfo[:info][:dest_buffer_row_bytes] = w * FFI::type_size(:int);
     einfo[:info][:use_color_key] = 0;
     einfo[:info][:alpha_threshold] = 0;
-    einfo[:info][:func][:new_update_region] = nil #FFI::Pointer::NULL;
-    einfo[:info][:func][:free_update_region] = nil #FFI::Pointer::NULL;
+    einfo[:info][:func][:new_update_region] = nil
+    einfo[:info][:func][:free_update_region] = nil
     e.engine_info_set einfo
     [e,pixels]
 end
 #
-def destroy_canvas c, pixels
-    pixels.free
-    c.free
-end
-#
 def draw_scene c
-    updates = c.render_updates
-    Evas.render_updates_free updates
-    # FIXME needs EinaRectangle
-#    require 'efl/eina/eina_list'
-#    updates = Eina::EinaList.new c.render_updates
-#    updates.each do |u|
-#        r = Eina::EinaRectangle.new u
-#        puts "UPDATED REGION: pos: #{r[:x]}, #{r[:y]}    size: #{r[:w]}x#{r[:h]}"
-#    end
-#    Evas::render_updates_free updates.ptr
+    updates = Efl::EinaList::REinaList.new c.render_updates
+    updates.each do |u|
+        r = Native::EinaRectangleStruct.new u
+        puts "UPDATED REGION: pos: #{r[:x]}, #{r[:y]}    size: #{r[:w]}x#{r[:h]}"
+    end
+    Evas::render_updates_free updates
 end
 #
 def save_scene canvas, dest
@@ -57,50 +50,68 @@ def save_scene canvas, dest
             f << a.pack("ccc")
             p = p+::FFI.type_size(:int)
         end
-
-#    for (; pixels < pixels_end; pixels++) {
-#        int r, g, b;
-#        r = ((*pixels) & 0xff0000) >> 16;
-#        g = ((*pixels) & 0x00ff00) >> 8;
-#        b = (*pixels) & 0x0000ff;
-#        fprintf(f, "%c%c%c", r, g, b);
-#    }
     end
     puts "saved scene as '#{dest}'"
 end
 #
 w = 320
 h = 240
+#
 canvas, pixels = create_canvas w, h
 #
-bg = Evas::REvasObject.new canvas.object_rectangle_add
-bg.color = 255, 255, 255, 255
-bg.move 0, 0
-bg.resize w, h
+bg = canvas.object_rectangle_add do |b|
+    b.color = 255, 255, 255, 255
+    b.move 0, 0
+    b.resize w, h
+end
 bg.show
 #
 draw_scene canvas
 #
-r1 = Evas::REvasObject.new canvas.object_rectangle_add
-r1.color = 255, 0, 0, 255
-r1.move 10, 10
-r1.resize 100, 100
+r1 = canvas.object_rectangle_add do |r|
+    r.color = 255, 0, 0, 255
+    r.move 10, 10
+    r.resize 100, 100
+end
 r1.show
 #
-r2 = Evas::REvasObject.new canvas.object_rectangle_add
-r2.color = 0, 128, 0, 128
-r2.move 10, 10
-r2.resize 50, 50
+r2 = canvas.object_rectangle_add do |r|
+    r.color = 0, 128, 0, 128
+    r.move 10, 10
+    r.resize 50, 50
+end
 r2.show
 #
-r3 = Evas::REvasObject.new canvas.object_rectangle_add
-r3.color = 0, 128, 0, 255
-r3.move 60, 60
-r3.resize 50, 50
+r3 = canvas.object_rectangle_add do |r|
+    r.color = 0, 128, 0, 255
+    r.move 60, 60
+    r.resize 50, 50
+end
 r3.show
 #
+l1 = canvas.object_line_add
+l1.xy = *(r2.center+r3.center)
+l1.show
+#
+p1 = canvas.object_polygon_add do |p|
+    p.color = 100, 128, 0, 100
+    p.<< w/2.0,10
+    p.<< w-10,h/2.0
+    p.<< w/2.0, h-10
+    p.<< 10, h/2.0
+end
+p1.show
+#
 draw_scene canvas
 save_scene canvas, '/tmp/ffi-efl-evas-buffer-simple-render.ppm'
-destroy_canvas canvas, pixels
+#
+r1.free
+r2.free
+r3.free
+l1.free
+p1.free
+bg.free
+canvas.free
+pixels.free
 #
 Evas::shutdown

metadata

@@ -2,7 +2,7 @@
 name: ffi-efl
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors: 
 - "J\xC3\xA9r\xC3\xA9my Zurcher"
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-05 00:00:00 +02:00
-default_executable: 
+date: 2011-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi
@@ -69,6 +68,7 @@ files:
 - lib/efl/eina.rb
 - lib/efl/eina_hash.rb
 - lib/efl/eina_list.rb
+- lib/efl/eina_rectangle.rb
 - lib/efl/elementary.rb
 - lib/efl/evas.rb
 - lib/efl/ffi.rb
@@ -113,7 +113,6 @@ files:
 - test/test_elm_win-native.rb
 - test/test_elm_win_class.rb
 - test/test_evas.rb
-has_rdoc: true
 homepage: https://github.com/jeremyz/ffi-efl
 licenses: []
 
@@ -140,7 +139,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: ffi-efl
-rubygems_version: 1.5.2
+rubygems_version: 1.8.1
 signing_key: 
 specification_version: 3
 summary: A ruby-ffi binding to efl libraries (Enlightenment Foundation Libraries)