topinambour 1.0.11 → 1.0.12

data/lib/preferences.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -13,151 +13,196 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
-require "gtksourceview3"
-
-module TopinambourPreferences
-  def self.generate_dialog(parent)
-    resource_file = "/com/github/cedlemo/topinambour/prefs-dialog.ui"
-    builder = Gtk::Builder.new(:resource => resource_file)
-    dialog = builder["Preferences_dialog"]
-    dialog.transient_for = parent
-    add_actions(builder, parent)
-    connect_response(dialog, builder)
-    dialog
-  end
 
-  def self.connect_response(dialog, builder)
-    dialog.signal_connect "response" do |widget, response|
-      case response
-      when 1
-        on_apply_response(widget, builder)
-      else
-        widget.destroy
+class TopinambourPreferences < Gtk::Window
+  type_register
+  class << self
+    def init
+      resource_file = "/com/github/cedlemo/topinambour/prefs-dialog.ui"
+      set_template(:resource => resource_file)
+
+      %w(width_spin height_spin shell_entry audible_bell_switch
+         allow_bold_switch scroll_on_output_switch scroll_on_keystroke_switch
+         rewrap_on_resize_switch mouse_autohide_switch cursor_shape_sel
+         cursor_blink_mode_sel backspace_binding_sel delete_binding_sel
+         css_chooser_button use_custom_css_switch).each do |widget|
+        bind_template_child(widget)
       end
+
+      set_connect_func { |name| method(name) }
     end
-  end
 
-  def self.on_apply_response(widget, builder)
-    props = get_all_properties(widget, builder)
-    toplevel = widget.transient_for
-    toplevel.application.update_css(props)
-    widget.destroy
-  end
+    private
 
-  def self.get_all_properties(widget, builder)
-    props = {}
-    props.merge!(get_entry_value(builder))
-    props.merge!(get_switch_values(builder))
-    props.merge!(get_spin_values(widget))
-    props.merge!(get_combo_values(builder))
-  end
+    def on_width_spin_value_changed_cb(spin)
+      parent = spin.toplevel.transient_for
+      height = parent.application.settings["height"]
+      parent.resize(spin.value, height)
+    end
 
-  def self.add_actions(builder, parent)
-    %w(audible_bell allow_bold scroll_on_output
-       scroll_on_keystroke rewrap_on_resize mouse_autohide).each do |prop_name|
-      gen_switch_actions(prop_name, builder, parent)
+    def on_height_spin_value_changed_cb(spin)
+      parent = spin.toplevel.transient_for
+      width = parent.application.settings["width"]
+      parent.resize(width, spin.value)
     end
-    gen_entry_actions("shell", builder, parent)
-    %w(cursor_shape cursor_blink_mode backspace_binding
-       delete_binding).each do |prop_name|
-      gen_combobox_actions(prop_name, builder, parent)
+
+    def on_shell_entry_activate_cb(entry)
+      style_context = entry.style_context
+
+      if File.exist?(entry.text)
+        settings = entry.toplevel.settings
+        entry.set_icon_from_icon_name(:secondary, nil)
+        style_context.remove_class("error")
+        settings["default-shell"] = entry.text if settings
+      else
+        style_context.add_class("error")
+        entry.set_icon_from_icon_name(:secondary, "dialog-warning-symbolic")
+      end
+    end
+
+    def on_shell_entry_focus_out_event_cb(entry, _)
+      style_context = entry.style_context
+
+      if File.exist?(entry.text)
+        settings = entry.toplevel.settings
+        entry.set_icon_from_icon_name(:secondary, nil)
+        style_context.remove_class("error")
+        settings["default-shell"] = entry.text if settings
+      else
+        style_context.add_class("error")
+        entry.set_icon_from_icon_name(:secondary, "dialog-warning-symbolic")
+      end
+    end
+
+    def on_css_file_selected_cb(filechooser)
+      parent = filechooser.toplevel.transient_for
+      parent.application.settings["css-file"] = filechooser.filename
+      parent.application.reload_css_config
     end
-    gen_spinbuttons_actions(builder, parent)
-  end
 
-  def self.gen_switch_actions(property_name, builder, parent)
-    switch = builder["#{property_name}_switch"]
-    switch.active = parent.notebook.current.term.send("#{property_name}?")
-    switch.signal_connect "state-set" do |_widget, state|
-      parent.notebook.send_to_all_terminals("#{property_name}=", state)
+    def on_custom_css_switch_state_set(switch, _state)
+      parent = switch.toplevel.transient_for
+      setting = "custom-css"
+      settings = parent.application.settings
+      settings[setting] = switch.active?
+      switch.toplevel.css_chooser_button.sensitive = settings[setting]
+      parent.application.reload_css_config
       false
     end
   end
 
-  def self.gen_entry_actions(property_name, builder, parent)
-    entry = builder["#{property_name}_entry"]
-    entry.text = parent.shell
-    entry.set_icon_from_icon_name(:secondary, "edit-clear")
-    entry.signal_connect("activate") { |widget| parent.shell = widget.text }
+  attr_reader :settings
+  def initialize(parent)
+    super(:type => :toplevel)
+    set_transient_for(parent)
+    @parent = parent
 
-    entry.signal_connect "icon-release" do |widget, position|
-      if position == :secondary
-        parent.shell = widget.text = parent.style_get_property(property_name)
-      end
+    configure_headerbar
+
+    signal_connect "delete-event" do |widget|
+      widget.destroy
+      @parent.notebook.current.term.grab_focus
     end
+
+    @settings = @parent.application.settings
+
+    initialize_widgets
   end
 
-  def self.gen_combobox_actions(property_name, builder, parent)
-    combobox = builder["#{property_name}_sel"]
-    id = parent.notebook.current.term.send("#{property_name}").nick + "_id"
-    combobox.active_id = id
-    combobox.signal_connect "changed" do |widget|
-      value = widget.active_id.gsub(/_id/, "").to_sym
-      parent.notebook.send_to_all_terminals("#{property_name}=", value)
-    end
+  private
+
+  def initialize_widgets
+    initialize_use_custom_css_settings
+    bind_spin_buttons_with_settings
+    bind_switches_with_settings
+    bind_combo_boxes_with_settings
+
+    shell_entry.text = @settings["default-shell"]
+
+    css_chooser_button.current_folder = "#{ENV['HOME']}/.config/topinambour/"
+    css_chooser_button.filename = @parent.application.check_css_file_path || ""
   end
 
-  def self.gen_spinbuttons_actions(builder, parent)
-    width_spin = builder["width_spin"]
-    height_spin = builder["height_spin"]
-    width_spin.set_range(0, 2000)
-    height_spin.set_range(0, 1000)
-    width_spin.value, height_spin.value = parent.size
-    gen_width_button_action(width_spin, parent)
-    gen_height_button_action(height_spin, parent)
+  def bind_switches_with_settings
+    bind_switch_state_with_setting(allow_bold_switch, "allow-bold")
+    bind_switch_state_with_setting(audible_bell_switch, "audible-bell")
+    bind_switch_state_with_setting(scroll_on_output_switch, "scroll-on-output")
+    bind_switch_state_with_setting(scroll_on_keystroke_switch,
+                                   "scroll-on-keystroke")
+    bind_switch_state_with_setting(rewrap_on_resize_switch, "rewrap-on-resize")
+    bind_switch_state_with_setting(mouse_autohide_switch, "mouse-autohide")
   end
 
-  def self.gen_width_button_action(spin_widget, parent)
-    spin_widget.signal_connect "value-changed" do |widget|
-      _, h = parent.size
-      parent.resize(widget.value, h)
-      w, _h = parent.size
-      widget.value = w if widget.value + 1 < w
-    end
+  def bind_combo_boxes_with_settings
+    bind_combo_box_with_setting(cursor_shape_sel, "cursor-shape")
+    bind_combo_box_with_setting(cursor_blink_mode_sel, "cursor-blink-mode")
+    bind_combo_box_with_setting(backspace_binding_sel, "backspace-binding")
+    bind_combo_box_with_setting(delete_binding_sel, "delete-binding")
   end
 
-  def self.gen_height_button_action(spin_widget, parent)
-    spin_widget.signal_connect "value-changed" do |widget|
-      w, _h = parent.size
-      parent.resize(w, widget.value)
-      _, h = parent.size
-      widget.value = h if widget.value + 1 < h
-    end
+  def bind_spin_buttons_with_settings
+    bind_spin_button_with_setting(width_spin, "width")
+    bind_spin_button_with_setting(height_spin, "height")
   end
 
-  def self.get_entry_value(builder)
-    text = builder["shell_entry"].text
-    { "-TopinambourWindow-shell" => text }
+  def configure_headerbar
+    headerbar = Gtk::HeaderBar.new
+    headerbar.title = "Topinambour Preferences"
+    headerbar.show_close_button = true
+    set_titlebar(headerbar)
   end
 
-  def self.get_switch_values(builder)
-    props = {}
-    %w(audible_bell allow_bold scroll_on_output
-       scroll_on_keystroke rewrap_on_resize mouse_autohide).each do |prop_name|
-      switch = builder["#{prop_name}_switch"]
-      name = prop_name.tr("_", "-")
-      props["-TopinambourTerminal-#{name}"] = switch.active?
+  def initialize_use_custom_css_settings
+    setting = "custom-css"
+    switch = use_custom_css_switch
+    switch.active = @settings[setting]
+    css_chooser_button.sensitive = @settings[setting]
+  end
+
+  def set_switch_to_initial_state(_switch, setting)
+    state = @settings[setting]
+    m = "#{setting.tr('-', '_')}="
+    @parent.notebook.each do |tab|
+      tab.term.send(m, state)
     end
-    props
   end
 
-  def self.get_combo_values(builder)
-    props = {}
-    %w(cursor_shape cursor_blink_mode backspace_binding
-       delete_binding).each do |prop_name|
-      combobox = builder["#{prop_name}_sel"]
-      value = combobox.active_id.gsub(/_id\z/, "")
-      name = prop_name.tr("_", "-")
-      props["-TopinambourTerminal-#{name}"] = value.to_sym
+  def bind_switch_state_with_setting(switch, setting)
+    set_switch_to_initial_state(switch, setting)
+    @settings.bind(setting,
+                   switch,
+                   "active",
+                   Gio::SettingsBindFlags::DEFAULT)
+    switch.signal_connect "state-set" do |_switch, state|
+      m = "#{setting.tr('-', '_')}="
+      @parent.notebook.each { |tab| tab.term.send(m, state) }
+      false
+    end
+  end
+
+  def set_combo_to_initial_state(_combo_box, setting)
+    active = @settings[setting]
+    m = "#{setting.tr('-', '_')}="
+    @parent.notebook.each { |tab| tab.term.send(m, active) }
+  end
+
+  def bind_combo_box_with_setting(combo_box, setting)
+    set_combo_to_initial_state(combo_box, setting)
+    @settings.bind(setting,
+                   combo_box,
+                   "active",
+                   Gio::SettingsBindFlags::DEFAULT)
+    combo_box.signal_connect "changed" do
+      m = "#{setting.tr('-', '_')}="
+      @parent.notebook.each { |tab| tab.term.send(m, combo_box.active) }
+      false
     end
-    props
   end
 
-  def self.get_spin_values(widget)
-    props = {}
-    w, h = widget.transient_for.size
-    props["-TopinambourWindow-width"] = w
-    props["-TopinambourWindow-height"] = h
-    props
+  def bind_spin_button_with_setting(spin_button, setting)
+    @settings.bind(setting,
+                   spin_button,
+                   "value",
+                   Gio::SettingsBindFlags::DEFAULT)
   end
 end

data/lib/shortcuts.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -22,7 +22,6 @@ module TopinambourShortcuts
   end
 
   def self.handle_simple(event, window)
-    overlay_mode = window.in_overlay_mode?
     case event.keyval
     when Gdk::Keyval::KEY_Escape # escape from overlay mode
       if window.in_overlay_mode?
@@ -62,31 +61,20 @@ module TopinambourShortcuts
     when Gdk::Keyval::KEY_slash
       window.show_searchbar
       true
-    when Gdk::Keyval::KEY_Up
-      window.toggle_shrink
+    when Gdk::Keyval::KEY_Page_Up
+      window.opacity = window.opacity + 0.05
+      true
+    when Gdk::Keyval::KEY_Page_Down
+      window.opacity = window.opacity - 0.05
       true
     end
   end
 
   def self.handle_key_press(window, event)
-    keyval = event.keyval
     if ctrl_shift?(event)
       handle_ctrl_shift(event, window)
     else
       handle_simple(event, window)
     end
   end
-
-  def self.handle_scroll(window, event)
-    if ctrl_shift?(event)
-      case event.direction
-      when Gdk::ScrollDirection::UP
-        window.opacity = window.opacity + 0.05
-        true
-      when Gdk::ScrollDirection::DOWN
-        window.opacity = window.opacity - 0.05
-        true
-      end
-    end
-  end
 end

data/lib/terminal.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -19,7 +19,7 @@
 
 class TopinambourTabTerm < Gtk::Box
   attr_reader :term
-  def initialize(command_string, working_dir=nil)
+  def initialize(command_string, working_dir = nil)
     super(:horizontal, 0)
     set_name("topinambour-tab-term")
     @term = TopinambourTerminal.new(command_string, working_dir)
@@ -31,26 +31,24 @@ class TopinambourTabTerm < Gtk::Box
 end
 ##
 # The default vte terminal customized
-class TopinambourTerminal
+class TopinambourTerminal < Vte::Terminal
   attr_reader :pid, :menu, :regexes, :last_match
-  attr_accessor :preview, :colors, :custom_title
+  attr_accessor :preview, :custom_title
 
   ##
   # Create a new TopinambourTerminal instance that runs command_string
   def initialize(command_string, working_dir = nil)
     super()
-    # TODO: make a begin/rescue like in glib2-2.2.4/sample/shell.rb
-    command_array = GLib::Shell.parse(command_string)
-    @pid = spawn(:argv => command_array,
-                 :working_directory => working_dir,
-                 :spawn_flags => GLib::Spawn::SEARCH_PATH)
+
+    command_array = parse_command(command_string)
+    rescued_spawn(command_array, working_dir)
 
     signal_connect "child-exited" do |widget|
       tabterm = widget.parent
       notebook = tabterm.parent
       current_page = notebook.page_num(tabterm)
       notebook.remove_page(current_page)
-      notebook.toplevel.application.quit unless notebook.n_pages >= 1
+      @application.quit unless notebook.n_pages >= 1
     end
 
     signal_connect "window-title-changed" do |widget|
@@ -59,8 +57,71 @@ class TopinambourTerminal
       when_terminal_title_change if notebook && notebook.current.term == self
     end
 
-    builder = Gtk::Builder.new(:resource =>
-                               "/com/github/cedlemo/topinambour/terminal-menu.ui")
+    add_popup_menu
+    configure
+  end
+
+  def pid_dir
+    File.readlink("/proc/#{@pid}/cwd")
+  end
+
+  def terminal_title
+    @custom_title.class == String ? @custom_title : window_title.to_s
+  end
+
+  def load_settings
+    colors
+    set_colors(@colors[0], @colors[1], @colors[2..-1])
+    set_font(font)
+  end
+
+  def colors
+    colors_strings = application.settings["colorscheme"]
+    @colors = colors_strings.map { |c| Gdk::RGBA.parse(c) }
+    @colors
+  end
+
+  def font
+    font_str = application.settings["font"]
+    @font = Pango::FontDescription.new(font_str)
+  end
+
+  def colors=(colors)
+    set_colors(colors[0], colors[1], colors[2..-1])
+  end
+
+  def font=(font_str)
+    application.settings["font"] = Pango::FontDescription.new(font_str)
+    set_font(font)
+    @font = font
+  end
+
+  def application
+    @application = self.parent.toplevel.application unless @application
+    @application
+  end
+
+  private
+
+  def parse_command(command_string)
+    GLib::Shell.parse(command_string)
+  rescue GLib::ShellError => e
+    STDERR.puts "domain  = #{e.domain}"
+    STDERR.puts "code    = #{e.code}"
+    STDERR.puts "message = #{e.message}"
+  end
+
+  def rescued_spawn(command_array, working_dir)
+    @pid = spawn(:argv => command_array,
+                 :working_directory => working_dir,
+                 :spawn_flags => GLib::Spawn::SEARCH_PATH)
+  rescue => e
+    STDERR.puts e.message
+  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"])
 
     signal_connect "button-press-event" do |widget, event|
@@ -76,28 +137,12 @@ class TopinambourTerminal
         false
       end
     end
-
-    configure
-  end
-
-  def pid_dir
-    File.readlink("/proc/#{@pid}/cwd")
-  end
-
-  def terminal_title
-    @custom_title.class == String ? @custom_title : window_title.to_s
   end
 
-  private
-
   def configure
     set_rewrap_on_resize(true)
     set_scrollback_lines(-1)
     search_set_wrap_around(true)
-    @colors = css_colors
-    set_font(css_font)
-    apply_colors
-    load_properties
     add_matches
   end
 
@@ -149,11 +194,9 @@ class TopinambourTerminal
   end
 
   def launch_default_for_regex_match(match, regex_type)
-    begin
-      Gio::AppInfo.launch_default_for_uri(match)
-    rescue => e
-      puts "error : #{e.message}\n\tfor match: #{match} of type :#{regex_type}"
-    end
+    Gio::AppInfo.launch_default_for_uri(match)
+  rescue => e
+    puts "error : #{e.message}\n\tfor match: #{match} of type :#{regex_type}"
   end
 
   def launch_color_visualizer(color_name)