r2dsvg 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6da60aae210c67cdc2a6c908e0721ddcfc07a6b516fbdedb49fb8ba33736dd43
-  data.tar.gz: 3a2735d01e9aaa4e319c4481ecce6d811fac9f7506086627865fe4a8be40a3c3
+  metadata.gz: 2b561aa931c1a66e2884576dea1525f9f3c77cb07b5757fb11081b8f807aaf91
+  data.tar.gz: 45a8bd9cca6d36ffb694c8c1337849ebfe4819fb0f06493799131a171a168a95
 SHA512:
-  metadata.gz: 7370accf36a0322a26c0885f535f6fdc866fbbb65ff8f250d6a827d97251446fa716a71e2859a2f45873433f307001eaf78e48a491c5944fdacf04a3f8515cdc
-  data.tar.gz: 390bb9e097fb6660f8bc6f73750dab72f6b92500a521c094bf92b103311744cb5d41e7671e590b6d62116a2115afdb278e96a129c7fd0f8a98cad84bbd5e42ac
+  metadata.gz: a117efd8624e7b97c7b35dc84fa10f4ed683841c86377c13c81c7c41fb8bc262d47ec178445333f173e6dade0a6d54ddbd7eb83f3743bc9129536166df76f5f2
+  data.tar.gz: cdb7a48f18fe178376f3b4331a969e1793d62863bc15bd6c1ce7cd47e9bba31fde0dfee99eec927284859066f88cb9aa69661e3c102a549ea242723a6a711a42

data/lib/r2dsvg.rb

@@ -34,6 +34,20 @@ module SvgleX
     
   end
   
+  refine Svgle::Text do
+    
+    def text=(raw_s)    
+      
+      oldval = @child_elements.first
+
+      r = super(raw_s)
+      self.obj.text = raw_s if oldval != raw_s
+      
+      return r        
+      
+    end
+  end
+  
 end
 
 class R2dSvg
@@ -346,6 +360,7 @@ class R2dSvg
         color: style[:color],
         z: style[:"z-index"].to_i
       )
+      puts 'e: ' + e.inspect
       e.obj = obj
       @window.add obj
 
@@ -401,11 +416,11 @@ class R2dSvg
 
     def draw(a)
   
-      threads = []
+      #threads = []
       
       a.each do |rawx|
   
-        threads << Thread.new do
+        #threads << Thread.new do
           x, *remaining = rawx
 
           if x.is_a? Symbol then
@@ -417,11 +432,11 @@ class R2dSvg
           else        
             method(x).call(remaining.take 2)
           end
-        end
+        #end
                         
       end
       
-      threads.join
+      #threads.join
 
     end
 
@@ -434,35 +449,62 @@ class R2dSvg
     @debug = debug
     
     @window = window = Window.new
+    @loaded = false
     
-    @doc = read(s, title)    
+    read(s, title)    
 
     drb = OneDrb::Server.new host: '127.0.0.1', port: '57844', obj: self
     Thread.new { drb.start }
     
-    window.on(:mouse_move) do |event|
-      mouse :mousemove, event
-      mouse :mouseenter, event
-    end
-    
-    window.on(:mouse_down) do |event|
+    if @loaded then
+      
+      window.on(:mouse_move) do |event|
+        mouse :mousemove, event
+        mouse :mouseenter, event
+      end
       
-      if event.button == :left then
+      window.on(:mouse_down) do |event|
+        
+        if event.button == :left then
+          
+          # click and mousedown do the same thing
+          mouse :click, event 
+          mouse :mousedown, event
+        end
         
-        # click and mousedown do the same thing
-        mouse :click, event 
-        mouse :mousedown, event
+      end          
+    
+      window.on :key_down do |event|
+        # A key was pressed
+        keyboard :keydown, event
       end
       
-    end          
-
+    end
+=begin     
+    window.on :key_held do |event|
+      # A key is being held down
+      puts event.key
+      keyboard :onkeyheld, event
+    end
+    
+    window.on :key_up do |event|
+      # A key was released
+      puts event.key
+      keyboard :onkeyup, event
+    end    
+=end
     window.show
     
     
   end
   
+  def clear()
+    @window.clear
+  end
+  
   def read(s, title=@title)
-
+    @loaded = false
+    @window.clear
     svg, _ = RXFHelper.read(s)    
     doc = Svgle.new(svg, callback: self, debug: @debug)
     instructions = Render.new(doc, debug: @debug).to_a
@@ -478,14 +520,38 @@ class R2dSvg
       doc.root.xpath('//script').each {|x| eval x.text.unescape }      
       drawing.render instructions    
     end
-    
-    doc
+
+    @loaded = true
+    @doc = doc
     
   end  
   
   
   private
   
+  def keyboard(action, event)
+    
+    doc = @doc
+    
+    @doc.root.xpath("//*[@on#{action}]").each do |x|
+
+      if block_given? then
+        valid = yield(x)
+        statement = x.method(('on' + action.to_s).to_sym).call()
+        puts 'statement: ' + statement.inspect if @debug
+        eval statement if valid
+      else
+        statement = x.method(('on' + action.to_s).to_sym).call()
+        puts 'statement: ' + statement.inspect if @debug
+        eval statement
+      end
+    
+    end
+    
+    @doc.event[action].each {|name| method(name).call event.key }
+        
+  end  
+  
   def mouse(action, event)
     
     doc = @doc

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: r2dsvg
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - James Robertson