gtk2html 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5ab0a506063f7cb0b41a80b527a8865c64a721
-  data.tar.gz: 2fcf59b16e5c4415c652474733501ed7588de53f
+  metadata.gz: 4b81efb096425aecfebf68214bf408e611cd28ee
+  data.tar.gz: 326fc3bb1f2d4b7fb92a7c641852cabc9f03fcb8
 SHA512:
-  metadata.gz: 8237d4275b5115807d8e00a9b4d104e6aea077f6acfe730e4436aa8acc346d82b606b40878520bb6fe9eff3a7996857e4f43d90aea20eb338f4bf79207e35c10
-  data.tar.gz: 0bec2392905037ccbf3d796a34b9db8f55ac04c663db39554979435d1817abd07d9986ad3d9450c624abb5a9e1c44fafbc174ea24255d9c6993dc274fec8e31e
+  metadata.gz: a2cd659cebe59ea8420966134300b4b32538e255989d69221f8d3b01feda70b10c60302b2f1c994d74c2d0701fc0a8cdee3834097f33c8e90546e305c31090da
+  data.tar.gz: e1ce4bf4c31357354b112c6fcefde89a9a4778ee2e269385cf0f00cc703ca5dbcae439673d5f3f94aad61a3c3360d459603f42300da9bd0e40b4525b6840e458

data/lib/gtk2html.rb

@@ -23,7 +23,7 @@ module Gtk2HTML
 
       h = attributes
       
-      [:draw_box, [x1,y1,x2,y2], style, render_all(e)]
+      [[:draw_box, [x1,y1,x2,y2], style], render_all(e)]
     end    
 
     def div(e, attributes, raw_style)
@@ -33,7 +33,7 @@ module Gtk2HTML
       coords = [0, nil, @width, @height/2]
       padding = style[:padding].values
       
-      [:draw_box, margin, coords, padding, style, render_all(e)]
+      [[:draw_box, margin, coords, padding, style], render_all(e)]
     end
     
     def html(e, attributes, style)   
@@ -42,7 +42,7 @@ module Gtk2HTML
       coords = [0, 0, @width, @height]
       padding = style[:padding].values
 
-      [:draw_box, margin, coords, padding, style, render_all(e)]
+      [[:draw_box, margin, coords, padding, style], render_all(e)]
     end    
     
     private
@@ -56,7 +56,7 @@ module Gtk2HTML
         if h.has_key? x then
 
           a = expand_shorthand(h[x]) 
-
+          a.map!(&:to_i) # assumes everything is in pixels not em
           r.merge!(x => Hash[%i(top right bottom left).zip(a)])
         else
           r
@@ -76,6 +76,59 @@ module Gtk2HTML
     
   end
   
+  class Layout
+    
+    attr_reader :to_a
+    
+    def initialize(instructions, width: 320, height: 240)
+      
+      @width, @height = width, height
+      a = lay_out(instructions, pcoords: [0, 0, @width, @height])
+      @to_a = a
+      
+    end
+    
+
+    private
+
+    def lay_out(a, pcoords: [])
+
+      item, children = a
+      
+      name, margin, raw_coords, padding, style = item
+      
+      coords = raw_coords.map.with_index {|x,i| x ? x : pcoords[i]}
+      
+      x1 = coords[0] + margin[0]
+      y1 = coords[1] + margin[1]
+      x2 = coords[2] - margin[2]
+      y2 = coords[3] - margin[3]      
+
+      item[2] = [x1, y1, x2, y2]
+
+      nested = if children and children.length > 1 then
+        lay_out(children, pcoords: coords) 
+      else
+        children
+      end
+      #[owidth=(coords[2] - coords[0]), oheight=(coords[3] - coords[1])]
+      r = [item]
+      r << nested if nested
+      r
+    end    
+    
+    def lay_out2(a, pcoords: [])
+      
+      name, raw_coords, attributes, style, children = a
+      coords = raw_coords.map.with_index {|x,i| x ? x : pcoords[i]}
+
+      owidth, oheight = lay_out(children, pcoords: coords) if children
+      
+      [(coords[2] - coords[0]), (coords[3] - coords[1])]
+    end    
+    
+  end
+  
   class DrawingInstructions
 
     attr_accessor :area
@@ -87,24 +140,24 @@ module Gtk2HTML
 
     end    
     
-    def draw_box(args)
+    def draw_box(margin, raw_coords, padding, style)
 
-      margin, raw_coords, padding, style = args
       coords = raw_coords.map.with_index {|x,i| x ? x : @curpos[i] }
 
       h2 = style.clone
       h2.delete :color
       x1, y1, x2, y2 = coords
       
-      @curpos = coords      
+      @curpos = coords
+
+      width = x2 - x1
+      height = y2 - y1
 
       gc = gc_ini(h2)
-      @area.window.draw_rectangle(gc, 1, x1, y1, x2, y2)
+      @area.window.draw_rectangle(gc, 1, x1, y1, width, height)
     end
     
-    def draw_layout(args)
-
-      text, style = args
+    def draw_layout(text, style)
 
       x, y = @curpos
 
@@ -124,10 +177,8 @@ module Gtk2HTML
     def window(args)
     end
 
-    def render(a)
-      @latest_style = a[4]      
-      method(a[0]).call(args=a[1..4])
-      draw a[5]
+    def render(a)      
+      draw [a]
     end
     
     def script(args)
@@ -138,31 +189,43 @@ module Gtk2HTML
     private
     
     def draw(a)
+      
+      return unless a
+      
+      a.each do |row|
+        
+        next unless row
+        x, remaining = row
 
-      a.each do |rawx|
-
-        x, *remaining = rawx
+        case x[0].class.to_s.to_sym
 
-        if x.is_a? Symbol then
+        when :Symbol
+          
+          name, *args = x
+                  
+          @latest_style = args[3]
 
-          @latest_style = remaining[3]
-          method(x).call(args=remaining.shift(4))
+          method(name).call(*args)
           draw remaining
-        elsif x.is_a? String then
-
-          next unless x.length > 0
+          
+        when :String then
 
-          method(:draw_layout).call(args=[x, @latest_style]) unless x.empty?
+          next if x.empty?
 
-        elsif x.is_a? Array
+          method(:draw_layout).call(x, @latest_style)
 
+        when :Array
           draw remaining
         else    
-          method(x).call(remaining.take 4)
+          
+          name, *args = x
+
+          method(name).call(args)
+          draw remaining
         end
-        
-      end
 
+      end
+      
     end
     
     def set_colour(c)
@@ -202,7 +265,7 @@ module Gtk2HTML
     
     
     attr_accessor :doc, :html
-    attr_reader :width, :height
+    attr_reader :width, :height, :window
     
     def initialize(html, irb: false)
       
@@ -216,6 +279,7 @@ module Gtk2HTML
       
       @width = 320
       @height = 240
+      @window = window
       window.set_default_size(@width, @height)
       
       @dirty = true
@@ -223,15 +287,23 @@ module Gtk2HTML
       
       area.signal_connect("expose_event") do      
         
+        width, height = window.size
+
+        @dirty = true if [@width, @height] != [width, height]
+
+        
         if @dirty then
 
           Thread.new { @doc.root.xpath('//script').each {|x| eval x.text.unescape } }
+          
+          @width, @height = window.size
+          instructions = Gtk2HTML::Render.new(@doc, @width, @height).to_a
+          @layout_instructions = Gtk2HTML::Layout.new(instructions).to_a
 
-          @instructions = Gtk2HTML::Render.new(@doc, @width, @height).to_a
         end
 
         drawing = DrawingInstructions.new area
-        drawing.render @instructions
+        drawing.render @layout_instructions
         @dirty = false
         
       end
@@ -280,4 +352,4 @@ module Gtk2HTML
     
   end  
   
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gtk2html
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - James Robertson
@@ -31,7 +31,7 @@ cert_chain:
   XW00gFE4S5Cq4J0/5Y8BLyxXWUTTXHeLXwfiIfffKOUtTUjlivG+dvqexj8Qbbv9
   bW25tpA1jigdbQ==
   -----END CERTIFICATE-----
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2svg