topinambour 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 658f66555184e2186a21c944bb2d98538eeb1bd8
-  data.tar.gz: 1fb7a37aaee8a9b8f6ffbb0703c0b0eaa7eadca2
+  metadata.gz: c91b7f16f9c3141e6876f79ce6246daf0567c8ff
+  data.tar.gz: b0cf30204239e75195eae1a90101aad66fca0c1c
 SHA512:
-  metadata.gz: a9805c6e16ec8a9a133253e6c3400cf04cffeca79a5fa75a5e534de8ecad0d8630d7eb9b96fad8f94efb2d73f20a70810e3b7233d6db4fda21a2143a892a5375
-  data.tar.gz: da3d12005d90dfa7fd2eb5d9548107885db6a664a62fa9d1acb66b65a36826f50d6dd067c8ae945acd786a728fb9cfc24ed23147b6c573de74c29baaf7605abc
+  metadata.gz: 5b30bc9a61ebe66aac157a017481ca40041628623abddd15b62f9b9ba732d1340a8987a6474bf292abe2385d65d9db45302fd2bf0bfb896ea6e681d802a40b16
+  data.tar.gz: 44ddb40ca20348587b194c7d4a36f6cf8b2f7ed971bd22a04824532388adb56b90e8448336a641c49d97f35f754042444a60d5aee2acb17b44505d8fb42ad055

data/bin/topinambour

@@ -46,6 +46,7 @@ end
 resource = Gio::Resource.load(gresource_bin)
 Gio::Resources.register(resource)
 # Load default libraries !!WARNING!! loading order matters
+#%w(actions style_properties css_handler application terminal_regex terminal notebook color_selector font_selector
 %w(actions style_properties css_handler application 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")

data/lib/headerbar.rb

@@ -37,12 +37,12 @@ SECTOOLTIP
 
   def self.generate_current_label_signals(label, window)
     label.signal_connect "activate" do |entry|
-      window.notebook.current.tab_label = entry.text
+      window.notebook.current.custom_title = entry.text
     end
 
     label.signal_connect "icon-release" do |entry, position|
       if position == :secondary
-        window.notebook.current.tab_label = nil
+        window.notebook.current.custom_title = nil
         entry.text = window.notebook.current.window_title
       end
     end

data/lib/notebook.rb

@@ -27,7 +27,7 @@ class TopinambourNotebook < Gtk::Notebook
     end
 
     signal_connect "switch-page" do |_widget, next_page, next_page_num|
-      toplevel.current_label.text = next_page.tab_label || get_tab_label(next_page).text
+      toplevel.current_label.text = next_page.terminal_title
       toplevel.current_tab.text = "#{next_page_num + 1}/#{n_pages}"
 
       if page >= 0 && @gen_preview

data/lib/style_properties.rb

@@ -66,6 +66,38 @@ DEFAULT_TERMINAL_COLORS = %w(#aeafad #323232 #000000 #b9214f #A6E22E #ff9800
                             )
 DEFAULT_TERMINAL_FONT = "Monospace 11"
 
+# boolean :
+#
+# audible_bell
+# allow_bold
+# scroll_on_output
+# scroll_on_keystroke
+# rewrap_on_resize
+# mouse_autohide
+#
+# VteCursorShape :
+# cursor_shape
+#   VTE_CURSOR_SHAPE_BLOCK      Draw a block cursor. This is the default.
+#   VTE_CURSOR_SHAPE_IBEAM      Draw a vertical bar on the left side of character. 
+#                               This is similar to the default cursor for other GTK+ widgets.
+#   VTE_CURSOR_SHAPE_UNDERLINE  Draw a horizontal bar below the character.
+#
+# VteCursorBlinkMode
+#  cursor_blink_mode
+#   VTE_CURSOR_BLINK_SYSTEM Follow GTK+ settings for cursor blinking.
+#   VTE_CURSOR_BLINK_ON     Cursor blinks.
+#   VTE_CURSOR_BLINK_OFF    Cursor does not blink.
+#
+# VteEraseBinding
+#  backspace_binding
+#  delete_binding
+#    VTE_ERASE_AUTO For backspace, attempt to determine the right value from the 
+#                   terminal's IO settings. For delete, use the control sequence.
+#    VTE_ERASE_ASCII_BACKSPACE Send an ASCII backspace character (0x08).
+#    VTE_ERASE_ASCII_DELETE    Send an ASCII delete character (0x7F).
+#    VTE_ERASE_DELETE_SEQUENCE Send the "@7 " control sequence.
+#    VTE_ERASE_TTY             Send terminal's "erase" setting.
+
 class TopinambourTerminal < Vte::Terminal
   extend TopinambourStyleProperties
   type_register

data/lib/terminal.rb

@@ -18,7 +18,7 @@
 # The default vte terminal customized
 class TopinambourTerminal
   attr_reader :pid, :menu
-  attr_accessor :preview, :colors, :tab_label
+  attr_accessor :preview, :colors, :custom_title
 
   ##
   # Create a new TopinambourTerminal instance that runs command_string
@@ -85,6 +85,10 @@ class TopinambourTerminal
     set_colors(@colors[0], @colors[1], @colors[2..-1])
   end
 
+  def terminal_title
+    @custom_title.class == String ? @custom_title : window_title.to_s
+  end
+
   private
 
   def parse_css_color(color_name)
@@ -130,11 +134,7 @@ class TopinambourTerminal
     _match, _regex_type = match_check_event(event)
   end
 
-  def current_terminal_title
-    @tab_label.class == String ? @tab_label : window_title
-  end
-
   def when_terminal_title_change
-    parent.toplevel.current_label.text = current_terminal_title
+    parent.toplevel.current_label.text = terminal_title
   end
 end

data/lib/terminal_regex.rb

@@ -0,0 +1,99 @@
+# 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 = "#{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

@@ -53,7 +53,7 @@ class TopinambourWindow
         add_resize_timeout
       end
     end
-    @notebook.append_page(terminal, Gtk::Label.new)
+    @notebook.append_page(terminal)
     @notebook.set_tab_reorderable(terminal, true)
     @notebook.set_page(@notebook.n_pages - 1)
     @notebook.current.grab_focus

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Cédric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-28 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: