topinambour 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2f7932d9b9a4f36c2f645f4d26e55d9b52a994b7
-  data.tar.gz: e7866495e480919ef65ec5b5db1b390736def36c
+  metadata.gz: ebb72186258606bea34685031717fda37dd0e0c3
+  data.tar.gz: 5f9126dbeb67655424c77ab18a5ccbee00a61c85
 SHA512:
-  metadata.gz: 72feed7bf6215d8cfd3cf937ec0e0b0124300327b4b2b2656d33d9e5feec097661a41b8ef03b929d45e6b602321772676492b0aa2c7333ba0f5aee511ea620b4
-  data.tar.gz: d1bb51e53e5bccab717f675eedc4f2f3cae0cdcfe3b64f5ab8f650acd42cbb6cab4724b9d86e3fecd45d0434589dd5ecd1d5e8a9ef6e05b0f1086920e8968e65
+  metadata.gz: fdf0c7271408c88ec111d7fe5a05571736ef9251bf6a1a5dbde356ce9c3325850a6f5e7162edad4c0ce170e6cf5c59880878cde87d4d902c3b92e766797a7055
+  data.tar.gz: cb63168c754ccf4501d3a833e60602a8ebdd3b3ec04769fad5ef891eb7e892bb4f634149745e5e79646a534b92229b0abcb42c745d7bba1a187a5b22a55faf12

data/bin/topinambour

@@ -28,7 +28,7 @@ CURRENT_PATH = File.expand_path(File.dirname(__FILE__))
 ROOT_PATH = File.expand_path("#{CURRENT_PATH}/..")
 LIB_PATH = "#{CURRENT_PATH}/../lib"
 DATA_PATH = "#{CURRENT_PATH}/../data"
-CONFIG_DIR = File.expand_path("#{ENV['HOME']}/.config/Topinambour")
+CONFIG_DIR = File.expand_path("#{ENV['HOME']}/.config/topinambour")
 USR_CSS = "#{CONFIG_DIR}/topinambour.css"
 USR_LIB_PATH  = "#{CONFIG_DIR}/lib"
 gresource_bin = "/tmp/topinambour.gresource"
@@ -46,7 +46,7 @@ end
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
 # Load default libraries !!WARNING!! loading order matters
-%w(actions style_properties application terminal notebook color_selector font_selector
+%w(actions style_properties css_handler application terminal_regex terminal notebook color_selector font_selector
 terminal_chooser headerbar shortcuts window resize_message css_editor).each do |l|
   if File.exist?("#{USR_LIB_PATH}/#{l}.rb")
     require "#{USR_LIB_PATH}/#{l}.rb"

data/lib/application.rb

@@ -15,14 +15,16 @@
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
 class TopinambourApplication < Gtk::Application
-  attr_reader :provider
+  attr_reader :provider, :css_file, :css_content # :css_content really needed ?
   def initialize
     super("com.github.cedlemo.topinambour", :non_unique)
 
     signal_connect "startup" do |application|
       load_css_config
       screen = Gdk::Display.default.default_screen
-      Gtk::StyleContext.add_provider_for_screen(screen, @provider, Gtk::StyleProvider::PRIORITY_USER)
+      Gtk::StyleContext.add_provider_for_screen(screen,
+                                                @provider,
+                                                Gtk::StyleProvider::PRIORITY_USER)
       TopinambourActions.add_actions_to(application)
       load_menu_ui_in(application)
     end
@@ -35,88 +37,68 @@ class TopinambourApplication < Gtk::Application
     end
   end
 
-  def update_css(new_props = nil)
-    css_properties
-    @props.merge!(new_props) if new_props
-    css = update_css_properties
-    merged_css = Sass::Engine.new(css, :syntax => :scss).render
-    if File.exist?(USR_CSS)
-      FileUtils.mv(USR_CSS, "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup")
-      File.open(USR_CSS, "w") do |file|
-        file.puts merged_css
-      end
-    else
-      File.open(USR_CSS, "w") do |file|
-        file.puts merged_css
-      end
+  def update_css(new_props)
+    props = []
+    new_props.each do |prop|
+      props << {:name => prop[0], :value => prop[1]}
+    end
+    new_css = CssHandler.update_css(@css_file, props)
+    replace_old_conf_with(new_css)
+
+    begin
+      load_custom_css_config
+    rescue
+      puts "Bad css file using default css"
+      load_default_css_config
     end
   end
 
   private
 
+  def replace_old_conf_with(new_conf)
+    if File.exist?(USR_CSS)
+      new_name = "#{USR_CSS}_#{Time.new.strftime('%Y-%m-%d-%H-%M-%S')}.backup"
+      FileUtils.mv(USR_CSS, new_name)
+    end
+    check_and_create_if_no_config_dir
+    File.open(USR_CSS, "w") do |file|
+      file.puts new_conf
+    end
+  end
+
   def load_menu_ui_in(application)
     builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/app-menu.ui")
     app_menu = builder["appmenu"]
     application.app_menu = app_menu
   end
 
+  def load_default_css_config
+    @css_content = Gio::Resources.lookup_data("/com/github/cedlemo/topinambour/topinambour.css", 0)
+    @css_file = "#{DATA_PATH}/topinambour.css"
+    @provider.load(:data => @css_content)
+  end
+
+  def load_custom_css_config
+    @css_content = File.open(USR_CSS, "r").read
+    @css_file = USR_CSS
+    @provider.load(:data => @css_content)
+  end
+
   def load_css_config
     @provider = Gtk::CssProvider.new
-    default_css = Gio::Resources.lookup_data("/com/github/cedlemo/topinambour/topinambour.css", 0)
     if File.exist?(USR_CSS)
       begin
-        @provider.load(:path => USR_CSS)
+        load_custom_css_config
       rescue
         puts "Bad css file using default css"
-        @provider.load(:data => default_css)
+        load_default_css_config
       end
     else
       puts "No custom CSS, using default css"
-      @provider.load(:data => default_css)
+      load_default_css_config
     end
   end
 
-  def load_css_to_tree
-    engine = Sass::Engine.new(@provider.to_s, :syntax => :scss)
-    engine.to_tree
-  end
-
-  def update_css_properties
-    modified_sass = change_existing_properties
-    sass_to_add = @props.empty? ? "" : add_new_css_properties
-    Sass::Engine.new(sass_to_add + modified_sass, :syntax => :sass).render
-  end
-
-  def add_new_css_properties
-    new_sass = "*"
-    @props.each do |k, v|
-      new_sass += "\n  #{k}: #{v}"
-    end
-    new_sass + "\n"
-  end
-
-  def change_existing_properties
-    keys_found = []
-    tree = load_css_to_tree
-    # we search for properties that are already configured
-    tree.children.each do |node|
-      node.each do |prop|
-        next if prop.class != Sass::Tree::PropNode
-        name = prop.name[0]
-        next unless @props[name]
-        keys_found << name unless keys_found.include?(name)
-        if @props[name] != prop.value.value
-          value_object = prop.value.value.class.new(@props[name])
-          prop.value = Sass::Script::Tree::Literal.new(value_object)
-        end
-      end
-    end
-    keys_found.each do |k|
-      @props.delete(k)
-    end
-    tree.to_sass
-  end
-
   def css_properties
     @props = {}
     return @props if windows[0].notebook.current.class == TopinambourTerminal
@@ -128,4 +110,8 @@ class TopinambourApplication < Gtk::Application
     @props["-TopinambourTerminal-font"] = DEFAULT_TERMINAL_FONT
     @props["-TopinambourWindow-shell"] = "\'/usr/bin/fish\'"
   end
+
+  def check_and_create_if_no_config_dir
+    Dir.mkdir(CONFIG_DIR) unless Dir.exist?(CONFIG_DIR)
+  end
 end

data/lib/color_selector.rb

@@ -37,7 +37,7 @@ class TopinambourColorSelector < Gtk::Box
   private
 
   def initialize_default_colors
-    @default_colors = @window.notebook.current.get_css_colors
+    @default_colors = @window.notebook.current.css_colors
     @colors = @default_colors.dup
   end
 
@@ -67,7 +67,9 @@ class TopinambourColorSelector < Gtk::Box
     button.signal_connect "clicked" do |widget|
       new_props = {}
       TERMINAL_COLOR_NAMES.each_with_index do |c, i|
-        new_props["-TopinambourTerminal-#{c}"] = @colors[i].to_s
+        if @colors[i] != @default_colors[i]
+          new_props["-TopinambourTerminal-#{c}"] = @colors[i].to_s
+        end
       end
       apply_new_css_properties(widget.toplevel, new_props)
       button.toplevel.exit_overlay_mode

data/lib/css_editor.rb

@@ -147,7 +147,7 @@ class TopinambourCssEditor < Gtk::Grid
   def reload_terminal_custom_css_properties
     @window.notebook.each do |tab|
       next unless tab.class == TopinambourTerminal
-      colors = tab.get_css_colors unless colors
+      colors = tab.css_colors unless colors
       tab.colors = colors
       tab.apply_colors
     end

data/lib/css_handler.rb

@@ -1,6 +1,26 @@
-require "sass"
-require "gtk3" # to remove
+# Copyright 2016 Cédric 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/>.
 
+##
+# This module contains all the methods needed to read, parse
+# and modify css file.
+# Sass is used to read, parse and get informations about
+# css selectors or properties
+# The modifying or addition of css properties are done
+# with ruby strings facilities
 module CssHandler
   def self.css_file?(filename)
     filename =~ /^.*\.css$/ ? true : false
@@ -38,6 +58,10 @@ module CssHandler
     end
   end
 
+  def self.reload_engine(engine, css_content)
+    Sass::Engine.new(css_content, :syntax => engine.options[:syntax])
+  end
+
   def self.color_property?(value)
     parsed_color = nil
     begin
@@ -50,11 +74,11 @@ module CssHandler
 
   def self.property_to_css_instructions(name, value)
     if value.class == String && color_property?(value)
-      "#{name}: #{value};\n"
+      "#{name}: #{value}"
     elsif value.class == String
-      "#{name}: \"#{value}\";\n"
+      %(#{name}: "#{value}")
     else
-      "#{name}: #{value};\n"
+      "#{name}: #{value}"
     end
   end
 
@@ -69,7 +93,7 @@ module CssHandler
     end
     props
   end
-  
+
   def self.prop_position(prop)
     source_range = prop.source_range
     [source_range.start_pos, source_range.end_pos]
@@ -79,43 +103,134 @@ module CssHandler
     tree.children.each do |node|
       node.each do |prop|
         next if prop.class != Sass::Tree::PropNode
+        next if prop.class == Sass::Tree::CommentNode
         return true if prop.name[0] == name
       end
     end
     false
   end
 
-  def self.modify_property(filename, tree, prop)
-    # Get the property line/pos via the tree
-    # modify the existing prop in the file
-    #   create a temp file
-    #   copy initial file and modify the part we want
-    #   replace initial file with temp file
+  def self.modify_in_ranges(line, line_number, start_range, end_range, value)
+    if line_number < start_range.line || line_number > end_range.line
+      line
+    else
+      tmp = ""
+      if line_number == start_range.line
+        tmp += line[0..(start_range.offset - 2)] + value
+      end
+      tmp += line[(end_range.offset - 1)..-1] if line_number == end_range.line
+      tmp
+    end
+  end
+
+  def self.modify_property_value(file_content, property, value)
+    start_range = property.value_source_range.start_pos
+    end_range = property.value_source_range.end_pos
+    tmp = ""
+    line_number = 1
+    file_content.each_line do |line|
+      tmp += modify_in_ranges(line, line_number, start_range, end_range, value)
+      line_number += 1
+    end
+    tmp
+  end
+
+  def self.modify_each_property_values(css_content, engine, prop)
+    engine = engine
+    tree = engine.to_tree
+    props = props_with_name(tree, prop[:name])
+    new_css = css_content
+    (0..(props.size - 1)).each do |i|
+      new_css = modify_property_value(new_css, props[i], prop[:value])
+      engine = reload_engine(engine, new_css)
+      tree = engine.to_tree
+      props = props_with_name(tree, prop[:name])
+    end
+    new_css
+  end
+
+  def self.append_new_property_after_line(line, prop, indent)
+    tmp = line.gsub(/\;[^\;]*$/, ";\n")
+    new_prop = property_to_css_instructions(prop[:name], prop[:value])
+    tmp += (indent + new_prop + (Regexp.last_match(0) || ";\n"))
+    tmp
+  end
+
+  def self.last_child_which_is_not_comment(selector)
+    son = nil
+    selector.children.each do |child|
+      son = child unless child.class == Sass::Tree::CommentNode
+    end
+    son
+  end
+
+  def self.compute_position_to_append(selector, element)
+    indent = last_line = nil
+    if element
+      indent =  " " * (element.name_source_range.start_pos.offset - 1) || ""
+      last_line = element.value_source_range.end_pos.line
+    else # If we don 't have any property in selector, use sel offset
+      indent =  " " * (selector.source_range.start_pos.offset - 1) || ""
+      last_line = selector.source_range.start_pos.line
+    end
+    [indent, last_line]
+  end
+
+  def self.append_property_in_universal_selector(css_content, engine, prop)
+    last_selector = selectors_with_name(engine.to_tree, "*").last
+    last_prop = last_child_which_is_not_comment(last_selector)
+    indent, last_line = compute_position_to_append(last_selector, last_prop)
+    tmp = ""
+    line_number = 1
+    css_content.each_line do |line|
+      if last_line == line_number
+        tmp += append_new_property_after_line(line, prop, indent)
+      else
+        tmp += line
+      end
+      line_number += 1
+    end
+    tmp
   end
 
-  def self.append_property_in_universal_selector(filename, tree, prop)
-    # Get the universal selector line/pos via the tree
-    # append our property at the end of this selector
+  def self.rule_node_name_is?(node, name)
+    if node.rule.include?(name)
+      true
+    elsif node.parsed_rules.to_s == name
+      true
+    elsif node.resolved_rules == name
+      true
+    else
+      false
+    end
   end
 
   def self.selectors_with_name(tree, sel_name)
     selectors = []
     tree.children.each do |node|
       next unless node.class == Sass::Tree::RuleNode
-      selectors << node
+      selectors << node if rule_node_name_is?(node, sel_name)
     end
     selectors
-  end  
-  
+  end
+
+  def self.update_css_with_new_property(content, engine, prop)
+    if property_defined?(engine.to_tree, prop[:name])
+      modify_each_property_values(content, engine, prop)
+    else
+      append_property_in_universal_selector(content, engine, prop)
+    end
+  end
+
   def self.update_css(filename, properties)
     engine = to_engine(filename)
-    tree = engine.to_tree
+    new_css = nil
+    content = File.open(filename, "r").read
     properties.each do |prop|
-      if property_defined?(tree, prop[:name])
-        modify_property(filename, tree, prop)
-      else
-        append_property_in_universal_selector(filename, tree, prop)
-      end
+      new_css = update_css_with_new_property(content, engine, prop)
+      engine = reload_engine(engine, new_css)
+      content = new_css
     end
+    new_css
   end
 end

data/lib/terminal.rb

@@ -49,13 +49,8 @@ class TopinambourTerminal < Vte::Terminal
     signal_connect "child-exited" do |widget|
       notebook = widget.parent
       current_page = notebook.page_num(widget)
-      if notebook.n_pages > 1
-        notebook.remove_page(current_page)
-        notebook.get_nth_page(notebook.page).grab_focus
-      else
-        notebook.remove_page(current_page)
-        notebook.toplevel.application.quit
-      end
+      notebook.remove_page(current_page)
+      notebook.toplevel.application.quit unless notebook.n_pages >= 1
     end
 
     signal_connect "window-title-changed" do |widget|
@@ -72,24 +67,20 @@ class TopinambourTerminal < Vte::Terminal
 
     builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/terminal-menu.ui")
     @menu = Gtk::Popover.new(self, builder["termmenu"])
-
+    
     signal_connect "button-press-event" do |widget, event|
       if event.type == Gdk::EventType::BUTTON_PRESS &&
          event.button == Gdk::BUTTON_SECONDARY
-
-        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
+        display_copy_past_menu(widget, event)
         true
+      elsif event.button == Gdk::BUTTON_PRIMARY
+        manage_regex_on_click(widget, event)
+        false # let false so that it doesn't block the event
       else
         false
       end
     end
+
     configure
   end
 
@@ -97,20 +88,17 @@ class TopinambourTerminal < Vte::Terminal
     File.readlink("/proc/#{@pid}/cwd")
   end
 
-  def get_css_colors
-    background = nil
-    foreground = nil
+  def css_colors
     colors = []
     background = parse_css_color(TERMINAL_COLOR_NAMES[0].to_s)
     foreground = parse_css_color(TERMINAL_COLOR_NAMES[1].to_s)
     TERMINAL_COLOR_NAMES[2..-1].each do |c|
-      color = parse_css_color(c.to_s)
-      colors << color
+      colors << parse_css_color(c.to_s)
     end
     [background, foreground] + colors
   end
 
-  def get_css_font
+  def css_font
     font = style_get_property("font")
     unless font
       font = Pango::FontDescription.new(DEFAULT_TERMINAL_FONT)
@@ -134,15 +122,36 @@ class TopinambourTerminal < Vte::Terminal
   def configure
     set_rewrap_on_resize(true)
     set_scrollback_lines(-1)
-    @colors = get_css_colors
-    set_font(get_css_font)
+    @colors = css_colors
+    set_font(css_font)
     apply_colors
-    #add_matches
+    add_matches
   end
 
   def add_matches
-    puts methods.grep(/rege/)
-    match_add_gregex("cedlemo")
+    @REGEXES = [:REGEX_URL_AS_IS, :REGEX_URL_FILE, :REGEX_URL_HTTP,
+                :REGEX_URL_VOIP, :REGEX_EMAIL, :REGEX_NEWS_MAN]
+    @REGEXES.each do |name|
+      regex_name = TopinambourRegex.const_get(name)
+      flags = [GLib::RegexCompileFlags::OPTIMIZE, 
+               GLib::RegexCompileFlags::MULTILINE]
+      regex = GLib::Regex.new(regex_name, :compile_options => flags)
+      match_add_gregex(regex, 0)
+    end
+  end
+  
+  def display_copy_past_menu(widget, 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_click(widget, event)
+    #puts match_check_event(event).inspect
   end
 end
-

data/lib/terminal_regex.rb

@@ -0,0 +1,100 @@
+# Copyright 2016 Cédric 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/>.
+
+# Stolen from https://github.com/GNOME/gnome-terminal/blob/master/src/terminal-regex.h
+module TopinambourRegex
+  SCHEME = "(?ix: news | telnet | nntp | https? | ftps? | sftp | webcal )"
+  USERCHARS = "-+.[:alnum:]"
+  # Nonempty username, e.g. "john.smith"
+  USER = "[#{USERCHARS}]+"
+  PASSCHARS_CLASS = '[-[:alnum:]\\Q,?;.:/!%$^*&~\"#\'\\E]'
+  # Optional colon-prefixed password. I guess empty password should be allowed, right? E.g. ":secret", ":", "" */
+  PASS = "(?x: :#{PASSCHARS_CLASS}* )?"
+  # Optional at-terminated username (with perhaps a password too), e.g. "joe@", "pete:secret@", "" */
+  USERPASS = "(?:#{USER}#{PASS}@)?"
+  # S4: IPv4 segment (number between 0 and 255) with lookahead at the end so that we don't match "25" in the string "256".
+  # The lookahead could go to the last segment of IPv4 only but this construct allows nicer unittesting. */
+  S4_DEF = "(?(DEFINE)(?<S4>(?x: (?: [0-9] | [1-9][0-9] | 1[0-9]{2} | 2[0-4][0-9] | 25[0-5] ) (?! [0-9] ) )))"
+  # IPV4: Decimal IPv4, e.g. "1.2.3.4", with lookahead (implemented in S4) at the end so that we don't match "192.168.1.123" in the string "192.168.1.1234". */
+  IPV4_DEF = "#{S4_DEF}(?(DEFINE)(?<IPV4>(?x: (?: (?&S4) \\. ){3} (?&S4) )))"
+  # IPv6, including embedded IPv4, e.g. "::1", "dead:beef::1.2.3.4".
+  # Lookahead for the next char not being a dot or digit, so it doesn't get stuck matching "dead:beef::1" in "dead:beef::1.2.3.4".
+  # This is not required since the surrounding brackets would trigger backtracking, but it allows nicer unittesting.
+  # TODO: more strict check (right number of colons, etc.)
+  # TODO: add zone_id: RFC 4007 section 11, RFC 6874 */
+  # S6: IPv6 segment, S6C: IPv6 segment followed by a comma, CS6: comma followed by an IPv6 segment */
+  S6_DEF = "(?(DEFINE)(?<S6>[[:xdigit:]]{1,4})(?<CS6>:(?&S6))(?<S6C>(?&S6):))"
+  # No :: shorthand */
+  IPV6_FULL = "(?x: (?&S6C){7} (?&S6) )"
+  # Begins with :: */
+  IPV6_LEFT = "(?x: : (?&CS6){1,7} )"
+  # :: somewhere in the middle - use negative lookahead to make sure there aren't too many colons in total */
+  IPV6_MID = "(?x: (?! (?: [[:xdigit:]]*: ){8} ) (?&S6C){1,6} (?&CS6){1,6} )"
+  # Ends with :: */
+  IPV6_RIGHT = "(?x: (?&S6C){1,7} : )"
+  # Is "::" and nothing more */
+  IPV6_NULL = "(?x: :: )"
+  # The same ones for IPv4-embedded notation, without the actual IPv4 part */
+  IPV6V4_FULL = "(?x: (?&S6C){6} )"
+  IPV6V4_LEFT = "(?x: :: (?&S6C){0,5} )"  # includes "::<ipv4>" */
+  IPV6V4_MID  = "(?x: (?! (?: [[:xdigit:]]*: ){7} ) (?&S6C){1,4} (?&CS6){1,4} ) :"
+  IPV6V4_RIGHT= "(?x: (?&S6C){1,5} : )"
+  # IPV6: An IPv6 address (possibly with an embedded IPv4).
+  # This macro defines both IPV4 and IPV6, since the latter one requires the former. */
+  IP_DEF = "#{IPV4_DEF}#{S6_DEF}(?(DEFINE)(?<IPV6>(?x: (?: #{IPV6_NULL} | #{IPV6_LEFT} | #{IPV6_MID} | #{IPV6_RIGHT}" + 
+                           " | #{IPV6_FULL} | (?: #{IPV6V4_FULL} | #{IPV6V4_LEFT} | #{IPV6V4_MID} | #{IPV6V4_RIGHT}" + 
+                           " ) (?&IPV4) ) (?! [.:[:xdigit:]] ) )))"
+  # Either an alphanumeric character or dash; or if [negative lookahead] not ASCII
+  # then any graphical Unicode character.
+  # A segment can consist entirely of numbers.
+  # (Note: PCRE doesn't support character class subtraction/intersection.) */
+  HOSTNAMESEGMENTCHARS_CLASS = "(?x: [-[:alnum:]] | (?! [[:ascii:]] ) [[:graph:]] )"
+  # A hostname of at least 1 component. The last component cannot be entirely numbers.
+  # E.g. "foo", "example.com", "1234.com", but not "foo.123" */
+  HOSTNAME1 = "(?x: (?: #{HOSTNAMESEGMENTCHARS_CLASS}+ \\. )* " + "#{HOSTNAMESEGMENTCHARS_CLASS}* (?! [0-9] ) #{HOSTNAMESEGMENTCHARS_CLASS}+ )"
+  # A hostname of at least 2 components. The last component cannot be entirely numbers.
+  # E.g. "example.com", "1234.com", but not "1234.56" */
+  HOSTNAME2 = "(?x: (?: #{HOSTNAMESEGMENTCHARS_CLASS}+ \\.)+ #{HOSTNAME1} )"
+  # For URL: Hostname, IPv4, or bracket-enclosed IPv6, e.g. "example.com", "1.2.3.4", "[::1]" */
+  URL_HOST = "(?x: #{HOSTNAME1} | (?&IPV4) | \\[ (?&IPV6) \\] )"
+  # For e-mail: Hostname of at least two segments, or bracket-enclosed IPv4 or IPv6, e.g. "example.com", "[1.2.3.4]", "[::1]".
+  # Technically an e-mail with a single-component hostname might be valid on a local network, 
+  # but let's avoid tons of false positives (e.g. in a typical shell prompt). */
+  EMAIL_HOST = "(?x: #{HOSTNAME2} | \\[ (?: (?&IPV4) | (?&IPV6) ) \\] )"
+  # Number between 1 and 65535, with lookahead at the end so that we don't match "6789" in the string "67890",
+  # and in turn we don't eventually match "http://host:6789" in "http://host:67890". */
+  N_1_65535 = "(?x: (?: [1-9][0-9]{0,3} | [1-5][0-9]{4} | 6[0-4][0-9]{3} | 65[0-4][0-9]{2} | 655[0-2][0-9] | 6553[0-5] ) (?! [0-9] ) )"
+  # Optional colon-prefixed port, e.g. ":1080", "" */
+  PORT = "(?x: \\:#{N_1_65535} )?"
+  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} ) )?"
+  # Now let's put these fragments together */
+  DEFS = IP_DEF
+  #REGEX_URL_AS_IS = "#{SCHEME}://#{USERPASS}#{URL_HOST}#{PORT}#{URLPATH}"
+  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} ) )?" 
+  # 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}"
+  REGEX_URL_VOIP = "#{DEFS}(?i:h323:|sips?:)#{USERPASS}#{URL_HOST}#{PORT}#{VOIP_PATH}"
+  REGEX_EMAIL = "#{DEFS}(?i:mailto:)?#{USER}@#{EMAIL_HOST}"
+  REGEX_NEWS_MAN = "(?i:news:|man:|info:)[-[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+"
+end

data/lib/window.rb

@@ -63,6 +63,7 @@ class TopinambourWindow < Gtk::ApplicationWindow
     @notebook.append_page(terminal, Gtk::Label.new)
     @notebook.set_tab_reorderable(terminal, true)
     @notebook.set_page(@notebook.n_pages - 1)
+    @notebook.current.grab_focus
   end
 
   def quit_gracefully
@@ -78,11 +79,13 @@ class TopinambourWindow < Gtk::ApplicationWindow
   def show_prev_tab
     exit_overlay_mode
     @notebook.cycle_prev_page
+    @notebook.current.grab_focus
   end
 
   def show_next_tab
     exit_overlay_mode
     @notebook.cycle_next_page
+    @notebook.current.grab_focus
   end
   
   def show_terminal_chooser
@@ -191,6 +194,7 @@ class TopinambourWindow < Gtk::ApplicationWindow
   def toggle_overlay(klass)
     if in_overlay_mode? && @overlay.children[1].class == klass
       exit_overlay_mode
+      @notebook.current.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.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -113,6 +113,7 @@ files:
 - lib/style_properties.rb
 - lib/terminal.rb
 - lib/terminal_chooser.rb
+- lib/terminal_regex.rb
 - lib/window.rb
 homepage: https://github.com/cedlemo/topinambour
 licenses: