reterm 0.4.2 → 0.5.0

data/designer/src/component_map.rb

@@ -1,4 +1,11 @@
 COMPONENTS = {
+  :generic => {
+    :params => {
+      "Fill"   => :bool,
+      "Expand" => :bool
+    }
+  },
+
   # Layouts
   :Horizontal => {
     :desc => "Horizontal Layout",

data/designer/src/file_chooser.rb

@@ -0,0 +1,25 @@
+class FileChooser
+  def initialize(window)
+    @window = window
+  end
+
+  def show
+		dialog = Gtk::FileChooserDialog.new(
+               :title  => "Save File",
+               :parent => @window,
+               :action => Gtk::FileChooserAction::SAVE,
+               :back   => nil,
+               :buttons => [
+                 [Gtk::Stock::CANCEL, Gtk::ResponseType::CANCEL],
+                 [Gtk::Stock::OPEN,   Gtk::ResponseType::ACCEPT]
+               ])
+
+
+    file = (dialog.run == Gtk::ResponseType::ACCEPT) ?
+            dialog.filename :  nil
+
+		dialog.destroy
+
+    file
+  end
+end

data/designer/src/glade/Designer.glade

@@ -33,15 +33,6 @@
                         <property name="use_stock">True</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="file_menu_open">
-                        <property name="label">gtk-open</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkImageMenuItem" id="file_menu_save">
                         <property name="label">gtk-save</property>
@@ -51,15 +42,6 @@
                         <property name="use_stock">True</property>
                       </object>
                     </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="file_menu_save_as">
-                        <property name="label">gtk-save-as</property>
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="use_stock">True</property>
-                      </object>
-                    </child>
                     <child>
                       <object class="GtkSeparatorMenuItem">
                         <property name="visible">True</property>
@@ -90,7 +72,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <child>
-                      <object class="GtkImageMenuItem">
+                      <object class="GtkImageMenuItem" id="help_menu_about">
                         <property name="label">gtk-about</property>
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>

data/lib/reterm.rb

@@ -7,16 +7,25 @@ require 'reterm/init'
 require 'reterm/color_pair'
 
 require 'reterm/mixins/event_dispatcher'
+require 'reterm/mixins/mouse_input'
+require 'reterm/mixins/common_controls'
+require 'reterm/mixins/common_keys'
 require 'reterm/mixins/component_input'
+require 'reterm/mixins/nav_controls'
 require 'reterm/mixins/nav_input'
 require 'reterm/mixins/cdk_component'
+require 'reterm/mixins/item_helpers'
+require 'reterm/mixins/key_bindings'
+require 'reterm/mixins/button_helpers'
+require 'reterm/mixins/log_helpers'
 
 require 'reterm/terminal'
 require 'reterm/window'
 require 'reterm/panel'
-require 'reterm/menu'
 
 require 'reterm/components'
 require 'reterm/layouts'
 
 require 'reterm/loader'
+require 'reterm/util'
+require 'reterm/config'

data/lib/reterm/color_pair.rb

@@ -7,8 +7,74 @@ module RETerm
     attr_accessor :id
     attr_accessor :tags
 
-    attr_accessor :fg
-    attr_accessor :bg
+    # Color Identifiers
+    attr_accessor :fg,  :bg
+
+    # Actual NCurses colors
+    attr_accessor :fgc, :bgc
+
+    # Return color in CDK format
+    def cdk_fmt
+      "</#{@id}>"
+    end
+
+    def self.builtin
+      @builtin ||=  Ncurses.constants.select { |c|
+                      c =~ /^COLOR.*/
+                    }.collect { |c|
+                      c.to_s.gsub("COLOR_", "").downcase.intern
+                    }
+    end
+
+    def self.default_bkgd
+      @dbkgd ||= Ncurses::WINDOW.new(1, 1, 1, 1).getbkgd
+    end
+
+    def self.default_bkgd_char
+      @dbkgdch ||= default_bkgg & Ncurses::A_CHARTEXT
+    end
+
+    def self.default_bkgd_color
+      @dbkgdco ||= ((default_bkgd & Ncurses::A_COLOR) >> 8)
+    end
+
+    def self.default_fg
+      @dfg ||= begin
+        f, b = [], []
+        Ncurses::pair_content(default_bkgd_color, f, b)
+        f.first
+      end
+    end
+
+    def self.default_bg
+      @dbg ||= begin
+        f, b = [], []
+        Ncurses::pair_content(default_bkgd_color, f, b)
+        b.first
+      end
+    end
+
+    def self.default_color
+      @dcp ||= register default_fg, default_bg
+    end
+
+    # Reserves and returns block of N colors
+    def self.reserve(n=1)
+      @reserved   ||= []
+      @next_color ||= 50
+
+      0.upto(n) {
+        @reserved   << @next_color
+        @next_color += 1
+      }
+
+      @reserved[-n..-1]
+    end
+
+    # Alias for reserve
+    def self.next_color
+      reserve
+    end
 
     # Redefined system RGB color. Color name should be specified
     # as well as new RGB components
@@ -19,7 +85,57 @@ module RETerm
     # @param [Integer] g value to assign to green component
     # @param [Integer] b value to assign to blue component
     def self.change(color, r, g, b)
-      Ncurses::init_color Ncurses.const_get("COLOR_#{color.to_s.upcase}"), r, g, b
+      # XXX shoehorning 256 colors into ncurses 0-1000 scale here,
+      # possible explore if alternative solutions are better
+      r = r.to_f / 255 * 1000
+      g = g.to_f / 255 * 1000
+      b = b.to_f / 255 * 1000
+
+      c = builtin.include?(color.to_s.downcase.intern)    ?
+          Ncurses.const_get("COLOR_#{color.to_s.upcase}") : color
+
+      Ncurses::init_color c, r, g, b
+    end
+
+    # An alias for #change
+    def self.define(color, r, g, b)
+      change(color, r, g, b)
+    end
+
+    # Return RGB components corresponding to system color
+    #
+    # @param [String, Symbol] color name of color to return
+    def self.get(color)
+      c = builtin.include?(color.to_s.downcase.intern)    ?
+          Ncurses.const_get("COLOR_#{color.to_s.upcase}") : color
+
+      r, g, b = [[],[],[]]
+      Ncurses::color_content c, r, g, b
+
+      [r.first, g.first, b.first]
+    end
+
+    # Temporarily resassign RGB to named color, invoke callback
+    # block, and restore to original
+    # @param [Hash<String,Symbol,Array<Integer>>] colors color assignments
+    #   to use, mapping of color names to RBG pairs
+    # @param [Integer] r value to assign to red component
+    # @param [Integer] g value to assign to green component
+    # @param [Integer] b value to assign to blue component
+    def self.use(colors={})
+      orig = {}
+      colors.each { |n, rgb|
+        orig[n] = get(n)
+        change(n, *rgb)
+      }
+
+      yield
+
+      colors.each { |n, rgb|
+        change(n, *orig[n])
+      }
+
+      nil
     end
 
     # Instantiate a new ColorPair, specifying foreground and background
@@ -40,12 +156,28 @@ module RETerm
 
       # FIXME need to verify input is in valid domain
       # before conveRETermng it to symbol w/ "intern"
-      fg = fg.to_s.downcase.intern
-      bg = bg.to_s.downcase.intern
+      fg = fg.to_s.downcase.intern if fg.is_a?(String) || fg.is_a?(Symbol)
+      bg = bg.to_s.downcase.intern if bg.is_a?(String) || bg.is_a?(Symbol)
+      @fg, @bg = fg, bg
+
+      fgc = fg.is_a?(Symbol) ? Ncurses.const_get("COLOR_#{fg.to_s.upcase}") : fg
+      bgc = bg.is_a?(Symbol) ? Ncurses.const_get("COLOR_#{bg.to_s.upcase}") : bg
+
+      @fgc, @bgc = fgc, bgc
 
-      Ncurses.init_pair(@id,
-        Ncurses.const_get("COLOR_#{fg.to_s.upcase}"),
-        Ncurses.const_get("COLOR_#{bg.to_s.upcase}"))
+      Ncurses.init_pair(@id, fgc, bgc)
+    end
+
+    # Returns ncurses color pair corresponding to this instance
+    def nc
+      Ncurses::COLOR_PAIR(@id)
+    end
+
+    # Encapsulates window operation in color pair attribute
+    def format(win)
+      win.win.attron(nc)
+      yield
+      win.win.attroff(nc)
     end
 
     # Create and store a new Color Pair in a static
@@ -56,11 +188,35 @@ module RETerm
       @@registry.last
     end
 
-    # Return first Color Pair found with the given tag
+    # Return all colors pairs
+    def self.all
+      @@registry ||= []
+      @@registry
+    end
+
+    # Return Color Pairs found with the given tag
     # or nil for no matches
     def self.for(tag)
       @@registry ||= []
-      @@registry.find { |cp| cp.tags.include?(tag) }
+      @@registry.select { |cp| cp.tags.include?(tag) }
+    end
+
+    # Return Color Pairs found with the given
+    # fg color
+    def self.with_fg(color)
+      @@registry ||= []
+      @@registry.select { |cp|
+        color == (color.is_a?(Symbol) ? cp.fg : cp.fgc)
+      }
+    end
+
+    # Return Color Pairs found with the given
+    # bg color
+    def self.with_bg(color)
+      @@registry ||= []
+      @@registry.select { |cp|
+        color == (color.is_a?(Symbol) ? cp.bg : cp.bgc)
+      }
     end
   end # class ColorPair
 end # module RETerm

data/lib/reterm/component.rb

@@ -2,7 +2,35 @@ module RETerm
   # A Component is a generic widget container associated with a window.
   # Subclasses each implement a specific UI artifact.
   class Component
-      attr_accessor :window
+    include EventDispatcher
+    include LogHelpers
+    include KeyBindings
+
+      attr_reader :window
+
+      def window=(w)
+        @window = w
+        dispatch(:window_assigned)
+        w
+      end
+
+      def initialize(args={})
+        self.highlight_focus = args[:highlight_focus] if args.key?(:highlight_focus)
+        self.activate_focus  = args[:activate_focus]  if args.key?(:activate_focus)
+        init_cdk(args) if cdk?
+      end
+
+      # This method is invoked when adding component to layout
+      # to determine rows needed
+      def requested_rows
+        1
+      end
+
+      # This method is invoked when adding component to layout
+      # to determine cols needed
+      def requested_cols
+        1
+      end
 
       # This method is invoked to cleanup the component on shutdown.
       # It should be be overriden by subclasses that needs to clean
@@ -33,8 +61,67 @@ module RETerm
       # logic when the user has selected an activatable? component.
       # Should be overriden by interactive subcomponents to
       # process user inpute specific to that component
-      def activate!
+      def activate!(*input)
         raise RuntimeError, "should not be activated"
       end
+
+      # This method is invoked when component loses focus
+      # (when navigating to another component, window closed, etc).
+      # Subclasses may override to hide / cleanup resources
+      def deactivate!
+        @deactivate = true
+      end
+
+      # Flag indicating that this component should
+      # be deactivated
+      def deactivate?
+        !!(@deactivate ||= false)
+      end
+
+      # Reset deactivation
+      def reactivate!
+        @deactivate = false
+      end
+
+      attr_writer :highlight_focus
+
+      # Return boolean indicating if this component should
+      # be highlighted on focus (default true)
+      def highlight_focus?
+        !defined?(@highlight_focus) || @highlight_focus
+      end
+
+      attr_writer :activate_focus
+
+      def activate_focus?
+        defined?(@activate_focus) && @activate_focus
+      end
+
+      # Return extra padding to be given to component
+      def extra_padding
+        (activatable? && highlight_focus?) ? 3 : 0
+      end
+
+      # Method to periodically synchronize component if needed
+      def sync!
+      end
+
+      # Dispatch to window.resize
+      def resize(rows, cols)
+        window.resize(rows, cols)
+        self
+      end
+
+      # Overridden by CDK components
+      def cdk?
+        false
+      end
+
+      def sync_getch
+        c = window.sync_getch
+        c = nil if key_bound?(c) &&
+                   invoke_key_bindings(c)
+        c
+      end
   end # class Component
 end # module RETerm

data/lib/reterm/components.rb

@@ -19,14 +19,29 @@ require 'reterm/components/dial'
 require 'reterm/components/rocker'
 require 'reterm/components/vslider'
 require 'reterm/components/label'
+require 'reterm/components/revealing_label'
 require 'reterm/components/ascii_text'
 require 'reterm/components/image'
+require 'reterm/components/splash'
 
 # cdk
 require 'reterm/components/hslider'
 require 'reterm/components/button'
 require 'reterm/components/dialog'
 require 'reterm/components/radio'
-require 'reterm/components/slist'
+require 'reterm/components/scroll_list'
+require 'reterm/components/select_list'
 require 'reterm/components/entry'
+require 'reterm/components/password_entry'
 require 'reterm/components/matrix'
+require 'reterm/components/drop_down_menu'
+require 'reterm/components/button_box'
+require 'reterm/components/alphalist'
+require 'reterm/components/multi_line_entry'
+require 'reterm/components/histogram'
+require 'reterm/components/scrolling_area'
+
+# additional
+require 'reterm/components/close_button'
+require 'reterm/components/cmd_output'
+require 'reterm/components/youtube'