green_shoes 0.233.0 → 0.243.0

data/VERSION

@@ -1 +1 @@
-0.233.0
+0.243.0

data/lib/green_shoes.rb

@@ -21,6 +21,10 @@ module Shoes
   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}
+  KEY_NAMES = %w[exclam quotedbl numbersign dollar percent ampersand apostrophe 
+    parenleft parenright minus asciicircum backslash equal asciitilde bar grave at braceleft 
+    bracketleft braceright bracketright plus asterisk semicolon colon less greater question 
+    comma period slash backslash space]
 end
 
 class Object

data/lib/shoes/app.rb

@@ -25,13 +25,13 @@ class Shoes
       @width_pre, @height_pre = @width, @height
       @link_style, @linkhover_style = LINK_DEFAULT, LINKHOVER_DEFAULT
       @context_angle = @pixbuf_rotate = 0
-      Shoes.APPS << self
+      (Shoes.APPS << self) unless @noapp
     end
 
     attr_accessor :cslot, :cmask, :top_slot, :contents, :canvas, :app, :mccs, :mrcs, :mmcs, 
       :mhcs, :mlcs, :shcs, :mcs, :win, :swin, :width_pre, :height_pre, :order, :dics, :fronts, :backs
     attr_writer :mouse_button, :mouse_pos
-    attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors
+    attr_reader :link_style, :linkhover_style, :animates, :owner, :textcursors, :textmarkers
 
     def visit url
       if url =~ /^(http|https):\/\//
@@ -51,13 +51,52 @@ class Shoes
     end
     
     def stack args={}, &blk
-      args[:app] = self
-      Stack.new slot_attributes(args), &blk
+      if args[:scroll]
+        slot_with_scrollbar Stack, args, &blk
+      else
+        args[:app] = self
+        Stack.new slot_attributes(args), &blk
+      end
     end
 
     def flow args={}, &blk
-      args[:app] = self
-      Flow.new slot_attributes(args), &blk
+      if args[:scroll]
+        slot_with_scrollbar Flow, args, &blk
+      else
+        args[:app] = self
+        Flow.new slot_attributes(args), &blk
+      end
+    end
+
+    def slot_with_scrollbar slot, args={}, &blk
+      args[:left] ||= 0
+      args[:top] ||= 0
+      args[:width] ||= 200
+      args[:height] ||= 200
+
+      app = App.new noapp: true
+      app.instance_variable_set :@_w, args[:width]
+      app.instance_variable_set :@_h, args[:height]
+      def app.width; @_w end
+      def app.height; @_h end
+      app.win = win
+
+      swin = Gtk::ScrolledWindow.new
+      swin.set_size_request args[:width], args[:height]
+      swin.set_policy Gtk::POLICY_NEVER, Gtk::POLICY_AUTOMATIC
+      swin.vadjustment.step_increment = 10
+
+      layout = Gtk::Layout.new
+      swin.add layout
+      layout.style = @canvas.style
+
+      app.canvas = layout
+      app.top_slot = slot.new app.slot_attributes(app: app, left: args[:left], top: args[:top], width: args[:width], height: args[:height])
+
+      app.instance_eval &blk
+
+      @canvas.put swin, args[:left], args[:top]
+      app.top_slot
     end
 
     def mask &blk
@@ -284,7 +323,14 @@ class Shoes
     def keypress &blk
       win.set_events Gdk::Event::BUTTON_PRESS_MASK | Gdk::Event::BUTTON_RELEASE_MASK | Gdk::Event::POINTER_MOTION_MASK | Gdk::Event::KEY_PRESS_MASK
       win.signal_connect("key_press_event") do |w, e|
-        blk[Gdk::Keyval.to_name(e.keyval)]
+        k = Gdk::Keyval.to_name e.keyval
+        k = case
+          when Shoes::KEY_NAMES.include?(k); e.keyval.chr
+          when k == 'Return'; "\n"
+          when k == 'Tab'; "\t"
+	  else k
+        end
+        blk[k]
       end
     end
 

data/lib/shoes/basic.rb

@@ -36,7 +36,7 @@ class Shoes
 
     def move x, y
       @app.cslot.contents -= [self]
-      @app.canvas.move @real, x, y
+      @app.canvas.move @real, x, y unless @hided
       move3 x, y
       self
     end
@@ -168,7 +168,7 @@ class Shoes
     end
 
     def text
-      @args[:markup].gsub(/\<.*?>/, '')
+      @args[:markup].gsub(/\<.*?>/, '').gsub('&amp;', '&').gsub('&lt;', '<')
     end
     
     def text= s
@@ -203,7 +203,35 @@ class Shoes
     end
 
     def cursor
-      @app.textcursors[self][0]
+      @app.textcursors[self] ? @app.textcursors[self][0] : nil
+    end
+
+    def hit x, y
+      a, b, c = @app.make_textcursor_index(self, x - left, y - top + @app.scroll_top)
+      a ? b : nil
+    end
+
+    def marker=(n)
+      if cursor
+        cindex = cursor == -1 ? text.length : cursor
+        len = cindex - n
+        self.text = text[0...n] + @app.bg(text[n, len], @app.yellow) + text[n+len..-1] if len > 1
+      end
+      @app.textmarkers[self] = n
+    end
+    
+    def marker
+      @app.textmarkers[self]
+    end
+    
+    def highlight
+      unless cursor
+        return nil, 0
+      else
+        cindex = cursor == -1 ? text.length : cursor
+        mindex = marker ? marker : cindex
+        return marker, cindex - mindex
+      end
     end
   end
   

data/lib/shoes/help.rb

@@ -1,6 +1,7 @@
 class Manual < Shoes
   url '/', :index
   url '/manual/(\d+)', :index
+  url '/mk_search_page', :mk_search_page
 
   include Hpricot
   include HH::Markup
@@ -38,35 +39,12 @@ class Manual < Shoes
 
   def manual pnum, docs_title, docs_description, docs_methods
     flow do
-      background tr_color("#ddd")..white, angle: 90
-      background black..green, height: 90
-      para fg("The Green Shoes Manual #{VERSION}", gray), left: 120, top: 10
-      title fg(docs_title, white), left: 120, top: 30, font: 'Coolvetica'
-      image File.join(DIR, '../static/gshoes-icon.png'), left: 5, top: -12, width: 110, height: 110, nocontrol: true
-
+      show_header docs_title
+      show_toc
       paras = mk_paras docs_description
-
-      stack{para NL * 4}
-      flow width: 0.2, margin_left: 10 do
-        para *TOC
-        para link(fg 'to_html', darkmagenta){html_manual}
-      end
-        
       flow width: 0.8, margin: [10, 0, 20, 0] do
         show_page paras, true
-        docs_methods.each do |m, d|
-          flow do
-            background rgb(60, 60, 60), curve: 5
-            n = m.index("\u00BB")
-            if n
-              para '  ', fg(strong(m[0...n]), white), fg(strong(m[n..-1]), rgb(160, 160, 160))
-            else
-              para '  ', fg(strong(m), white)
-            end
-          end
-          para
-          show_page mk_paras(d.gsub('&', '\u0026'))
-        end
+        show_methods docs_methods
         para link('top'){visit "/manual/0"}, "  ",
           link('prev'){visit "/manual/#{(pnum-1)%PEND}"}, "  ", 
           link('next'){visit "/manual/#{(pnum+1)%PEND}"}, "  ", 
@@ -75,7 +53,44 @@ class Manual < Shoes
     end
   end
 
-  def show_page paras, intro = false
+  def show_header docs_title
+    background tr_color("#ddd")..white, angle: 90
+    background black..green, height: 90
+    para fg("The Green Shoes Manual #{VERSION}", gray), left: 120, top: 10
+    title fg(docs_title, white), left: 120, top: 30, font: 'Coolvetica'
+    image File.join(DIR, '../static/gshoes-icon.png'), left: 5, top: -12, width: 110, height: 110, nocontrol: true
+  end
+
+  def show_toc
+    stack(height: 120){}
+    flow width: 0.2, margin_left: 10 do
+      flow(margin_right: 20) do
+        background black.push(0.7), curve: 5
+        inscription "Not findng it?\n", 'Try ', link(fg 'Search', white){visit '/mk_search_page'}, '!', align: 'center', stroke: lightgrey
+      end
+      stack(height: 10){}
+      para *TOC
+      para link(fg 'to_html', darkmagenta){html_manual}
+    end
+  end
+
+  def show_methods docs_methods, term = nil
+    docs_methods.each do |m, d|
+      flow do
+        background rgb(60, 60, 60), curve: 5
+        n = m.index("\u00BB")
+        if n
+          para '  ', fg(strong(m[0...n]), white), fg(strong(m[n..-1]), rgb(160, 160, 160))
+        else
+          para '  ', fg(strong(m), white)
+        end
+      end
+      para
+      show_page mk_paras(d.gsub('&', '\u0026')), false, term
+    end
+  end
+
+  def show_page paras, intro = false, term = nil
     paras.each_with_index do |text, i|
       if text.index CODE_RE
         text.gsub CODE_RE do |lines|
@@ -99,28 +114,28 @@ class Manual < Shoes
       if text =~ /\A \* (.+)/m
         $1.split(/^ \* /).each do |txt|
           image File.join(DIR, '../static/gshoes-icon.png'), width: 20, height: 20
-          flow(width: 510){show_paragraph txt, intro, i}
+          flow(width: 510){show_paragraph txt, intro, i, term}
         end
       else
-        show_paragraph text, intro, i
+        show_paragraph text, intro, i, term
       end
     end
   end
   
-  def show_paragraph txt, intro, i, dot = nil
+  def show_paragraph txt, intro, i, term = nil
     txt = txt.gsub("\n", ' ').gsub(/`(.+?)`/m){fg code($1), rgb(255, 30, 0)}.
       gsub(/\^(.+?)\^/m, '\1').gsub(/'''(.+?)'''/m){strong($1)}.gsub(/''(.+?)''/m){em($1)}.
       gsub(/\[\[BR\]\]/i, "\n")
     txts = txt.split(/(\[\[\S+?\]\])/m).map{|s| s.split(/(\[\[\S+? .+?\]\])/m)}.flatten
     case txts[0]
-    when /\A==== (.+) ====/; caption $1, size: 24
-    when /\A=== (.+) ===/; tagline $1, size: 12, weight: 'bold'
-    when /\A== (.+) ==/; subtitle $1
-    when /\A= (.+) =/; title $1
+    when /\A==== (.+) ====/; caption marker($1, term), size: 24
+    when /\A=== (.+) ===/; tagline marker($1, term), size: 12, weight: 'bold'
+    when /\A== (.+) ==/; subtitle marker($1, term)
+    when /\A= (.+) =/; title marker($1, term)
     when /\A\{COLORS\}/; flow{color_page}
     when /\A\{SAMPLES\}/; flow{sample_page}
     else
-      para *mk_links(txts), NL, (intro and i.zero?) ? {size: 16} : ''
+      para *mk_links(txts, term), NL, (intro and i.zero?) ? {size: 16} : ''
       txt.gsub IMAGE_RE do
         image File.join(DIR, "../static/#{$3}"), eval("{#{$2 or "margin_left: 50"}}")
         para
@@ -128,10 +143,11 @@ class Manual < Shoes
     end
   end
 
-  def mk_links txts
+  def mk_links txts, term = nil
     txts.map{|txt| txt.gsub(IMAGE_RE, '')}.
-      map{|txt| txt =~ /\[\[(\S+?)\]\]/m ? (t = $1.split('.'); link(ins t.last){visit "/manual/#{find_pnum t.first}"}) : txt}.
-      map{|txt| txt =~ /\[\[(\S+?) (.+?)\]\]/m ? (url = $1; link(ins $2){visit url =~ /^http/ ? url : "/manual/#{find_pnum url}"}) : txt}
+      map{|txt| txt =~ /\[\[(\S+?)\]\]/m ? (t = $1.split('.'); link(ins marker(t.last, term)){visit "/manual/#{find_pnum t.first}"}) : txt}.
+      map{|txt| txt =~ /\[\[(\S+?) (.+?)\]\]/m ? (url = $1; link(ins marker($2, term)){visit url =~ /^http/ ? url : "/manual/#{find_pnum url}"}) : 
+      (txt.is_a?(String) ? marker(txt, term) : txt)}
   end
 
   def mk_paras str
@@ -363,6 +379,73 @@ class Manual < Shoes
       end
   end
 
+  def mk_search_page
+    flow do
+      show_header 'Search'
+      show_toc
+      pnum, docs_title, docs_description, docs_methods = get_title_and_desc(25)
+      paras = mk_paras docs_description
+
+      flow width: 0.8, margin: [10, 0, 20, 0] do
+        el = edit_line width: 300
+        button 'search' do
+          term = el.text.strip
+	  unless term.empty?
+            descs, methods = search term
+            @f.clear{show_search_result term, descs, methods} 
+          end
+        end
+        stack(height: 20){}
+        @f = flow{}
+      end
+    end
+  end
+
+  def search term
+    descs, methods = [], []
+    PNUMS.each_with_index do |(chapter, section), pnum|
+      pnum, docs_title, docs_description, docs_methods = get_title_and_desc(pnum)
+      paras = mk_paras(docs_description)
+      descs << [chapter, section, docs_title, paras] if paras.map{|txt| txt.gsub(CODE_RE, '').gsub(IMAGE_RE, '')}.join(' ').index(term)
+      docs_methods.each do |docs_method|
+        m, d = docs_method
+        methods << [chapter, section, docs_title, docs_method] if m.index(term) or d.gsub(CODE_RE, '').gsub(IMAGE_RE, '').index(term)
+      end
+    end
+    return descs, methods
+  end
+
+  def show_search_result term, descs, methods
+    return subtitle 'Not Found' if descs.empty? and methods.empty?
+    methods.each do |(chapter, section, docs_title, docs_method)|
+      flow margin: [10, 10, 0, 5] do
+        background rgb(200, 200, 200), curve: 5
+        para "#{DOCS[chapter][0]}: #{docs_title.sub('The', '').split(' ').first}: ", 
+          link(docs_method[0]){@f.clear{title docs_title; show_methods [docs_method], term}}, NL
+      end
+      stack(height: 2){}
+    end
+    descs.each do |(chapter, section, docs_title, paras)|
+      flow margin_left: 10 do
+        if section
+          background gray, curve: 5
+          tagline link(fg(docs_title, white)){@f.clear{title docs_title; show_page paras, true, term}}, width: 320
+          inscription "Sub-Section under #{DOCS[chapter][0]}", stroke: lightgrey, width: 180
+        else
+          background black.push(0.8), curve: 5
+	  subtitle link(fg(docs_title, white)){@f.clear{title docs_title; show_page paras, true, term}}, width: 320
+          inscription 'Section Header', stroke: lightgrey, width: 100
+        end
+      end
+      stack(height: 2){}
+    end
+    para NL*3
+  end
+
+  def marker txt, term
+    term && txt ? txt.gsub(term, bg(term, yellow)) : txt
+  end
+
   IMAGE_RE = /\!(\{([^}\n]+)\})?([^!\n]+\.\w+)\!/
   CODE_RE = /\{{3}(?:\s*\#![^\n]+)?(.+?)\}{3}/m
   NL = "\n"

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, @textcursors, @fronts, @backs = 
-        [], [], [], [], [], [], [], [], [], [], [], {}, {}, [], []
+      @contents, @mccs, @mrcs, @mmcs, @mhcs, @mlcs, @shcs, @mcs, @order, @dics, @animates, @radio_groups, @textcursors, @textmarkers, @fronts, @backs = 
+        [], [], [], [], [], [], [], [], [], [], [], {}, {}, {}, [], []
       @cmask = nil
       @mouse_button, @mouse_pos = 0, [0, 0]
       @fill, @stroke = black, black
@@ -96,12 +96,21 @@ class Shoes
     end
 
     def make_textcursor_pos tb, n
+      layout = make_textcursor_layout tb
+      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_textcursor_index tb, x, y
+      layout = make_textcursor_layout tb
+      layout.xy_to_index x * Pango::SCALE, y * Pango::SCALE
+    end
+
+    def make_textcursor_layout tb
       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
+      make_pango_layout(size, width, height, align, font, text, attr_list)[0]
     end
 
     def make_pango_attr markup
@@ -182,7 +191,7 @@ class Shoes
       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)
+      cursor ? cursor.move(x, y) : app.textcursors[tb][1] = app.line(x, y, x, y+tb.size*1.7, strokewidth: 1, stroke: app.black)
     end
   end
   

data/lib/shoes/widget.rb

@@ -1,7 +1,9 @@
 class Shoes
   class Widget
     def self.inherited klass, &blk
-      m = klass.inspect.downcase.split('::').last
+      m = klass.to_s[/(^|::)(\w+)$/, 2].
+              gsub(/([A-Z]+)([A-Z][a-z])/,'\1_\2').
+              gsub(/([a-z\d])([A-Z])/,'\1_\2').downcase
       Shoes::App.class_eval do
         define_method m do |*args, &blk|
           klass.class_variable_set :@@__app__, self

data/samples/sample51.rb

@@ -17,14 +17,10 @@ Shoes.app width: 200, height: 200 do
     #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
+    (@line.text = strong fg msg.gsub('&', '&amp;').gsub('<', '&lt;'), white) if msg
     flush
   end
 end

data/static/manual-en.txt

@@ -1517,7 +1517,23 @@ scrollbar will appear and disappear as needed.  It will also appear inside the
 width of the slot, meaning the slot's width will never change, regardless of
 whether there is a scrollbar or not.
 
-'''Note:''' Green Shoes doesn't support `:scroll` style.
+'''Note:''' Green Shoes has restrictions. `:scroll` style is just a trial so far.
+
+ * common Slot instance methods, i.e. clear, hide, etc., don't work well
+ * doesn't manage any mouse events 
+ * need to write `flush` explicitly
+
+{{{
+ Shoes.app do
+   s = stack left: 100, top: 50, width: 300, 
+     height: 100, scroll: true do
+     background gold
+     image './loogink.png'
+     10.times{para 'hello'}
+     flush
+   end
+ end
+}}}
 
 === :secret » true or false ===
 
@@ -3694,27 +3710,6 @@ Lists all of the strings and styled text objects inside this block.
 
 '''Note:''' Green Shoes doesn't support `contents` method.
 
-=== replace(a string) ===
-
-Replaces the text of the entire block with the characters of `a string`.
-
-=== text() » a string ===
-
-Return a string of all of the characters in this text box. This will strip off
-any style or text classes and just return the actual characters, as if seen on
-the screen.
-
-=== text = a string ===
-
-Replaces the text of the entire block with the characters of `a string`.
-
-=== to_s() » a string ===
-
-An alias for [[TextBlock.text]]. Returns a flattened string of all of this
-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
@@ -3747,6 +3742,75 @@ Using `cursor = nil` hides the text cursor.
  end
 }}}
 
+=== highlight() » an array ===
+
+Return an array which includes a text marker start position and highlighted length. 
+
+=== hit(left, top) » an index or nil ===
+
+Return an index of the text at which the mouse cursor points on. 
+The `left` and `top` are the mouse coordinates. 
+
+{{{
+ Shoes.app do
+   para 'index: ', width: 50
+   index = para '', width: 20
+   msg = title 'hello ' * 5
+   click do |b, x, y|
+     index.text = msg.hit x, y
+   end
+ end
+}}}
+
+=== marker() » an index ===
+
+Return a text marker start position. 
+
+=== marker = an index ===
+
+Highlight a part of text from marker start position to cursor position.
+
+{{{
+ Shoes.app do
+   background gainsboro
+   extend HH::Markup
+   code = 'alert "Hello Green Shoes! " * 5'
+   msg = para highlight code, nil
+   button 'marker' do
+     msg.cursor = 17
+     msg.marker = 14
+     msg.text = highlight msg.markup, nil
+     para msg.highlight
+     flush
+   end
+ end
+}}}
+
+=== markup() » a text ===
+
+Return some marked-up text for Pango. 
+
+=== replace(a string) ===
+
+Replaces the text of the entire block with the characters of `a string`.
+
+=== text() » a string ===
+
+Return a string of all of the characters in this text box. This will strip off
+any style or text classes and just return the actual characters, as if seen on
+the screen.
+
+=== text = a string ===
+
+Replaces the text of the entire block with the characters of `a string`.
+
+=== to_s() » a string ===
+
+An alias for [[TextBlock.text]]. Returns a flattened string of all of this
+TextBlock's contents.
+
+'''Note:''' Green Shoes doesn't support `to_s` method.
+
 == Timers ==
 
 Green Shoes contains three timers: the animate, every and

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 233
+  - 243
   - 0
-  version: 0.233.0
+  version: 0.243.0
 platform: ruby
 authors: 
 - ashbb
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-14 00:00:00 +09:00
+date: 2011-07-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency