gtk2svg 0.3.5 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccfe25fe699cb9ee62a6052c6512f9891b917fad
-  data.tar.gz: 038eb2d824b87dd9a6fe60b115cb402a121c77b8
+  metadata.gz: baf3f4e66c486dd4add79ab6ba11251f89719e2e
+  data.tar.gz: a3e8456c3f352399c71c1042fe1609f4b14893f8
 SHA512:
-  metadata.gz: bb71e6657fc4ed46441d8cab2f137607208cc9cfb465757fefe6d149d9cfc20e558527601563dcdf1e832ac02d11f4cb45e90c26d5ffe0607b8242c1593af313
-  data.tar.gz: a540fd61abe55be7dc3a7e293ab9cba2860022e9c2b4710ecb06ef75356b80570b5c84bcffbc5c9324148476ad134e0464b7313a8199be1196787705f93c7dd2
+  metadata.gz: e61d1ff7313ef58af73bee4d69a4f770c25150342c677a83dc03092b7faa4c0da2beceafccbd4215f020a77036abe87b1fe11be7bbc5b252880540195559697d
+  data.tar.gz: 480ef78d9cb337c5ffaa21a6179f598ccb7675ee27295bfbb5f4b84490d9167992e9a29a6805b0656650664e4b52f2bfbd759a657fe5effdf9564dae056b003d

data/lib/gtk2svg.rb

@@ -164,17 +164,17 @@ module Gtk2SVG
 
     end
 
-    def set_colour(fill)
+    def set_colour(c)
 
-      colour = case fill
+      colour = case c
       when /^rgb/
         regex = /rgb\((\d{1,3}), *(\d{1,3}), *(\d{1,3})\)$/
-        r, g, b = fill.match(regex).captures.map {|x| x.to_i * 257}
+        r, g, b = c.match(regex).captures.map {|x| x.to_i * 257}
         colour = Gdk::Color.new(r, g, b)
       when /^#/
-          Gdk::Color.parse(fill)
+          Gdk::Color.parse(c)
       else
-          Gdk::Color.parse(fill)
+          Gdk::Color.parse(c)
       end
       
       colormap = Gdk::Colormap.system
@@ -199,7 +199,7 @@ module Gtk2SVG
     attr_accessor :doc, :svg
     attr_reader :width, :height
     
-    def initialize(svg)
+    def initialize(svg, irb: false)
       
       @svg = svg
       @doc = Svgle.new(svg, callback: self)
@@ -207,14 +207,22 @@ module Gtk2SVG
       client_code = []
       
       window = Gtk::Window.new
-      width, height = %i(width height).map{|x| @doc.root.attributes[x] }
+      @width, @height = %i(width height).map{|x| @doc.root.attributes[x].to_i }
       
-      if width and height then
-        @width, @height = width.to_i, height.to_i
+      if @width and @height then
         window.set_default_size(@width, @height)
       end
       
       area.signal_connect("expose_event") do      
+
+        Thread.new do
+          
+          @doc.root.each_recursive do |x|          
+            eval x.text.unescape if x.name == 'script'
+          end
+          
+        end
+        
         a = Render.new(@doc).to_a
         drawing = DrawingInstructions.new area
         drawing.render a
@@ -225,21 +233,34 @@ module Gtk2SVG
       area.signal_connect('motion_notify_event') do |item,  event|
 
         @doc.root.each_recursive do |x|
-          
-          eval x.text.unescape if x.name == 'script'
-          
+                    
           if x.attributes[:onmousemove] and x.hotspot? event.x, event.y then
             #onmousemove(event.x,event.y)
             eval x.onmousemove()
           end
           
         end
+      end
+
+      area.add_events(Gdk::Event::BUTTON_PRESS_MASK) 
+
+      area.signal_connect "button_press_event" do |item,event| 
+
+        @doc.root.each_recursive do |x|
+                    
+          if x.attributes[:onmousedown] and x.hotspot? event.x, event.y then
+
+            eval x.onmousedown()
+            
+          end
+          
+        end        
       end      
       
       window.add(area).show_all
       window.show_all.signal_connect("destroy"){Gtk.main_quit}
 
-      Thread.new {Gtk.main  }
+      irb ? Thread.new {Gtk.main  } : Gtk.main
     end
     
     def onmousemove(x,y)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2svg
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - James Robertson
@@ -62,7 +62,7 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -72,27 +72,27 @@ dependencies:
         version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: svgle
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.2.1
 description: 
 email: james@r0bertson.co.uk
 executables: []
@@ -123,5 +123,5 @@ rubyforge_project:
 rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
-summary: Experimental gem to render SVG using GTK2
+summary: Renders SVG using GTK2
 test_files: []