gtk2svg 0.3.13 → 0.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4bb4de4b329fb0da55300bc50d5806a23ef80b87
-  data.tar.gz: 61b9b466f9c9fa60b8c7f007c26a975d277a0c29
+  metadata.gz: 4b8368ad2e5d99ac4c5ae77f7ead08f89fc42314
+  data.tar.gz: a0b4d5f3ecd99a276bbbfe551b0eead008c94840
 SHA512:
-  metadata.gz: cb76dd3f49ca0b679d9b79c0088e4d825aaff24c083520c6cdd7ea52ef28781fc55632becb14ed623bfdd4749593455198d808dc3c88106d6cd60b0da6a31dce
-  data.tar.gz: 0e95bd26fef66d1f073fc2e594663a86abef4d91ddcc52acc7760cfb28c65fcd6525ad3564c35c6327dd0bf57f03f50109d2cfe6ee5173a93f62d4660c8203cc
+  metadata.gz: 3f36401546b06f5234a39f62f6e4ca8022a32f3f195a607edd0c751bd56ee00cfedc295be1e0dafc7ac7a1f26a8bd26d92f82cee4d55b891a8957426a58e0eb9
+  data.tar.gz: 06667bdf893efce388aca9bc55b124f4cb09ab09a8b6b15bb21a5ebb012390467aec3256aea8619f3d60c94346be2341e276594877b40d237cf08dd8f403fd19

data/lib/gtk2svg.rb

@@ -9,7 +9,6 @@ require 'svgle'
 # Description: Experimental gem to render SVG within a GTK2 application. 
 
 
-
 module Gtk2SVG
 
   class Render < DomRender
@@ -46,6 +45,17 @@ module Gtk2SVG
       x1, y1, x2, y2 = %i(x1 y1 x2 y2).map{|x| attributes[x].to_i }
 
       [:draw_line, [x1, y1, x2, y2], style, render_all(e)]
+    end   
+    
+    def image(e, attributes, raw_style)
+
+      style = style_filter(attributes).merge(raw_style)
+      h = attributes
+
+      x, y, width, height = %i(x y width height).map{|x| h[x] ? h[x].to_i : nil }
+      src = h[:'xlink:href']
+
+      [:draw_image, [x, y, width, height], src, style, render_all(e)]
     end    
 
     def polygon(e, attributes, raw_style)
@@ -119,9 +129,10 @@ module Gtk2SVG
     attr_accessor :area
 
 
-    def initialize(area=nil)
+    def initialize(area=nil, window=nil)
 
-      @area = area if area
+      @area = area
+      @window = window
 
     end
     
@@ -135,6 +146,25 @@ module Gtk2SVG
       @area.window.draw_arc(gc, 1, x, y, width, height, 0, 64 * 360)
     end    
     
+    def draw_image(args)
+
+      dimensions, src, style = args
+
+      x, y, width, height = dimensions
+
+      gc = gc_ini(fill: style[:fill] || :none)
+      img = GdkPixbuf::Pixbuf.new(file: src)
+      
+      x ||= 0
+      y ||= 0
+      width ||= img.width
+      height ||= img.height
+      
+      @area.window.draw_pixbuf(gc, img, 0, 0, x, y, width, height, 
+                               Gdk::RGB::DITHER_NONE, 0, 0)
+
+    end      
+    
     def draw_line(args)
 
       coords, style = args
@@ -167,6 +197,7 @@ module Gtk2SVG
                                     Gdk::GC::CAP_NOT_LAST, Gdk::GC::JOIN_MITER)
       @area.window.draw_lines(gc, points)
     end      
+     
 
     def draw_rectangle(args)
 
@@ -271,8 +302,18 @@ module Gtk2SVG
       
       @svg = svg
       @doc = Svgle.new(svg, callback: self)
-      
+
       @area = area = Gtk::DrawingArea.new
+      
+      doc = @doc
+      
+      def @doc.element_by_id(id)
+        self.root.element("//*[@id='#{id}']")
+      end            
+      
+
+      
+
       client_code = []
       
       window = Gtk::Window.new
@@ -284,8 +325,13 @@ module Gtk2SVG
       
       @dirty = true
       
-      area.signal_connect("expose_event") do      
+      @doc.root.xpath('//script').each {|x| eval x.text.unescape }
 
+      x1 = 150      
+      
+      area.signal_connect("expose_event") do      
+        y1 = 30; x2 = 200; y2 = 70
+          area.window.draw_rectangle(area.style.fg_gc(area.state), 1, x1, y1, x2, y2)
         if @dirty then
           
           Thread.new { @doc.root.xpath('//script').each {|x| eval x.text.unescape } }
@@ -322,6 +368,20 @@ module Gtk2SVG
       end      
       
       window.add(area).show_all
+
+      Thread.new do
+        @doc.root.xpath('//*[@onload]').each do |x|
+                    
+          eval x.onload()
+          
+        end
+      end
+      
+      #Thread.new do
+      #  3.times { x1 -= 1; @area.queue_draw; sleep 0.1}
+      #end
+      sleep 0.01
+      #@area.queue_draw; sleep 0.01
       window.show_all.signal_connect("destroy"){Gtk.main_quit}
 
       irb ? Thread.new {Gtk.main  } : Gtk.main
@@ -329,18 +389,22 @@ module Gtk2SVG
     
     def onmousemove(x,y)
       
-    end
-    
-    def refresh()
-      @dirty = true
-      @area.queue_draw
-    end
+    end    
     
     def svg=(svg)
       @svg = svg
       @doc = Svgle.new(svg, callback: self)
     end
     
+    def timeout(duration, loopx=true)
+      
+      GLib::Timeout.add(duration) do 
+        yield
+        loopx
+      end
+
+    end
+    
   end
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.13
+  version: 0.3.14
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   S+VWAhfVm13yzrA556/5JtfZb/HMd97bm5U2ypMzi+hn2PRRxQ32RY58lYUVpxhE
   QK5w9QJyQ1G9ag==
   -----END CERTIFICATE-----
-date: 2016-12-05 00:00:00.000000000 Z
+date: 2017-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2
@@ -94,7 +94,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.4.0
 description: 
-email: james@r0bertson.co.uk
+email: james@jamesrobertson.eu
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Renders SVG using GTK2