topinambour 2.0.4 → 2.0.6

data/lib/color_selector.rb

@@ -14,26 +14,29 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
-TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow,
-                        :blue, :magenta, :cyan, :white, :brightblack,
-                        :brightred, :brightgreen, :brightyellow, :brightblue,
-                        :brightmagenta, :brightcyan, :brightwhite
-                       ]
+TERMINAL_COLOR_NAMES = [:black, :red, :green, :yellow,
+                        :blue, :magenta, :cyan, :white]
 
-class TopinambourColorSelector < Gtk::Box
+class TopinambourColorSelector < Gtk::Grid
   attr_reader :colors
   def initialize(window)
     @window = window
-    super(:horizontal, 0)
+    super()
 
     reset_button = generate_reset_button
-    pack_start(reset_button, :expand => false, :fill => false, :padding => 0)
+    attach(reset_button, 0, 0, 1, 1)
 
     initialize_default_colors
     add_color_selectors
 
     save_button = generate_save_button
-    pack_start(save_button, :expand => false, :fill => false, :padding => 0)
+    attach(save_button, 0, 1, 1, 1)
+
+    import_button = generate_import_button
+    attach(import_button, 10, 0, 1, 1)
+
+    export_button = generate_export_button
+    attach(export_button, 10, 1, 1, 1)
 
     show_all
     set_halign(:center)
@@ -43,6 +46,83 @@ class TopinambourColorSelector < Gtk::Box
 
   private
 
+  def generate_import_export_button(name, save_in=nil)
+    button = ColorSchemeSelector.new(name, @window, save_in)
+    button.signal_connect "clicked" do |widget|
+      filename = widget.run_chooser_dialog
+      if filename then
+        yield filename if block_given?
+      end
+      widget.chooser_destroy
+    end
+    button
+  end
+
+  def generate_import_button
+    generate_import_export_button("Import") do |filename|
+      file = File.read(filename)
+
+      foreground = file[/\*\.?foreground:\s*(.*)/, 1]
+      child = get_child_at(1, 0)
+      child.rgba = Gdk::RGBA.parse(foreground) unless foreground.nil?
+      @colors[0] = child.rgba
+
+      background = file[/\*\.?background:\s*(.*)/, 1]
+      child = get_child_at(1, 1)
+      child.rgba =  Gdk::RGBA.parse(background) unless background.nil?
+      @colors[1] = child.rgba
+      #
+      # Normal colors top row
+      TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+        color = file[/\*\.?color#{i}:\s*(.*)/, 1]
+        child = get_child_at(2 + i, 0)
+        child.rgba = Gdk::RGBA.parse(color) unless color.nil?
+        @colors[2 + i] = child.rgba
+      end
+
+      # Bright colors bottom row
+      TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+        color = file[/\*\.?color#{i + 8}:\s*(.*)/, 1]
+        child = get_child_at(2 + i, 1)
+        child.rgba = Gdk::RGBA.parse(color) unless color.nil?
+        @colors[10 + i] = child.rgba
+      end
+      apply_new_colors
+    end
+  end
+
+  def double_to_hex(d)
+    (d * 255).to_i.to_s(16)
+  end
+
+  def rgba_to_hex_string(rgba)
+    "##{double_to_hex(rgba.red)}#{double_to_hex(rgba.green)}#{double_to_hex(rgba.blue)}"
+  end
+
+  def generate_export_button
+    generate_import_export_button("Export", "untitled") do |filename|
+      File.open(filename, 'a') do |file|
+        child = get_child_at(1, 0)
+        file.puts "*.foreground: #{rgba_to_hex_string(child.rgba)}"
+
+        child = get_child_at(1, 1)
+        file.puts "*.background: #{rgba_to_hex_string(child.rgba)}"
+
+        # Normal colors top row
+        TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+          child = get_child_at(2 + i, 0)
+          file.puts "*.color#{i}: #{rgba_to_hex_string(child.rgba)}"
+        end
+
+        # Bright colors bottom row
+        TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+          child = get_child_at(2 + i, 1)
+          file.puts "*.color#{i + 8}: #{rgba_to_hex_string(child.rgba)}"
+        end
+      end
+    end
+  end
+
   def initialize_default_colors
     colors_strings = @window.application.settings["colorscheme"]
     @default_colors = colors_strings.map {|c| Gdk::RGBA.parse(c) }
@@ -53,8 +133,19 @@ class TopinambourColorSelector < Gtk::Box
     button = Gtk::Button.new(:label => "Reset")
     button.signal_connect "clicked" do
       initialize_default_colors
-      children[1..-2].each_with_index do |child, i|
-        child.rgba = @default_colors[i]
+      # foreground
+      get_child_at(1, 0).rgba = @default_colors[0]
+      # background
+      get_child_at(1, 1).rgba = @default_colors[1]
+
+      # Normal colors top row
+      TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+        get_child_at(2 + i, 0).rgba = @default_colors[2 + i]
+      end
+
+      # Bright colors bottom row
+      TERMINAL_COLOR_NAMES.each_with_index do |_, i|
+        get_child_at(2 + i, 1).rgba = @default_colors[10 + i]
       end
       apply_new_colors
     end
@@ -64,7 +155,7 @@ class TopinambourColorSelector < Gtk::Box
   def apply_new_properties
     colors_strings = @colors.map { |c| c.to_s }
     @window.application.settings["colorscheme"] = colors_strings
-    @window.terminal.colors
+    @window.terminal.load_colors
     @window.terminal.load_settings
   end
 
@@ -72,22 +163,32 @@ class TopinambourColorSelector < Gtk::Box
     button = Gtk::Button.new(:label => "Save")
     button.signal_connect "clicked" do |widget|
       apply_new_properties
-      button.toplevel.exit_overlay_mode
+      @window.exit_overlay_mode
     end
     button
   end
 
+  def add_color_selector(name, i, position=nil)
+    color_sel = Gtk::ColorButton.new(@default_colors[i])
+    color_sel.title = name.to_s
+    color_sel.name = "topinambour-button-#{name}"
+    color_sel.tooltip_text = name.to_s
+    color_sel.signal_connect "color-set" do
+      @colors[i] = color_sel.rgba
+      apply_new_colors
+    end
+    attach(color_sel, position[0], position[1], 1, 1)
+  end
+
   def add_color_selectors
+    add_color_selector("foreground", 0, [1, 0])
+    add_color_selector("background", 1, [1, 1])
     TERMINAL_COLOR_NAMES.each_with_index do |name, i|
-      color_sel = Gtk::ColorButton.new(@default_colors[i])
-      color_sel.title = name.to_s
-      color_sel.name = "topinambour-button-#{name}"
-      color_sel.tooltip_text = name.to_s
-      color_sel.signal_connect "color-set" do
-        @colors[i] = color_sel.rgba
-        apply_new_colors
-      end
-      pack_start(color_sel, :expand => false, :fill => false, :padding => 0)
+      add_color_selector(name, i + 2, [2 + i, 0])
+    end
+
+    TERMINAL_COLOR_NAMES.each_with_index do |name, i|
+      add_color_selector("bright#{name}", i + 10, [2 + i, 1])
     end
   end
 
@@ -95,3 +196,28 @@ class TopinambourColorSelector < Gtk::Box
     @window.terminal.colors = @colors
   end
 end
+
+class ColorSchemeSelector < Gtk::Button
+  def initialize(label, parent, save_in)
+    @parent = parent
+    @save_in = save_in
+    @action = @save_in.nil? ? :open : :save
+    super(:label => label)
+  end
+
+  def run_chooser_dialog
+    @dialog = Gtk::FileChooserDialog.new(:title => label,
+                                         :parent => @parent,
+                                         :action => @action,
+                                         :buttons => [[label, :ok],
+                                                      ["Cancel", :cancel]])
+    @dialog.current_name = @save_in unless @save_in.nil?
+    if @dialog.run == :ok then
+      @dialog.filename
+    end
+  end
+
+  def chooser_destroy
+    @dialog.destroy
+  end
+end

data/lib/font_selector.rb

@@ -13,38 +13,60 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
+
+## Widget used to choose the font at runtime in a Gtk::Layout
+#
 class TopinambourFontSelector < Gtk::Box
   attr_reader :font
   def initialize(window)
+    super(:horizontal, 0)
+    configure
     @window = window
     @font = @window.terminal.font
-    super(:horizontal, 0)
+    add_buttons
+    show_all
+  end
+
+  private
+
+  def configure
+    set_name('topinambour-font-selector')
+    set_halign(:center)
+    set_valign(:end)
+  end
 
-    reset_button = Gtk::Button.new(:label => "Reset")
-    reset_button.signal_connect "clicked" do
+  def generate_reset_button
+    @reset_button = Gtk::Button.new(label: 'Reset')
+    @reset_button.signal_connect 'clicked' do
       @window.terminal.font = @font.to_s
     end
-    pack_start(reset_button, :expand => false, :fill => false, :padding => 0)
+  end
 
-    font_button = Gtk::FontButton.new
-    font_button.font = @font.to_s
-    font_button.show_style = true
-    font_button.show_size = true
-    font_button.use_font = true
-    font_button.use_size = false
-    font_button.signal_connect "font-set" do
-      @window.terminal.font = font_button.font_name
+  def generate_font_button
+    @font_button = Gtk::FontButton.new
+    @font_button.font = @font.to_s
+    @font_button.show_style = true
+    @font_button.show_size = true
+    @font_button.use_font = true
+    @font_button.use_size = false
+    @font_button.signal_connect 'font-set' do
+      @window.terminal.font = @font_button.font_name
     end
-    pack_start(font_button, :expand => false, :fill => false, :padding => 0)
+  end
 
-    save_button = Gtk::Button.new(:label => "Quit")
-    save_button.signal_connect "clicked" do
-      toplevel.exit_overlay_mode
+  def generate_save_button
+    @save_button = Gtk::Button.new(label: 'Quit')
+    @save_button.signal_connect 'clicked' do
+      @window.overlay.exit_overlay_mode
     end
-    pack_start(save_button, :expand => false, :fill => false, :padding => 0)
-    set_name("topinambour-font-selector")
-    show_all
-    set_halign(:center)
-    set_valign(:end)
+  end
+
+  def add_buttons
+    generate_reset_button
+    pack_start(@reset_button, expand: false, fill: false, padding: 0)
+    generate_font_button
+    pack_start(@font_button, expand: false, fill: false, padding: 0)
+    generate_save_button
+    pack_start(@save_button, expand: false, fill: false, padding: 0)
   end
 end

data/lib/preferences.rb

@@ -37,13 +37,17 @@ class TopinambourPreferences < Gtk::Window
     def on_width_spin_value_changed_cb(spin)
       parent = spin.toplevel.transient_for
       height = parent.application.settings["height"]
-      parent.resize(spin.value, height)
+      terminal = parent.terminal
+      terminal.set_size(spin.value, height)
+      parent.resize(*terminal.size)
     end
 
     def on_height_spin_value_changed_cb(spin)
       parent = spin.toplevel.transient_for
       width = parent.application.settings["width"]
-      parent.resize(width, spin.value)
+      terminal = parent.terminal
+      terminal.set_size(width, spin.value)
+      parent.resize(*terminal.size)
     end
 
     def on_shell_entry_activate_cb(entry)

data/lib/profile.rb

@@ -0,0 +1,62 @@
+# Copyright 2018 Cedric LE MOIGNE, cedlemo@gmx.com
+# This file is part of Topinambour.
+#
+# Topinambour is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# any later version.
+#
+# Topinambour is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
+
+##
+# Session or Profile class
+# Allow to switch easily between different configurations.
+class Profile
+  attr_accessor :name,
+                :terminal_options,
+                :vte_options
+  def initialize(terminal_options, vte_options)
+    @terminal_options = terminal_options
+    @vte_options = vte_options
+  end
+
+  ## TODO : use json
+  def save
+    # File.open("#{DATA_HOME_DIR}/#{@name}", 'w+') do |f|
+    #   Marshal.dump(self, f)
+    # end
+  end
+
+  def load
+    # File.open("#{DATA_HOME_DIR}/#{@name}") do |f|
+    #   session = Marshal.load(f)
+    #   @terminal_options = session.terminal_options
+    #   @vte_options = session.vte_options
+    # end
+  end
+end
+
+TerminalOptions = Struct.new(:colorscheme,
+                             :default_scheme,
+                             :font,
+                             :width,
+                             :height,
+                             :custom_css,
+                             :css_file)
+
+VteOptions = Struct.new(:allow_bold,
+                        :audible_bell,
+                        :scroll_on_output,
+                        :scroll_on_keystroke,
+                        :rewrap_on_resize,
+                        :mouse_autohide,
+                        :cursor_shape,
+                        :cursor_blink_mode,
+                        :backspace_binding,
+                        :delete_binding)

data/lib/shortcuts.rb

@@ -24,8 +24,8 @@ module TopinambourShortcuts
   def self.handle_simple(event, window)
     case event.keyval
     when Gdk::Keyval::KEY_Escape # escape from overlay mode
-      if window.in_overlay_mode?
-        window.exit_overlay_mode
+      if window.overlay.in_overlay_mode?
+        window.overlay.exit_overlay_mode
         window.terminal.grab_focus
         true
       end
@@ -34,9 +34,6 @@ module TopinambourShortcuts
 
   def self.handle_ctrl_shift(event, window)
     case event.keyval
-    when Gdk::Keyval::KEY_W # close the current tab
-      window.close_current_tab
-      true
     when Gdk::Keyval::KEY_Q # Quit
       window.quit_gracefully
       true

data/lib/terminal.rb

@@ -19,13 +19,13 @@
 
 class TopinambourTermBox < Gtk::Box
   attr_reader :term
-  def initialize(command_string, working_dir = nil)
+  def initialize(command_string, working_dir = nil, parent)
     super(:horizontal, 0)
-    set_name("topinambour-term-box")
-    @term = TopinambourTerminal.new(command_string, working_dir)
+    set_name('topinambour-term-box')
+    @term = TopinambourTerminal.new(command_string, parent, working_dir)
     @scrollbar = Gtk::Scrollbar.new(:vertical, @term.vadjustment)
-    @scrollbar.name = "topinambour-scrollbar"
-    pack_start(@term, :expand => true, :fill => true, :padding => 0)
+    @scrollbar.name = 'topinambour-scrollbar'
+    pack_start(@term, expand: true, fill: true, padding: 0)
     pack_start(@scrollbar)
     show_all
   end
@@ -34,22 +34,26 @@ end
 ##
 # The default vte terminal customized
 class TopinambourTerminal < Vte::Terminal
-  attr_reader :pid, :menu, :regexes, :last_match
+  attr_reader :pid, :menu, :last_match
+  REGEXES = [:REGEX_URL_AS_IS, :REGEX_URL_FILE, :REGEX_URL_HTTP,
+             :REGEX_URL_VOIP, :REGEX_EMAIL, :REGEX_NEWS_MAN, :CSS_COLORS]
 
   ##
   # Create a new TopinambourTerminal instance that runs command_string
-  def initialize(command_string, working_dir = nil)
+  def initialize(command_string, toplevel, working_dir = nil)
     super()
-    set_name("topinambour-terminal")
+    @toplevel = toplevel
+    @settings = toplevel.application.settings
+    set_name('topinambour-terminal')
     command_array = parse_command(command_string)
     rescued_spawn(command_array, working_dir)
 
-    signal_connect "child-exited" do |widget|
-      toplevel.application.quit
-    end
+    signal_connect('child-exited') {@toplevel.quit_gracefully}
 
+    load_settings
+    add_matches
     add_popup_menu
-    configure
+    handle_mouse_clic
   end
 
   def pid_dir
@@ -60,20 +64,39 @@ class TopinambourTerminal < Vte::Terminal
     @custom_title.class == String ? @custom_title : window_title.to_s
   end
 
+  def size
+    col = column_count
+    char_w = char_width
+    row = row_count
+    char_h = char_height
+    [col * char_w, row * char_h]
+  end
+
+  ######################################
+  # Methods used to load Gio::Settings #
+  ######################################
+
   def load_settings
-    colors
+    load_colors
     set_colors(@colors[0], @colors[1], @colors[2..-1])
-    set_font(font)
+    set_font(load_font)
+    set_size(*load_size_settings)
+  end
+
+  def load_size_settings
+    h = @settings['height']
+    w = @settings['width']
+    [w, h]
   end
 
-  def colors
-    colors_strings = toplevel.application.settings["colorscheme"]
+  def load_colors
+    colors_strings = @settings['colorscheme']
     @colors = colors_strings.map { |c| Gdk::RGBA.parse(c) }
     @colors
   end
 
-  def font
-    font_str = toplevel.application.settings["font"]
+  def load_font
+    font_str = @settings['font']
     @font = Pango::FontDescription.new(font_str)
   end
 
@@ -82,7 +105,7 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def font=(font_str)
-    toplevel.application.settings["font"] = font_str
+    @settings['font'] = font_str
     font = Pango::FontDescription.new(font_str)
     set_font(font)
     @font = font
@@ -90,6 +113,10 @@ class TopinambourTerminal < Vte::Terminal
 
   private
 
+  ##############################
+  # Terminal command functions #
+  ##############################
+
   def parse_command(command_string)
     GLib::Shell.parse(command_string)
   rescue GLib::ShellError => e
@@ -99,26 +126,45 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def rescued_spawn(command_array, working_dir)
-    @pid = spawn(:argv => command_array,
-                 :working_directory => working_dir,
-                 :spawn_flags => GLib::Spawn::SEARCH_PATH)
+    @pid = spawn(argv: command_array,
+                 working_directory: working_dir,
+                 spawn_flags: GLib::Spawn::SEARCH_PATH)
   rescue => e
     STDERR.puts e.message
   end
 
+  ###########################
+  # Regexes related methods #
+  ###########################
+
+  def add_matches
+    REGEXES.each do |name|
+      regex_name = TopinambourRegex.const_get(name)
+      regex = if Vte::Regex
+                Vte::Regex.new(regex_name, Pcre2::ALL_FLAGS, for_match: true)
+              else
+                compile_options = %i[optimize multiline]
+                GLib::Regex.new(regex_name, compile_options: compile_options)
+              end
+      match_add_regex(regex, 0)
+    end
+  end
+
   def add_popup_menu
-    ui = "/com/github/cedlemo/topinambour/terminal-menu.ui"
-    builder = Gtk::Builder.new(:resource => ui)
-    @menu = Gtk::Popover.new(self, builder["termmenu"])
+    ui = '/com/github/cedlemo/topinambour/terminal-menu.ui'
+    builder = Gtk::Builder.new(resource: ui)
+    @menu = Gtk::Popover.new(self, builder['termmenu'])
+  end
 
-    signal_connect "button-press-event" do |widget, event|
+  def handle_mouse_clic
+    signal_connect 'button-press-event' do |widget, event|
       if event.type == Gdk::EventType::BUTTON_PRESS &&
          event.button == Gdk::BUTTON_SECONDARY
         manage_regex_on_right_click(widget, event)
-        display_copy_past_menu(widget, event)
+        display_copy_past_menu(event)
         true
       elsif event.button == Gdk::BUTTON_PRIMARY
-        manage_regex_on_click(widget, event)
+        manage_regex_on_left_click(widget, event)
         false # let false so that it doesn't block the event
       else
         false
@@ -126,66 +172,37 @@ class TopinambourTerminal < Vte::Terminal
     end
   end
 
-  def configure
-    set_rewrap_on_resize(true)
-    set_scrollback_lines(-1)
-    search_set_wrap_around(true)
-    add_matches
-  end
-
-  def add_matches
-    @regexes = [:REGEX_URL_AS_IS, :REGEX_URL_FILE, :REGEX_URL_HTTP,
-                :REGEX_URL_VOIP, :REGEX_EMAIL, :REGEX_NEWS_MAN,
-                :CSS_COLORS]
-    @regexes.each do |name|
-      regex_name = TopinambourRegex.const_get(name)
-      flags = [:optimize,
-               :multiline]
-      if Vte::Regex
-        # PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_MULTILINE
-        pcre2_utf = "0x00080000".to_i(16)
-        pcre2_no_utf_check = "0x40000000".to_i(16)
-        pcre2_multiline = "0x00000400".to_i(16)
-        flags = pcre2_utf | pcre2_no_utf_check | pcre2_multiline
-        regex = Vte::Regex.new(regex_name, flags, :for_match => true)
-        match_add_regex(regex, 0)
-      else
-        regex = GLib::Regex.new(regex_name, :compile_options => flags)
-        match_add_gregex(regex, 0)
-      end
-    end
+  def manage_regex_on_right_click(_widget, event)
+    @last_match, _regex_type = match_check_event(event)
   end
 
-  def display_copy_past_menu(widget, event)
+  def display_copy_past_menu(event)
     x, y = event.window.coords_to_parent(event.x,
                                          event.y)
     rect = Gdk::Rectangle.new(x - allocation.x,
                               y - allocation.y,
                               1,
                               1)
-    widget.menu.set_pointing_to(rect)
-    widget.menu.show
-  end
-
-  def manage_regex_on_right_click(_widget, event)
-    @last_match, _regex_type = match_check_event(event)
+    @menu.set_pointing_to(rect)
+    @menu.show
   end
 
-  def manage_regex_on_click(_widget, event)
+  def manage_regex_on_left_click(widget, event)
     match, regex_type = match_check_event(event)
     return nil if regex_type == -1
-    case @regexes[regex_type]
+    case REGEXES[regex_type]
     when :REGEX_EMAIL
-      launch_default_for_regex_match("mailto:" + match, @regexes[regex_type])
+      launch_default_for_regex_match('mailto:' + match, REGEXES[regex_type])
     when :REGEX_URL_HTTP
-      launch_default_for_regex_match("http://" + match, @regexes[regex_type])
+      launch_default_for_regex_match('http://' + match, REGEXES[regex_type])
     when :CSS_COLORS
       launch_color_visualizer(match)
     else
-      launch_default_for_regex_match(match, @regexes[regex_type])
+      launch_default_for_regex_match(match, REGEXES[regex_type])
     end
   end
 
+  # Open default application on a left click.
   def launch_default_for_regex_match(match, regex_type)
     Gio::AppInfo.launch_default_for_uri(match)
   rescue => e
@@ -193,8 +210,8 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def launch_color_visualizer(color_name)
-    dialog = Gtk::ColorChooserDialog.new(:title => color_name,
-                                         :parent => parent.toplevel)
+    dialog = Gtk::ColorChooserDialog.new(title: color_name,
+                                         parent: parent.toplevel)
     dialog.show_editor = true
     dialog.use_alpha = true
     dialog.rgba = Gdk::RGBA.parse(color_name)