green_shoes 0.201.0 → 0.207.0

data/README.md

@@ -8,7 +8,7 @@ This is **Green Shoes** written in Ruby. One of the colorful [Shoes](http://shoe
 
 Fantastic logo icon was created by [Zachary Scott](https://github.com/zacharyscott). Thanks!
 
-Now, there are 50 [samples](https://github.com/ashbb/green_shoes/tree/master/samples). Each has a [snapshot](https://github.com/ashbb/green_shoes/tree/master/snapshots).
+Now, there are 51 [samples](https://github.com/ashbb/green_shoes/tree/master/samples). Each has a [snapshot](https://github.com/ashbb/green_shoes/tree/master/snapshots).
 
 
 Tiny Streaming Flash videos

data/VERSION

@@ -1 +1 @@
-0.201.0
+0.207.0

data/lib/green_shoes.rb

@@ -19,6 +19,8 @@ module Shoes
   LINKHOVER_DEFAULT = "<span underline='single' underline_color='#039' foreground='#039' weight='normal'>"
   ROTATE = [Gdk::Pixbuf::ROTATE_NONE, Gdk::Pixbuf::ROTATE_CLOCKWISE, Gdk::Pixbuf::ROTATE_UPSIDEDOWN, Gdk::Pixbuf::ROTATE_COUNTERCLOCKWISE]
   VERSION = IO.read(File.join(DIR, '../VERSION')).chomp
+  BASIC_ATTRIBUTES_DEFAULT = {left: 0, top: 0, width: 0, height: 0, angle: 0, curve: 0}
+  SLOT_ATTRIBUTES_DEFAULT = {left: nil, top: nil, width: 1.0, height: 0}
 end
 
 class Object

data/lib/shoes/app.rb

@@ -31,7 +31,7 @@ class Shoes
     attr_accessor :cslot, :cmask, :top_slot, :contents, :canvas, :app, :mccs, :mrcs, :mmcs, 
       :mhcs, :mlcs, :shcs, :mcs, :win, :swin, :width_pre, :height_pre, :order, :dics
     attr_writer :mouse_button, :mouse_pos
-    attr_reader :link_style, :linkhover_style, :animates, :owner
+    attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors
 
     def visit url
       if url =~ /^(http|https):\/\//
@@ -73,9 +73,7 @@ class Shoes
       args = msg.last.class == Hash ? msg.pop : {}
       args = basic_attributes args
       args[:markup] = msg.map(&:to_s).join
-      attr_list, dummy_text = Pango.parse_markup args[:markup].gsub('\u0026', '@')
-      dummy_attr_list, text = Pango.parse_markup args[:markup]
-      text = text.gsub('\u0026', '&')
+      text, attr_list = make_pango_attr args[:markup]
       args[:size] ||= font_size
       args[:font] ||= (@font_family or 'sans')
       args[:align] ||= 'left'
@@ -92,19 +90,8 @@ class Shoes
       
       if args[:create_real] or !layout_control
         args[:width] = 1 if args[:width] <= 0
-        surface = Cairo::ImageSurface.new Cairo::FORMAT_ARGB32, args[:width], args[:height]
-        context = Cairo::Context.new surface
-        layout = context.create_pango_layout
-        layout.width = args[:width] * Pango::SCALE
-        layout.wrap = Pango::WRAP_WORD
-        layout.spacing = 5  * Pango::SCALE
-        layout.text = text
-        layout.alignment = eval "Pango::ALIGN_#{args[:align].upcase}"
-        fd = Pango::FontDescription.new
-        fd.family = args[:font]
-        fd.size = args[:size] * Pango::SCALE
-        layout.font_description = fd
-        layout.attributes = attr_list
+        layout, context, surface = 
+          make_pango_layout args[:size], args[:width], args[:height], args[:align], args[:font], text, attr_list
         context.show_pango_layout layout
         context.show_page
         
@@ -114,6 +101,7 @@ class Shoes
         img = create_tmp_png surface
         @canvas.put img, args[:left], args[:top]
         img.show_now
+        @canvas.remove img if args[:hidden]
         args[:real], args[:noorder] = img, layout_control
       else
         args[:real] = false
@@ -152,6 +140,7 @@ class Shoes
       end
       @canvas.put img, args[:left], args[:top]
       img.show_now
+      @canvas.remove img if args[:hidden]
       args[:real], args[:app] = img, self
       Image.new(args).tap{|s| @dics.push([s, d, tmpname]) if downloading}
     end
@@ -343,6 +332,7 @@ class Shoes
       img = Gtk::Image.new img.pixbuf.rotate(ROTATE[@pixbuf_rotate])
       @canvas.put img, args[:left], args[:top]
       img.show_now
+      @canvas.remove img if args[:hidden]
       args[:real], args[:app] = img, self
       Oval.new args
     end
@@ -388,6 +378,7 @@ class Shoes
       img = Gtk::Image.new img.pixbuf.rotate(ROTATE[@pixbuf_rotate])
       @canvas.put img, args[:left], args[:top]
       img.show_now
+      @canvas.remove img if args[:hidden]
       args[:real], args[:app] = img, self
       Rect.new args
     end
@@ -447,6 +438,7 @@ class Shoes
       img = create_tmp_png surface
       @canvas.put img, (args[:left]-=cw), (args[:top]-=cw)
       img.show_now
+      @canvas.remove img if args[:hidden]
       args[:real], args[:app] = img, self
       Line.new args
     end
@@ -485,6 +477,7 @@ class Shoes
       img = Gtk::Image.new img.pixbuf.rotate(ROTATE[@pixbuf_rotate])
       @canvas.put img, args[:left], args[:top]
       img.show_now
+      @canvas.remove img if args[:hidden]
       args[:real], args[:app] = img, self
       klass.new args
     end
@@ -530,7 +523,7 @@ class Shoes
         line_to w*0.58, w*0.5*0.2
         line_to w, w*0.5
         line_to w*0.58, w*(1-0.5*0.2)
-	line_to w*0.58, w*(1-0.5*0.6)
+        line_to w*0.58, w*(1-0.5*0.6)
         line_to 0, w*(1-0.5*0.6)
         line_to 0, w*0.5*0.6
       end

data/lib/shoes/basic.rb

@@ -25,7 +25,8 @@ class Shoes
       @proc = nil
       [:app, :real].each{|k| args.delete k}
       @args = args
-      @hided, @shows, @hovered = false, true, false
+      @hovered = false
+      @hidden ? (@hided, @shows = true, false) : (@hided, @shows = false, true)
     end
 
     attr_reader :args, :shows, :initials
@@ -66,6 +67,7 @@ class Shoes
       @app.shcs.delete self
       @app.shcs << self
       @shows = true
+      @args.delete :hidden
       self
     end
 
@@ -164,7 +166,7 @@ class Shoes
     end
     
     def text= s
-      style markup: s
+      style markup: s  if !@hided or @args[:hidden]
     end
 
     alias :replace :text=
@@ -178,6 +180,24 @@ class Shoes
       self.text = @args[:markup]
       super
     end
+
+    def remove
+      flag = @args[:hidden] ? @shows : @hided
+      @app.canvas.remove @real unless flag
+    end
+
+    def cursor=(n)
+      if !n
+        @app.textcursors[self][1].clear if @app.textcursors[self][1]
+        @app.textcursors.delete self
+      else
+        @app.textcursors[self] ? (@app.textcursors[self][0] = n) : (@app.textcursors[self] = [n, nil])
+      end
+    end
+
+    def cursor
+      @app.textcursors[self][0]
+    end
   end
   
   class Banner < TextBlock; end

data/lib/shoes/helper_methods.rb

@@ -36,8 +36,8 @@ class Shoes
   
   module Mod2
     def init_app_vars
-      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups = 
-        [], [], [], [], [], [], [], [], [], [], [], {}
+      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups, @textcursors = 
+        [], [], [], [], [], [], [], [], [], [], [], {}, {}
       @cmask = nil
       @mouse_button, @mouse_pos = 0, [0, 0]
       @fill, @stroke = black, black
@@ -62,13 +62,13 @@ class Shoes
 
   class App
     def basic_attributes args={}
-      default = {left: 0, top: 0, width: 0, height: 0, angle: 0, curve: 0}
+      default = BASIC_ATTRIBUTES_DEFAULT
       default.merge!({nocontrol: true}) if @nolayout
       default.merge args
     end
 
     def slot_attributes args={}
-      default = {left: nil, top: nil, width: 1.0, height: 0}
+      default = SLOT_ATTRIBUTES_DEFAULT
       default.merge args
     end
 
@@ -81,7 +81,7 @@ class Shoes
       start, links = 0, []
       msg.each do |e|
         len = e.to_s.gsub(/<\/.*?>/, '').gsub(/<.*?>/, '').length
-        (links << e; e.index = [start, start + len - 1]) if e.is_a? Link
+        (links << e; e.index = [start, start + len]) if e.is_a? Link
         start += len
       end
       links
@@ -90,10 +90,43 @@ class Shoes
     def make_link_pos links, layout, line_height
       links.each do |e|
         e.pos = [layout.index_to_pos(e.index[0]).x / Pango::SCALE, layout.index_to_pos(e.index[0]).y / Pango::SCALE]
-        e.pos << (layout.index_to_pos(e.index[1]).x / Pango::SCALE + line_height / 2) << (layout.index_to_pos(e.index[1]).y / Pango::SCALE)
+        e.pos << (layout.index_to_pos(e.index[1]).x / Pango::SCALE) << (layout.index_to_pos(e.index[1]).y / Pango::SCALE)
         e.pos << line_height
       end
     end
+
+    def make_textcursor_pos tb, n
+      markup, size, width, height, align, font = 
+        %w[@markup @size @width @height @align @font].map{|v| tb.instance_variable_get v}
+      text, attr_list = make_pango_attr markup
+      layout, = make_pango_layout size, width, height, align, font, text, attr_list
+      n = tb.text.length if n == -1
+      return layout.index_to_pos(n).x / Pango::SCALE, layout.index_to_pos(n).y / Pango::SCALE
+    end
+
+    def make_pango_attr markup
+      attr_list, dummy_text = Pango.parse_markup markup.gsub('\u0026', '@')
+      dummy_attr_list, text = Pango.parse_markup markup
+      text = text.gsub('\u0026', '&')
+      return text, attr_list
+    end
+
+    def make_pango_layout size, width, height, align, font, text, attr_list
+      surface = Cairo::ImageSurface.new Cairo::FORMAT_ARGB32, width, height
+      context = Cairo::Context.new surface
+      layout = context.create_pango_layout
+      layout.width = width * Pango::SCALE
+      layout.wrap = Pango::WRAP_WORD
+      layout.spacing = 5  * Pango::SCALE
+      layout.text = text
+      layout.alignment = eval "Pango::ALIGN_#{align.upcase}"
+      fd = Pango::FontDescription.new
+      fd.family = font
+      fd.size = size * Pango::SCALE
+      layout.font_description = fd
+      layout.attributes = attr_list
+      return layout, context, surface
+    end
   end
 
   def self.contents_alignment slot
@@ -135,6 +168,15 @@ class Shoes
       end
     end
   end
+
+  def self.repaint_textcursors app
+    app.textcursors.each do |tb, v|
+      n, cursor = v
+      x, y = app.make_textcursor_pos(tb, n)
+      x += tb.left; y += tb.top
+      cursor ? cursor.move(x, y) : app.textcursors[tb][1] = app.line(x, y, x, y+tb.size*1.7)
+    end
+  end
   
   def self.call_back_procs app
     init_contents app.cslot.contents
@@ -143,6 +185,7 @@ class Shoes
     repaint_all app.cslot
     mask_control app
     repaint_all_by_order app
+    repaint_textcursors app
     app.canvas.set_size 0, scrollable_height unless app.prjct
     true
   end
@@ -194,6 +237,7 @@ class Shoes
 
   def self.mouse_link_control app
     app.mlcs.each do |tb|
+      next if tb.hided
       link_proc,  = mouse_on_link(tb, app)
       link_proc.call if link_proc
     end
@@ -207,10 +251,11 @@ class Shoes
     end
     
     app.mlcs.each do |tb|
+      return false if tb.hided
       tb.text = tb.text unless tb.real
       tb.real.window.cursor = ARROW if tb.real.window
       if ret = mouse_on_link(tb, app)
-        tb.real.window.cursor = HAND
+        tb.real.window.cursor = HAND  if tb.real.window
         unless tb.links[ret[1]].link_hover
           markup = tb.args[:markup].gsub(app.linkhover_style, app.link_style)
           links = markup.mindex  app.link_style

data/lib/shoes/slot.rb

@@ -20,7 +20,16 @@ class Shoes
       @contents = []
       (@parent.contents << self) unless @nocontrol
       if block_given?
+        if args[:hidden]
+          BASIC_ATTRIBUTES_DEFAULT.merge! hidden: true
+          SLOT_ATTRIBUTES_DEFAULT.merge! hidden: true
+          @hidden_flag = true unless @parent.instance_variable_get '@hidden'
+	end
         yield
+        if @hidden_flag
+          BASIC_ATTRIBUTES_DEFAULT.delete :hidden
+          SLOT_ATTRIBUTES_DEFAULT.delete :hidden
+        end
         @app.cslot = @parent
       else
         @left = @top = 0
@@ -102,6 +111,16 @@ class Shoes
       n = n ? n+1 : contents.length
       prepend n, &blk
     end
+
+    def show
+      @contents.each &:show
+      self
+    end
+
+    def hide
+      @contents.each &:hide
+      self
+    end
   end
 
   class Stack < Slot; end

data/lib/shoes/style.rb

@@ -2,17 +2,17 @@ class Shoes
   class App
     def style klass, args={}
       if klass == Shoes::Link
-          @link_style = LINK_DEFAULT
-          @link_style.sub!('single', 'none') if args[:underline] == false
-          @link_style.sub!("foreground='#06E'", "foreground='#{args[:stroke]}'") if args[:stroke]
-          @link_style.sub!('>', " background='#{args[:fill]}'>") if args[:fill]
-          @link_style.sub!('normal', "#{args[:weight]}") if args[:weight]
+        @link_style = LINK_DEFAULT
+        @link_style.sub!('single', 'none') if args[:underline] == false
+        @link_style.sub!("foreground='#06E'", "foreground='#{args[:stroke]}'") if args[:stroke]
+        @link_style.sub!('>', " background='#{args[:fill]}'>") if args[:fill]
+        @link_style.sub!('normal', "#{args[:weight]}") if args[:weight]
       elsif klass == Shoes::LinkHover
-          @linkhover_style = LINKHOVER_DEFAULT
-          @linkhover_style.sub!('single', 'none') if args[:underline] == false
-          @linkhover_style.sub!("foreground='#039'", "foreground='#{args[:stroke]}'") if args[:stroke]
-          @linkhover_style.sub!('>', " background='#{args[:fill]}'>") if args[:fill]
-          @linkhover_style.sub!('normal', "#{args[:weight]}") if args[:weight]
+        @linkhover_style = LINKHOVER_DEFAULT
+        @linkhover_style.sub!('single', 'none') if args[:underline] == false
+        @linkhover_style.sub!("foreground='#039'", "foreground='#{args[:stroke]}'") if args[:stroke]
+        @linkhover_style.sub!('>', " background='#{args[:fill]}'>") if args[:fill]
+        @linkhover_style.sub!('normal', "#{args[:weight]}") if args[:weight]
       end
     end
   end
@@ -55,6 +55,7 @@ class Shoes
       tb = @app.send(m, *args)
       @real, @height = tb.real, tb.height
       @args[:markup], @args[:size], @args[:font], @args[:align] = tb.markup, tb.size, tb.font, tb.align
+      @markup, @size, @font, @align = @args[:markup], @args[:size], @args[:font], @args[:align]
     end
   end
 

data/samples/sample44.rb

@@ -33,7 +33,7 @@ Shoes.app height: 260, width: 250 do
     _y = radius_local * Math.cos( time * Math::PI / unit )
     stroke color
     strokewidth sw
-    line(@centerx, @centery, @centerx + _x, @centery - _y)
+    line @centerx, @centery, @centerx + _x, @centery - _y, hidden: true
   end
   
   @radius, @centerx, @centery = 90, 126, 140
@@ -43,9 +43,9 @@ Shoes.app height: 260, width: 250 do
     @msg = para '', margin: 4, align: 'center'
   end
   hour, min, sec = [], [], []
-  12.times{|i| 5.times{|j| hour << clock_hand(i+(j/5.0), 8, 6).hide}}
-  60.times{|i| 4.times{|j| min << clock_hand(i+(j/4.0), 5).hide}}
-  60.times{|i| 8.times{|j| sec << clock_hand(i+(j/8.0), 2, 30, red).hide}}
+  12.times{|i| 5.times{|j| hour << clock_hand(i+(j/5.0), 8, 6)}}
+  60.times{|i| 4.times{|j| min << clock_hand(i+(j/4.0), 5)}}
+  60.times{|i| 8.times{|j| sec << clock_hand(i+(j/8.0), 2, 30, red)}}
 
   animate 8 do |i|
     t = Time.new

data/samples/sample51.rb

@@ -0,0 +1,30 @@
+require '../lib/green_shoes'
+
+# The same as gallery2 : http://shoes-tutorial-note.heroku.com/html/01110_Fancy_Gallery_1-5.html
+# But revised for Green Shoes
+
+Shoes.app width: 200, height: 200 do
+  background mintcream
+  flow margin: 5 do
+    flow height: 190 do
+      background './shell.png', curve: 5
+      @line = para ' '
+      @line.cursor = -1
+    end
+  end
+
+  keypress do |k|
+    #p k
+    msg = case k
+      when 'BackSpace'; @line.text[0..-2]
+      when 'Return'; @line.text + "\n"
+      when 'space'; @line.text + ' '
+      when 'exclam'; @line.text + '!'
+      when 'period'; @line.text + '.'
+      else
+        k.length == 1 ? @line.text + k : nil
+    end
+    (@line.text = strong fg msg, white) if msg
+    flush
+  end
+end

data/static/manual-en.txt

@@ -1335,10 +1335,25 @@ being 100%.)
 
 For: ''all slots and elements''.
 
-Hides or shows this object.  Any object with `:hidden => true` are not
+Hides or shows this object.  Any object with `hidden: true` are not
 displayed on the screen.  Neither are its children.
 
-'''Note:''' Green Shoes doesn't support `:hidden` style.
+{{{
+ Shoes.app do
+   slot = stack hidden: true do
+     title 'hello'
+     flow do
+       image File.join DIR, '../samples/loogink.png'
+     end
+     para link('Go go!'){alert 'hi'}
+   end
+   timer(2){slot.show}
+   timer(5){slot.hide}
+ end
+}}}
+
+'''Note:''' Green Shoes supports `:hidden` style for only slots, shapes, textblocks 
+and images so far.
 
 === :inner » a number ===
 
@@ -3347,7 +3362,8 @@ To create an image, use the `image` method in a slot:
  #!ruby
  Shoes.app do
    para "Nice, nice, very nice.  Busy, busy, busy."
-   image "../static/shoes-manual-apps.png"
+   image File.join DIR,
+     "../static/shoes-manual-apps.png"
   end
 }}}
 
@@ -3676,6 +3692,38 @@ TextBlock's contents.
 
 '''Note:''' Green Shoes doesn't support `to_s` method.
 
+=== cursor() » an index ===
+
+Return a text cursor position. That is an index of the text which is a string
+of all of the characters in this text box.
+
+=== cursor = an index or nil ===
+
+Shows or hides the text cursor.
+Using `cursor = 3`, for instance, shows the text cursor at index 3 from the front.
+Using `cursor = -1` shows the text cursor at the end of the text.
+Using `cursor = nil` hides the text cursor.
+
+{{{
+ Shoes.app do
+  msg = para 'hello ' * 20
+  msg.cursor = -1
+  keypress do |k|
+    n = case k
+      when 'Left'; -1
+      when 'Right'; 1
+      else
+        next
+    end
+    n += msg.cursor
+    len = msg.text.length
+    n = len unless n > -1
+    msg.cursor = n % (len+1)
+    flush
+  end
+ end
+}}}
+
 == Timers ==
 
 Green Shoes contains three timers: the animate, every and

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 201
+  - 207
   - 0
-  version: 0.201.0
+  version: 0.207.0
 platform: ruby
 authors: 
 - ashbb
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-04 00:00:00 +09:00
+date: 2011-04-16 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -195,11 +195,13 @@ files:
 - samples/sample49.rb
 - samples/sample5.rb
 - samples/sample50.rb
+- samples/sample51.rb
 - samples/sample6.rb
 - samples/sample7.rb
 - samples/sample8.rb
 - samples/sample9.rb
 - samples/sample99.rb
+- samples/shell.png
 - samples/splash-hand.png
 - snapshots/helloworld.png
 - snapshots/mini-hh.png
@@ -252,6 +254,7 @@ files:
 - snapshots/sample49.png
 - snapshots/sample5.png
 - snapshots/sample50.png
+- snapshots/sample51.png
 - snapshots/sample6.png
 - snapshots/sample7.png
 - snapshots/sample8.png