add saveLayer to lua

resources/slides.lua

-function tostr(t)
-    local str = ""
-    for k, v in next, t do
-        if #str > 0 then
-            str = str .. ", "
-        end
-        if type(k) == "number" then
-            str = str .. "[" .. k .. "] = "
-        else
-            str = str .. tostring(k) .. " = "
-        end
-        if type(v) == "table" then
-            str = str .. "{ " .. tostr(v) .. " }"
-        elseif type(v) == "string" then
-            str = str .. '"' .. v .. '"'
-        else
-            str = str .. tostring(v)
-        end
-    end
-    return str
+
+gPath = "/skia/trunk/resources/"
+
+function load_file(file)
+    package.path = package.path .. ";" .. gPath .. file .. ".lua"
+    require(file)
 end
 
-
-function trim_ws(s)
-    return s:match("^%s*(.*)")
-end
-
-function count_hypens(s)
-    local leftover = s:match("^-*(.*)")
-    return string.len(s) - string.len(leftover)
-end
-
-function parse_file(file)
-    local slides = {}
-    local block = {}
-
-    for line in file:lines() do
-        local s = trim_ws(line)
-        if #s == 0 then   -- done with a block
-            if #block > 0 then
-                slides[#slides + 1] = block
-                block = {}
-            end
-        else
-            local n = count_hypens(s)
-            block[#block + 1] = {
-                indent = n,
-                text = trim_ws(s:sub(n + 1, -1))
-            }
-        end
-    end
-    return slides
-end
-
-function pretty_print_slide(slide)
-    io.write("{\n")
-    for i = 1, #slide do
-        local node = slide[i]
-        for j = 0, node.indent do
-            io.write("   ")
-        end
-        io.write("{ ")
-        io.write(tostr(node))
-        io.write(" },\n")
-    end
-    io.write("},\n")
-end
-
-function pretty_print_slides(slides)
-    io.write("gSlides = {\n")
-    for i = 1, #slides do
-        pretty_print_slide(slides[i])
-    end
-    io.write("}\n")
-end
+load_file("slides_utils")
 
 gSlides = parse_file(io.open("/skia/trunk/resources/slides_content.lua", "r"))
 
 function make_rect(l, t, r, b)
     return { left = l, top = t, right = r, bottom = b }
 end
 
 function make_paint(typefacename, stylebits, size, color)
     local paint = Sk.newPaint();
     paint:setAntiAlias(true)
@@ skipping 58 matching lines @@
         rec.step_x = 15
         rec.isDone = function (self) return self.curr_x >= 0 end
     end
     return rec
 end
 
 function sqr(value) return value * value end
 
 function set_blur(paint, alpha)
     local sigma = sqr(1 - alpha) * 20
-    paint:setImageFilter(Sk.newBlurImageFilter(sigma, sigma))
+--    paint:setImageFilter(Sk.newBlurImageFilter(sigma, sigma))
     paint:setAlpha(alpha)
 end
 
 function fade_slide_transition(prev, next, is_forward)
     local rec = {
         paint = Sk.newPaint(),
         prevDrawable = prev,
         nextDrawable = next,
         proc = function(self, canvas, drawSlideProc)
             if self:isDone() then
@@ skipping 72 matching lines @@
 gRedPaint:setColor{a=1, r=1, g=0, b=0 }
 
 -- animation.proc is passed the canvas before drawing.
 -- The animation.proc returns itself or another animation (which means keep animating)
 -- or it returns nil, which stops the animation.
 --
 local gCurrAnimation
 
 gSlideIndex = 1
 
-function next_slide()
-    local prev = gSlides[gSlideIndex]
-
-    gSlideIndex = gSlideIndex + 1
-    if gSlideIndex > #gSlides then
-        gSlideIndex = 1
-    end
-
-    spawn_transition(prev, gSlides[gSlideIndex], true)
-end
-
-function prev_slide()
-    local prev = gSlides[gSlideIndex]
-
-    gSlideIndex = gSlideIndex - 1
-    if gSlideIndex < 1 then
-        gSlideIndex = #gSlides
-    end
-
-    spawn_transition(prev, gSlides[gSlideIndex], false)
-end
-
 function new_drawable_picture(pic)
     return {
         picture = pic,
         width = pic:width(),
         height = pic:height(),
         draw = function (self, canvas, x, y, paint)
             canvas:drawPicture(self.picture, x, y, paint)
         end
     }
 end
 
 function new_drawable_image(img)
     return {
         image = img,
         width = img:width(),
         height = img:height(),
         draw = function (self, canvas, x, y, paint)
             canvas:drawImage(self.image, x, y, paint)
         end
     }
 end
 
+function new_drawable_slide(slide)
+    return {
+        slide = slide,
+        draw = function (self, canvas, x, y, paint)
+            if (nil == paint or ("number" == type(paint) and (1 == paint))) then
+                canvas:save()
+            else
+                canvas:saveLayer(paint)
+            end
+            canvas:translate(x, y)
+            drawSlide(canvas, self.slide, gTemplate)
+            canvas:restore()
+        end
+    }
+end
+
+function next_slide()
+    local prev = gSlides[gSlideIndex]
+
+    gSlideIndex = gSlideIndex + 1
+    if gSlideIndex > #gSlides then
+        gSlideIndex = 1
+    end
+
+    spawn_transition(prev, gSlides[gSlideIndex], true)
+end
+
+function prev_slide()
+    local prev = gSlides[gSlideIndex]
+
+    gSlideIndex = gSlideIndex - 1
+    if gSlideIndex < 1 then
+        gSlideIndex = #gSlides
+    end
+
+    spawn_transition(prev, gSlides[gSlideIndex], false)
+end
+
 function convert_to_picture_drawable(slide)
     local rec = Sk.newPictureRecorder()
     drawSlide(rec:beginRecording(640, 480), slide, gTemplate)
     return new_drawable_picture(rec:endRecording())
 end
 
 function convert_to_image_drawable(slide)
     local surf = Sk.newRasterSurface(640, 480)
     drawSlide(surf:getCanvas(), slide, gTemplate)
     return new_drawable_image(surf:newImageSnapshot())
 end
 
-gMakeDrawable = convert_to_picture_drawable
+-- gMakeDrawable = convert_to_picture_drawable
+gMakeDrawable = new_drawable_slide
 
 function spawn_transition(prevSlide, nextSlide, is_forward)
     local transition
     if is_forward then
         transition = prevSlide.transition
     else
         transition = nextSlide.transition
     end
 
     if not transition then
@@ skipping 103 matching lines @@
 }
 
 function onCharHandler(uni)
     local proc = keyProcs[uni]
     if proc then
         proc()
         return true
     end
     return false
 end