topinambour 1.0.16 → 2.0.0

data/lib/color_selector.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -38,7 +38,7 @@ class TopinambourColorSelector < Gtk::Box
     show_all
     set_halign(:center)
     set_valign(:end)
-    set_name("color_selector")
+    set_name("topinambour-color-selector")
   end
 
   private
@@ -64,8 +64,8 @@ class TopinambourColorSelector < Gtk::Box
   def apply_new_properties
     colors_strings = @colors.map { |c| c.to_s }
     @window.application.settings["colorscheme"] = colors_strings
-    @window.notebook.send_to_all_terminals(:colors, nil)
-    @window.notebook.send_to_all_terminals(:load_settings, nil)
+    @window.terminal.colors
+    @window.terminal.load_settings
   end
 
   def generate_save_button
@@ -81,6 +81,7 @@ class TopinambourColorSelector < Gtk::Box
     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
@@ -91,6 +92,6 @@ class TopinambourColorSelector < Gtk::Box
   end
 
   def apply_new_colors
-    @window.notebook.current.term.colors = @colors
+    @window.terminal.colors = @colors
   end
 end

data/lib/font_selector.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -42,7 +42,7 @@ class TopinambourFontSelector < Gtk::Box
       toplevel.exit_overlay_mode
     end
     pack_start(save_button, :expand => false, :fill => false, :padding => 0)
-    set_name("font_selector")
+    set_name("topinambour-font-selector")
     show_all
     set_halign(:center)
     set_valign(:end)

data/lib/preferences.rb

@@ -1,4 +1,4 @@
-# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify

data/lib/shortcuts.rb

@@ -1,4 +1,4 @@
-# Copyright 2016-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -26,7 +26,7 @@ module TopinambourShortcuts
     when Gdk::Keyval::KEY_Escape # escape from overlay mode
       if window.in_overlay_mode?
         window.exit_overlay_mode
-        window.notebook.current.term.grab_focus
+        window.terminal.grab_focus
         true
       end
     end
@@ -40,27 +40,12 @@ module TopinambourShortcuts
     when Gdk::Keyval::KEY_Q # Quit
       window.quit_gracefully
       true
-    when Gdk::Keyval::KEY_T # New tab
-      window.add_terminal
-      true
     when Gdk::Keyval::KEY_C
       window.show_color_selector
       true
     when Gdk::Keyval::KEY_F
       window.show_font_selector
       true
-    when Gdk::Keyval::KEY_Left # previous tab
-      window.show_prev_tab
-      true
-    when Gdk::Keyval::KEY_Right # next tab
-      window.show_next_tab
-      true
-    when Gdk::Keyval::KEY_O
-      window.show_terminal_chooser
-      true
-    when Gdk::Keyval::KEY_slash
-      window.show_searchbar
-      true
     when Gdk::Keyval::KEY_Page_Up
       window.opacity = window.opacity + 0.05
       true

data/lib/terminal.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -17,44 +17,35 @@
 ## The main full tab Gtk::Box + Vte::Terminal + Gtk::Scrollbar
 #
 
-class TopinambourTabTerm < Gtk::Box
+class TopinambourTermBox < Gtk::Box
   attr_reader :term
   def initialize(command_string, working_dir = nil)
     super(:horizontal, 0)
-    set_name("topinambour-tab-term")
+    set_name("topinambour-term-box")
     @term = TopinambourTerminal.new(command_string, working_dir)
     @scrollbar = Gtk::Scrollbar.new(:vertical, @term.vadjustment)
     @scrollbar.name = "topinambour-scrollbar"
     pack_start(@term, :expand => true, :fill => true, :padding => 0)
     pack_start(@scrollbar)
+    show_all
   end
 end
+
 ##
 # The default vte terminal customized
 class TopinambourTerminal < Vte::Terminal
   attr_reader :pid, :menu, :regexes, :last_match
-  attr_accessor :preview, :custom_title
 
   ##
   # Create a new TopinambourTerminal instance that runs command_string
   def initialize(command_string, working_dir = nil)
     super()
-
+    set_name("topinambour-terminal")
     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)
-      @application.quit unless notebook.n_pages >= 1
-    end
-
-    signal_connect "window-title-changed" do |widget|
-      tabterm = widget.parent
-      notebook = tabterm.parent
-      when_terminal_title_change if notebook && notebook.current.term == self
+      toplevel.application.quit
     end
 
     add_popup_menu
@@ -76,13 +67,13 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def colors
-    colors_strings = application.settings["colorscheme"]
+    colors_strings = toplevel.application.settings["colorscheme"]
     @colors = colors_strings.map { |c| Gdk::RGBA.parse(c) }
     @colors
   end
 
   def font
-    font_str = application.settings["font"]
+    font_str = toplevel.application.settings["font"]
     @font = Pango::FontDescription.new(font_str)
   end
 
@@ -91,17 +82,12 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def font=(font_str)
-    application.settings["font"] = font_str
+    toplevel.application.settings["font"] = font_str
     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)
@@ -200,10 +186,6 @@ class TopinambourTerminal < Vte::Terminal
     end
   end
 
-  def when_terminal_title_change
-    parent.toplevel.current_label.text = terminal_title
-  end
-
   def launch_default_for_regex_match(match, regex_type)
     Gio::AppInfo.launch_default_for_uri(match)
   rescue => e

data/lib/terminal_regex.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
@@ -90,12 +90,17 @@ module PortRegexes
 end
 
 module PathRegexes
+  # Omit the parentheses
   PATHCHARS_CLASS = "[-[:alnum:]\\Q_$.+!*,:;@&=?/~#|%\\E]"
-  # Chars not to end a URL */
-  PATHNONTERM_CLASS = "[\\Q.!,?\\E]"
-  # Lookbehind at the end, so that the last character (if we matched a character at all) is not from PATHTERM_CLASS */
-  URLPATH = "(?x: /#{PATHCHARS_CLASS}* (?<! #{PATHNONTERM_CLASS} ) )?"
-  VOIP_PATH = "(?x: [;?]#{PATHCHARS_CLASS}* (?<! #{PATHNONTERM_CLASS} ) )?"
+  # Chars to end a URL
+  PATHTERM_CLASS = "[-[:alnum:]\\Q_$+*:@&=/~#|%\\E]"
+  # Recursive definition of PATH that allows parentheses and square brackets only if balanced, see bug 763980.
+  PATH_INNER_DEF = "(?(DEFINE)(?<PATH_INNER>(?x: (?: #{PATHCHARS_CLASS}* (?: \\( (?&PATH_INNER) \\) | \\[ (?&PATH_INNER) \\] ) )* #{PATHCHARS_CLASS}* )))"
+  #                "(?(DEFINE)(?<PATH_INNER>(?x: (?: " PATHCHARS_CLASS"* \\( (?&PATH_INNER) \\) )* " PATHCHARS_CLASS "* )))"
+  # Same as above, but the last character (if exists and is not a parenthesis) must be from PATHTERM_CLASS.
+  PATH_DEF = "(?(DEFINE)(?<PATH>(?x: (?: #{PATHCHARS_CLASS}* (?: \\( (?&PATH_INNER) \\) | \\[ (?&PATH_INNER) \\] ) )* (?: #{PATHCHARS_CLASS}* #{PATHTERM_CLASS} )? )))"
+  URLPATH = "(?x: /(?&PATH) )?"
+  VOIP_PATH = "(?x: [;?](?&PATH) )?"
 end
 
 module ColorRegexes
@@ -121,10 +126,10 @@ module TopinambourRegex
   include PathRegexes
 
   # Now let's put these fragments together */
-  DEFS = IP_DEF
+  DEFS = "#{IP_DEF}#{PATH_INNER_DEF}#{PATH_DEF}"
   REGEX_URL_AS_IS = "#{DEFS}#{SCHEME}://#{USERPASS}#{URL_HOST}#{PORT}#{URLPATH}"
   # TODO: also support file:/etc/passwd */
-  REGEX_URL_FILE = "#{DEFS}(?ix: file:/ (?: / (?: #{HOSTNAME1} )? / )? (?! / ) )(?x: #{PATHCHARS_CLASS}+ (?<! #{PATHNONTERM_CLASS} ) )?"
+  REGEX_URL_FILE = "#{DEFS}(?ix: file:/ (?: / (?: #{HOSTNAME1} )? / )? (?! / ) )(?&PATH)"
   # Lookbehind so that we don't catch "abc.www.foo.bar", bug 739757.
   # Lookahead for www/ftp for convenience (so that we can reuse HOSTNAME1). */
   REGEX_URL_HTTP = "#{DEFS}(?<!(?:#{HOSTNAMESEGMENTCHARS_CLASS}|[.]))(?=(?i:www|ftp))#{HOSTNAME1}#{PORT}#{URLPATH}"

data/lib/window.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2017 Cedric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2018 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -15,7 +15,7 @@
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
 class TopinambourWindow < Gtk::ApplicationWindow
-  attr_reader :notebook, :bar, :overlay, :current_label, :current_tab
+  attr_reader :bar, :overlay, :terminal
   def initialize(application)
     super(application)
     set_icon_name("utilities-terminal-symbolic")
@@ -23,7 +23,8 @@ class TopinambourWindow < Gtk::ApplicationWindow
     load_settings
     set_position(:center)
     create_header_bar
-    create_containers
+    @overlay = Gtk::Overlay.new
+    add(@overlay)
     show_all
     signal_connect "key-press-event" do |widget, event|
       TopinambourShortcuts.handle_key_press(widget, event)
@@ -33,24 +34,13 @@ class TopinambourWindow < Gtk::ApplicationWindow
   def add_terminal(cmd = nil)
     cmd = cmd || application.settings["default-shell"]
 
-    exit_overlay_mode
-    working_dir = nil
-    working_dir = @notebook.current.term.pid_dir if @notebook.current
-    terminal = TopinambourTabTerm.new(cmd, working_dir)
-    if terminal.term.pid
-      terminal.show_all
-
-      @notebook.append_page(terminal)
-      terminal.term.load_settings
-      @notebook.set_tab_reorderable(terminal, true)
-      @notebook.set_page(@notebook.n_pages - 1)
-      @notebook.current.term.grab_focus
-    end
+    terminal = TopinambourTermBox.new(cmd)
+    @overlay.add(terminal)
+    @terminal = terminal.term
+    terminal.term.load_settings
   end
 
   def quit_gracefully
-    exit_overlay_mode
-    @notebook.remove_all_pages
     application.quit
   end
 
@@ -58,26 +48,10 @@ class TopinambourWindow < Gtk::ApplicationWindow
     toggle_overlay(TopinambourColorSelector)
   end
 
-  def show_prev_tab
-    exit_overlay_mode
-    @notebook.cycle_prev_page
-    @notebook.current.term.grab_focus
-  end
-
-  def show_next_tab
-    exit_overlay_mode
-    @notebook.cycle_next_page
-    @notebook.current.term.grab_focus
-  end
-
   def show_font_selector
     toggle_overlay(TopinambourFontSelector)
   end
 
-  def show_terminal_chooser
-    toggle_overlay(TopinambourTermChooser)
-  end
-
   def exit_overlay_mode
     @overlay.children[1].destroy if in_overlay_mode?
   end
@@ -90,27 +64,16 @@ class TopinambourWindow < Gtk::ApplicationWindow
                           "license" => "This program is licenced under the licence GPL-3.0 and later.",
                           "logo_icon_name" => "utilities-terminal-symbolic",
                           "program_name" => "Topinambour",
-                          "version" => "1.0.16",
+                          "version" => "2.0.0",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )
   end
 
-  def close_current_tab
-    exit_overlay_mode
-    @notebook.remove_current_page
-  end
-
   def in_overlay_mode?
     @overlay.children.size > 1 ? true : false
   end
 
-  def show_searchbar
-    toggle_overlay(TopinambourSearchBar)
-    overlayed_widget = @overlay.children[1]
-    overlayed_widget.search_mode = true if overlayed_widget
-  end
-
   def toggle_shrink
     w, h = size
     if @shrink_saved_height
@@ -122,14 +85,6 @@ class TopinambourWindow < Gtk::ApplicationWindow
     end
   end
 
-  def show_shortcuts
-    resource_file = "/com/github/cedlemo/topinambour/shortcuts.ui"
-    builder = Gtk::Builder.new(:resource => resource_file)
-    shortcuts_win = builder["shortcuts-window"]
-    shortcuts_win.transient_for = self
-    shortcuts_win.show
-  end
-
   private
 
   def load_settings
@@ -143,64 +98,11 @@ class TopinambourWindow < Gtk::ApplicationWindow
     @overlay.set_overlay_pass_through(widget, false)
   end
 
-  def create_containers
-    @notebook = TopinambourNotebook.new
-    @overlay = Gtk::Overlay.new
-    @overlay.add(@notebook)
-    add(@overlay)
-  end
-
   def create_header_bar
-    resource_file = "/com/github/cedlemo/topinambour/headerbar.ui"
-    builder = Gtk::Builder.new(:resource => resource_file)
-    headerbar = builder["headerbar"]
+    headerbar = Gtk::HeaderBar.new
     headerbar.name = "topinambour-headerbar"
+    headerbar.show_close_button = true
     set_titlebar(headerbar)
-    # Text is modified when notebook switch tabs or
-    # Vte::Terminal command change and if it is the current Vte.
-    @current_label = builder["current_label"]
-    current_label_signals
-    # Value is changed when notebook switch tabs or notebook add tab.
-    @current_tab = builder["current_tab"]
-    headerbar.remove(@current_label)
-    headerbar.custom_title = @current_label
-    next_prev_new_signals(builder)
-    overview_signal(builder)
-    main_menu_signal(builder)
-  end
-
-  def current_label_signals
-    @current_label.signal_connect "activate" do |entry|
-      @notebook.current.term.custom_title = entry.text
-      @notebook.current.term.grab_focus
-    end
-
-    @current_label.signal_connect "icon-release" do |entry, position|
-      if position == :secondary
-        @notebook.current.term.custom_title = nil
-        entry.text = @notebook.current.term.window_title
-      end
-    end
-  end
-
-  def next_prev_new_signals(builder)
-    builder["prev_button"].signal_connect "clicked" do
-      show_prev_tab
-    end
-
-    builder["next_button"].signal_connect "clicked" do
-      show_next_tab
-    end
-
-    builder["new_term"].signal_connect "clicked" do
-      add_terminal
-    end
-  end
-
-  def overview_signal(builder)
-    builder["term_overv_button"].signal_connect "clicked" do
-      show_terminal_chooser
-    end
   end
 
   def main_menu_signal(builder)
@@ -231,7 +133,7 @@ class TopinambourWindow < Gtk::ApplicationWindow
   def toggle_overlay(klass)
     if in_overlay_mode? && @overlay.children[1].class == klass
       exit_overlay_mode
-      @notebook.current.term.grab_focus
+      @terminal.grab_focus
     else
       exit_overlay_mode
       add_overlay(klass.new(self))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.16
+  version: 2.0.0
 platform: ruby
 authors:
 - Cedric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -58,13 +58,10 @@ files:
 - lib/application.rb
 - lib/color_selector.rb
 - lib/font_selector.rb
-- lib/notebook.rb
 - lib/preferences.rb
 - lib/rgb_names_regexes.rb
-- lib/searchbar.rb
 - lib/shortcuts.rb
 - lib/terminal.rb
-- lib/terminal_chooser.rb
 - lib/terminal_regex.rb
 - lib/window.rb
 homepage: https://github.com/cedlemo/topinambour
@@ -87,7 +84,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Ruby-gnome2 Terminal emulator