rubygoo 0.0.5 → 0.0.6

data/lib/rubygoo/app.rb

@@ -1,14 +1,15 @@
 module Rubygoo
   class App < Container
 
-    DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:width=>600,:height=>480,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes"),:mouse_cursor => true}
-    attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer
+    DEFAULT_PARAMS = {:theme=>'default',:x=>10,:y=>10,:data_dir=>File.join(File.dirname(__FILE__),"..","..","themes"),:mouse_cursor => true}
+    attr_accessor :theme_name, :theme, :data_dir, :theme_dir, :renderer, :tab_groups
 
     def initialize(opts={})
       merged_opts = DEFAULT_PARAMS.merge opts
       @widgets = []
-      @tabbed_widgets = []
-      @focussed_widget = 0
+      @tab_groups = []
+      @tab_groups << TabGroup.new
+
       theme_name = merged_opts[:theme]
       @data_dir = merged_opts[:data_dir]
       @theme_name = theme_name
@@ -17,13 +18,14 @@ module Rubygoo
       super merged_opts
 
       # should this go here?
-      @mouse_opt = merged_opts[:mouse_cursor]
-      if @mouse_opt
+      @mouse_cursor = merged_opts[:mouse_cursor]
+      if @mouse_cursor
         @mouse = MouseCursor.new
         @mouse.parent = self
         @mouse.app = self.app
         @mouse.added
       end
+      @mouse_dragging = false
     end
 
     def app()
@@ -38,30 +40,28 @@ module Rubygoo
     def draw(screen)
       @renderer.start_drawing
       super @renderer
-      @mouse.draw @renderer if @mouse_opt
+      @mouse.draw @renderer if @mouse_cursor
       @renderer.finish_drawing
     end
 
+    def focus(w)
+      @tab_groups.last.focus w
+    end
+
     def add_tabbed_widget(w)
-      w.focus_priority = @tabbed_widgets.size unless w.focus_priority
-      @focussed_widget = 1
-      w.focus if @tabbed_widgets.empty?
-      @tabbed_widgets << w 
-      @tabbed_widgets.sort_by {|w| w.focus_priority}
+      @tab_groups[0].add w
+    end
+
+    def add_tab_group(tg)
+      @tab_groups << tg
     end
 
     def focus_back()
-      @tabbed_widgets[@focussed_widget].unfocus
-      @focussed_widget += 1
-      @focussed_widget %= @tabbed_widgets.size
-      @tabbed_widgets[@focussed_widget].focus
+      @tab_groups.last.previous
     end
 
     def focus_forward()
-      @tabbed_widgets[@focussed_widget].unfocus
-      @focussed_widget -= 1
-      @focussed_widget %= @tabbed_widgets.size
-      @tabbed_widgets[@focussed_widget].focus
+      @tab_groups.last.next
     end
 
     def on_event(event)
@@ -79,13 +79,71 @@ module Rubygoo
         else
           modal_keyboard_call :key_pressed, event
         end
+      when :mouse_down
+        modal_mouse_call :mouse_down, event
+        # TODO: I know this is simplistic and doesn't account for which button
+        # is being pressed/released
+        @mouse_start_x = event.data[:x]
+        @mouse_start_y = event.data[:y]
+      when :mouse_up
+        x = event.data[:x]
+        y = event.data[:y]
+        if @mouse_start_x == x and @mouse_start_y == y
+          modal_mouse_call :mouse_up, event
+        else
+          modal_mouse_call :mouse_drag, event
+        end
+        @mouse_start_x = nil
+        @mouse_start_y = nil
+      when :mouse_motion
+        x = event.data[:x]
+        y = event.data[:y]
+        if @mouse_start_x
+          modal_mouse_call :mouse_dragging, event
+        else
+          modal_mouse_call :mouse_motion, event
+        end
+        @mouse.mouse_motion event if @mouse_cursor
+      end
+    end
+
+    # redirects all events to this widget
+    def add_modal(widget)
+      @modal_widgets << widget
+      tg = TabGroup.new
+      tg.add(widget)
+      self.app.add_tab_group tg
+      add widget
+    end
+
+    def remove_modal(widget)
+      self.app.pop_tab_group
+      remove widget
+    end
+
+    def pop_tab_group()
+      @tab_groups.pop
+    end
+
+    # distribute our mouse events to our modals first
+    def modal_mouse_call(meth, event)
+      if @modal_widgets.empty?
+        @widgets.each do |w|
+          w.send meth, event if w.contains? [event.data[:x],event.data[:y]] 
+        end
       else
-        # ALL mouse events go here
-        modal_mouse_call event.event_type, event
+        @modal_widgets.last.send meth, event
+      end
+    end
 
-        if event.event_type == :mouse_motion
-          @mouse.mouse_motion event if @mouse_opt
+    # distribute our keyboard events to our modals first
+    def modal_keyboard_call(meth, event)
+      if @modal_widgets.empty?
+        @widgets.each do |w|
+          w.send meth, event if w.focussed?
         end
+      else
+        @modal_widgets.last.send meth, event
       end
     end
 

data/lib/rubygoo/button.rb

@@ -3,6 +3,9 @@ module Rubygoo
     can_fire :pressed
     def initialize(text, opts={})
       super opts
+
+      @icon = opts[:icon]
+
       @text = text
     end
 
@@ -14,9 +17,13 @@ module Rubygoo
       @border_color = theme_property :border_color
       @focus_color = theme_property :focus_color
       @font_file = File.join(@app.theme_dir,font)
-
       @rendered_text ||= @app.renderer.render_text @text, @font_file, @font_size, @color
-      @rect = Rect.new [@x-@x_pad,@y-@y_pad,@rendered_text.width+2*@x_pad,@rendered_text.height+2*@y_pad]
+      @w = @rendered_text.width+2*@x_pad
+      @h = @rendered_text.height+2*@y_pad
+      @x = @x - @x_pad
+      @y = @y - @y_pad
+
+      update_rect
     end
 
     # called when there is a mouse click
@@ -24,6 +31,11 @@ module Rubygoo
       fire :pressed, event
     end
 
+    # called when there is a mouse click at the end of a drag
+    def mouse_drag(event)
+      fire :pressed, event
+    end
+
     # called when a key press is sent to us
     def key_pressed(event)
       case event.data[:key]
@@ -33,21 +45,28 @@ module Rubygoo
     end
 
     def draw(adapter)
+      x1 = @rect[0]
+      y1 = @rect[1]
+      x2 = @rect[2] + x1
+      y2 = @rect[3] + y1
+      
+
       if @focussed
-        adapter.fill @focus_color, @rect
+        adapter.fill x1, y1, x2, y2, @focus_color
       elsif @bg_color
-        adapter.fill @bg_color, @rect
+        adapter.fill x1, y1, x2, y2, @bg_color
       end
       if @border_color
-        x1 = @rect[0]
-        y1 = @rect[1]
-        x2 = @rect[2] + x1
-        y2 = @rect[3] + y1
         adapter.draw_box x1, y1, x2, y2, @border_color
       end
+      if @icon
+        # TODO center icon
+        ix = x1#+((x2-x1)-@icon.w)
+        iy = y1#+((y2-y1)-@icon.h)
+        adapter.draw_image @icon, ix+@x_pad,iy+@y_pad
+      end
 
-
-      adapter.draw_image @rendered_text, @x, @y, @color
+      adapter.draw_image @rendered_text, @x+@x_pad, @y+@y_pad, @color
 
     end
   end

data/lib/rubygoo/check_box.rb

@@ -31,12 +31,12 @@ module Rubygoo
 
     def check()
       @checked = true
-      fire :checked
+      fire :checked, self
     end
 
     def uncheck()
       @checked = false
-      fire :checked
+      fire :checked, self
     end
 
     # called when there is a mouse click
@@ -44,6 +44,11 @@ module Rubygoo
       toggle
     end
 
+    # called when there is a mouse click at the end of a drag
+    def mouse_drag(event)
+      toggle
+    end
+
     # called when a key press is sent to us
     def key_pressed(event)
       case event.data[:key]
@@ -52,23 +57,28 @@ module Rubygoo
       end
     end
 
-    def draw(screen)
+    def draw(adapter)
+      x1 = @rect[0]
+      y1 = @rect[1]
+      x2 = @rect[2] + x1
+      y2 = @rect[3] + y1
       if @focussed
-        screen.fill @focus_color, @rect
+        adapter.fill x1, y1, x2, y2, @focus_color
       elsif @bg_color
-        screen.fill @bg_color, @rect
+        adapter.fill x1, y1, x2, y2, @bg_color
       end
 
       if @checked
-        screen.fill @checked_color, @rect.inflate(-@x_pad,-@y_pad)
+        rect = @rect.inflate(-@x_pad,-@y_pad)
+        cx1 = rect[0]
+        cy1 = rect[1]
+        cx2 = rect[2] + x1
+        cy2 = rect[3] + y1
+        adapter.fill cx1, cy1, cx2, cy2, @checked_color
       end
 
       if @border_color
-        x1 = @rect[0]
-        y1 = @rect[1]
-        x2 = @rect[2] + x1
-        y2 = @rect[3] + y1
-        screen.draw_box x1, y1, x2, y2, @border_color
+        adapter.draw_box x1, y1, x2, y2, @border_color
       end
     end
   end

data/lib/rubygoo/container.rb

@@ -1,7 +1,8 @@
+require 'publisher'
 module Rubygoo
   class Container < Widget
-
-    attr_accessor :widgets, :bg_color, :rect
+    extend Publisher
+    attr_accessor :widgets, :bg_color, :rect, :queued_widgets
 
     def initialize(opts={})
       super opts
@@ -14,25 +15,33 @@ module Rubygoo
 
     # called when we are added to another container
     def added() 
+      @bg_color = theme_property :bg_color
       add *@queued_widgets
       @queued_widgets = []
     end
 
-    def add_modal(widget)
-      @modal_widgets << widget
-      add widget
-    end
-
     # Add widget(s) to the container.
     def add(*widgets)
       widgets.uniq.each do |w|
         unless @widgets.include? w
           if self.app
+            if w.relative
+              w.x += @x
+              w.y += @y
+              w.update_rect
+            end
             w.container = self
             w.parent = self
             w.app = self.app
-            w.app.add_tabbed_widget w
+            if !modal? and w.tab_to? and !w.modal?
+              w.app.add_tabbed_widget w 
+            end
             w.added
+
+            w.when :resized do |resized_widget|
+              resize resized_widget
+            end
+
             @widgets << w
           else
             @queued_widgets << w
@@ -55,19 +64,23 @@ module Rubygoo
     end
 
     # draw ourself and our children
-    def draw(screen)
+    def draw(adapter)
       # any container specific code here (border_colors?)
       if @bg_color
         if app == self
-          screen.fill @bg_color
+          adapter.fill_screen @bg_color
         else
-          screen.fill @bg_color, @rect
+          x1 = @rect[0]
+          y1 = @rect[1]
+          x2 = @rect[2] + x1
+          y2 = @rect[3] + y1
+          adapter.fill x1, y1, x2, y2, @bg_color
         end
       end
 
       # draw kiddies 
       @widgets.each do |w|
-        w.draw screen
+        w.draw adapter
       end
     end
 
@@ -92,6 +105,13 @@ module Rubygoo
       end
     end
 
+    # called when there is a mouse release after dragging
+    def mouse_drag(event)
+      @widgets.each do |w|
+        w.mouse_drag event if w.contains? [event.data[:x],event.data[:y]] 
+      end
+    end
+
     # pass on the key press to our widgets
     def key_pressed(event)
       @widgets.each do |w|
@@ -106,27 +126,6 @@ module Rubygoo
       end
     end
 
-    # distribute our mouse events to our modals first
-    def modal_mouse_call(meth, event)
-      if @modal_widgets.empty?
-        @widgets.each do |w|
-          w.send meth, event if w.contains? [event.data[:x],event.data[:y]] 
-        end
-      else
-        @modal_widgets.last.send meth, event
-      end
-    end
-
-    # distribute our keyboard events to our modals first
-    def modal_keyboard_call(meth, event)
-      if @modal_widgets.empty?
-        @widgets.each do |w|
-          w.send meth, event if w.focussed?
-        end
-      else
-        @modal_widgets.last.send meth, event
-      end
-    end
 
     # called each update cycle with the amount of time that has passed.  useful
     # for animations, etc
@@ -135,6 +134,27 @@ module Rubygoo
         w.update time
       end
     end
+
+    # does this widget want tabbed focus? Containers don't usually
+    def tab_to?
+      false
+    end
+
+    # called when we need to update our size
+    def resize(w)
+      # check the rects of all our children?
+      max_w = 1
+      max_h = 1
+      @widgets.each do |w|
+        w_width = w.x + w.w
+        w_height = w.y + w.h
+        max_w = w_width if w_width > max_w
+        max_h = w_height if w_height > max_h
+      end
+      @w = max_w - @x + 2*@x_pad
+      @h = max_h - @y + 2*@y_pad
+      update_rect
+    end
   end
 end
 

data/lib/rubygoo/dialog.rb

@@ -19,21 +19,16 @@ module Rubygoo
       @rect = Rect.new [@x-@x_pad,@y-@y_pad,@w+2*@x_pad,@h+2*@y_pad]
     end
 
+    def modal?()
+      @modal_target
+    end
+
     # show the dialog by adding it to the @modal_target and
     # intercepting all of its events
     def show()
       @modal_target.add_modal self
     end
 
-  #  def on_mouse_dragging(x,y,event); end
-  #  def on_mouse_motion(event); end
-  #  def on_mouse_drag(start_x, start_y, event); end
-  #  def on_click(event); end
-  #  def on_key_up(event); end
-  #  def draw(destination); end
-  #  def on_network(event); end
-  #  def update(time);end
-
   end
 end
 

data/lib/rubygoo/label.rb

@@ -1,3 +1,4 @@
+require 'publisher'
 module Rubygoo
   class Label < Widget
     def initialize(text, opts={})
@@ -23,22 +24,26 @@ module Rubygoo
       @rect = Rect.new [@x,@y,@rendered_text.width+@x_pad,@rendered_text.height+@y_pad]
     end
 
-    def draw(screen)
+    def draw(adapter)
+      x1 = @rect[0]
+      y1 = @rect[1]
+      x2 = @rect[2] + x1
+      y2 = @rect[3] + y1
       if @focussed
-        screen.fill @focus_color, @rect
+        adapter.fill x1, y1, x2, y2, @focus_color
       elsif @bg_color
-        screen.fill @bg_color, @rect
+        adapter.fill x1, y1, x2, y2, @bg_color
       end
 
       if @border_color
-        x1 = @rect[0]
-        y1 = @rect[1]
-        x2 = @rect[2] + x1
-        y2 = @rect[3] + y1
-        screen.draw_box x1, y1, x2, y2, @border_color
+        adapter.draw_box x1, y1, x2, y2, @border_color
       end
 
-      screen.draw_image @rendered_text, @x, @y, @color
+      adapter.draw_image @rendered_text, @x, @y, @color
+    end
+
+    def tab_to?()
+      false
     end
   end
 end

data/lib/rubygoo/radio_button.rb

@@ -0,0 +1,29 @@
+module Rubygoo
+  # this is basically a round checkbox
+  class RadioButton < CheckBox
+
+    def draw(adapter)
+      x1 = @rect[0]
+      y1 = @rect[1]
+      x2 = @rect[2] + x1
+      y2 = @rect[3] + y1
+
+      radius = (@rect[2]/2.0).ceil
+
+      if @focussed
+        adapter.draw_circle @rect.centerx, @rect.centery, radius, @focus_color
+      elsif @bg_color
+        adapter.draw_circle @rect.centerx, @rect.centery, radius, @bg_color
+      end
+
+      if @checked
+        adapter.draw_circle_filled @rect.centerx, @rect.centery, radius-@x_pad, @checked_color
+      end
+
+      if @border_color
+        adapter.draw_circle @rect.centerx, @rect.centery, radius, @border_color
+      end
+    end
+  end
+end
+

data/lib/rubygoo/radio_group.rb

@@ -0,0 +1,40 @@
+require 'publisher'
+module Rubygoo
+  # contains radio buttons, allowing only one to be checked at a time
+  class RadioGroup < Container
+
+    def initialize(opts={})
+      # TODO add label, border
+      super opts
+    end
+
+    def add(*widgets)
+      widgets.uniq.each do |w|
+        if w.respond_to? :checked?
+          w.when :checked do |*opts|
+            widget = opts.first
+            if widget.checked?
+              update_group_selection widget
+            end
+          end
+        end
+      end
+
+      super *widgets 
+    end
+
+    def update_group_selection(selected_widget)
+      @widgets.each do |w|
+        if w.respond_to? :checked?
+          if w.checked?
+            unless selected_widget == w
+              w.uncheck
+            end
+          end
+        end
+      end
+    end
+  end
+
+end
+

data/lib/rubygoo/tab_group.rb

@@ -0,0 +1,67 @@
+module Rubygoo
+  # this class represents a collection of widgets that can be
+  # tabbed through
+  class TabGroup
+    attr_accessor :selected_index, :widgets
+
+    def initialize()
+      @widgets = []
+      @selected_index = 1
+    end
+
+    def add(*widgets)
+
+      widgets.uniq.each do |w|
+        unless @widgets.include? w
+          if w.tab_to?
+            @widgets << w
+            w.focus_priority = @widgets.size unless w.focus_priority
+          else
+             if w.respond_to? :widgets and w.widgets.size > 0
+              add *w.widgets
+             end
+             if w.respond_to? :queued_widgets and w.queued_widgets.size > 0
+              add *w.queued_widgets
+             end
+          end
+        end
+      end
+
+      @widgets.sort_by {|w| w.focus_priority}
+
+    end
+
+    def remove(*widgets)
+      widgets.uniq.each do |w|
+        @widgets.delete(w)
+      end
+    end
+
+    def next()
+      rotate 1
+    end
+
+    def previous()
+      rotate -1
+    end
+
+    def focus(w)
+      index = @widgets.index w
+      if index
+        @widgets[@selected_index].unfocus if @widgets[@selected_index]
+        @selected_index = index
+        @widgets[@selected_index].focus
+      end
+    end
+
+    def rotate(dir)
+      if @widgets.size > 0
+        @widgets[@selected_index].unfocus if @widgets[@selected_index]
+        @selected_index += dir
+        @selected_index %= @widgets.size
+        @widgets[@selected_index].focus
+      end
+    end
+
+  end
+end