topinambour 1.0.3 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ebb72186258606bea34685031717fda37dd0e0c3
-  data.tar.gz: 5f9126dbeb67655424c77ab18a5ccbee00a61c85
+  metadata.gz: 658f66555184e2186a21c944bb2d98538eeb1bd8
+  data.tar.gz: 1fb7a37aaee8a9b8f6ffbb0703c0b0eaa7eadca2
 SHA512:
-  metadata.gz: fdf0c7271408c88ec111d7fe5a05571736ef9251bf6a1a5dbde356ce9c3325850a6f5e7162edad4c0ce170e6cf5c59880878cde87d4d902c3b92e766797a7055
-  data.tar.gz: cb63168c754ccf4501d3a833e60602a8ebdd3b3ec04769fad5ef891eb7e892bb4f634149745e5e79646a534b92229b0abcb42c745d7bba1a187a5b22a55faf12
+  metadata.gz: a9805c6e16ec8a9a133253e6c3400cf04cffeca79a5fa75a5e534de8ecad0d8630d7eb9b96fad8f94efb2d73f20a70810e3b7233d6db4fda21a2143a892a5375
+  data.tar.gz: da3d12005d90dfa7fd2eb5d9548107885db6a664a62fa9d1acb66b65a36826f50d6dd067c8ae945acd786a728fb9cfc24ed23147b6c573de74c29baaf7605abc

data/README.md

@@ -23,7 +23,7 @@ Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the pr
 
 *    The Css file can be edited in a tab of Topinambour and saved. Each modifications are applied while you are writting them. (Use `Shift + Ctrl + w` to close the editor)
 <a href="https://raw.github.com/cedlemo/topinambour/master/screenshot5.png"><img src="https://raw.github.com/cedlemo/topinambour/master/screenshot5_prev.png" width="576" height="324" alt="Screenshot"></a>
-*   Topinambour allows users to modify existing modules. For example if a user copy the css_editor.rb in the directory *~/.config/Topinambour/lib/css_editor.rb*, he should be able to modify it in order to fit its needs. 
+*   Topinambour allows users to modify existing modules. For example if a user copy the css_editor.rb in the directory *~/.config/topinambour/lib/css_editor.rb*, he should be able to modify it in order to fit its needs. 
 
 ##  TODO:
 *   Regex support in the terminals in order to launch web navigator if there is an url or launch a media player if there is a match for avi file for example.
@@ -53,7 +53,7 @@ Topinambour is Terminal written with the Gtk3 and Vte3 ruby bindings from the pr
 
 ## User configuration
 
-It can be found in the file `$HOME/.config/Topinambour/topinambour.css` (Be carefull by default Topinambour use fish as a default shell, if you want to use another one specify it in the topinambour.css file)
+It can be found in the file `$HOME/.config/topinambour/topinambour.css` (Be carefull by default Topinambour use fish as a default shell, if you want to use another one specify it in the topinambour.css file)
 
 ```css
 *{

data/bin/topinambour

@@ -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 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")
     require "#{USR_LIB_PATH}/#{l}.rb"

data/lib/style_properties.rb

@@ -54,3 +54,37 @@ module TopinambourStyleProperties
     install_style_property(property) if property
   end
 end
+
+TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow,
+                        :blue, :magenta, :cyan, :white, :brightblack,
+                        :brightred, :brightgreen, :brightyellow, :brightblue,
+                        :brightmagenta, :brightcyan, :brightwhite
+                       ]
+DEFAULT_TERMINAL_COLORS = %w(#aeafad #323232 #000000 #b9214f #A6E22E #ff9800
+                             #3399ff #8e33ff #06a2dc #B0B0B0 #5D5D5D #ff5c8d
+                             #CDEE69 #ffff00 #9CD9F0 #FBB1F9 #77DFD8 #F7F7F7
+                            )
+DEFAULT_TERMINAL_FONT = "Monospace 11"
+
+class TopinambourTerminal < Vte::Terminal
+  extend TopinambourStyleProperties
+  type_register
+  TERMINAL_COLOR_NAMES.each_with_index do |c|
+    name = c.to_s
+    install_style("boxed",
+                  name,
+                  GLib::Type["GdkRGBA"])
+  end
+  install_style("boxed",
+                "font",
+                GLib::Type["PangoFontDescription"])
+end
+
+class TopinambourWindow < Gtk::ApplicationWindow
+  extend TopinambourStyleProperties
+  type_register
+  install_style("string", "shell", "/usr/bin/fish")
+  install_style("int", "width", [-1, 2000, 1000])
+  install_style("int", "height", [-1, 2000, 500])
+  install_style("string", "css-editor-style", "classic")
+end

data/lib/terminal.rb

@@ -14,27 +14,11 @@
 # 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]
-DEFAULT_TERMINAL_COLORS = %w(#aeafad #323232 #000000 #b9214f #A6E22E #ff9800 #3399ff #8e33ff #06a2dc
-                             #B0B0B0 #5D5D5D #ff5c8d #CDEE69 #ffff00 #9CD9F0 #FBB1F9 #77DFD8 #F7F7F7)
-DEFAULT_TERMINAL_FONT = "Monospace 11"
 ##
 # The default vte terminal customized
-class TopinambourTerminal < Vte::Terminal
-  extend TopinambourStyleProperties
+class TopinambourTerminal
   attr_reader :pid, :menu
   attr_accessor :preview, :colors, :tab_label
-  type_register
-  TERMINAL_COLOR_NAMES.each_with_index do |c|
-    name = c.to_s
-    self.install_style("boxed",
-                        name,
-                        GLib::Type["GdkRGBA"])
-  end
-  self.install_style("boxed",
-                     "font",
-                     GLib::Type["PangoFontDescription"])
 
   ##
   # Create a new TopinambourTerminal instance that runs command_string
@@ -53,21 +37,14 @@ class TopinambourTerminal < Vte::Terminal
       notebook.toplevel.application.quit unless notebook.n_pages >= 1
     end
 
-    signal_connect "window-title-changed" do |widget|
-      if parent && parent.current == self
-        current_label = parent.get_tab_label(widget)
-        if @tab_label.class == String
-          current_label.text = @tab_label
-        else
-          current_label.text = window_title
-          parent.toplevel.current_label.text = window_title
-        end
-      end
+    signal_connect "window-title-changed" do
+      when_terminal_title_change if parent && parent.current == self
     end
 
-    builder = Gtk::Builder.new(:resource => "/com/github/cedlemo/topinambour/terminal-menu.ui")
+    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
@@ -100,9 +77,7 @@ class TopinambourTerminal < Vte::Terminal
 
   def css_font
     font = style_get_property("font")
-    unless font
-      font = Pango::FontDescription.new(DEFAULT_TERMINAL_FONT)
-    end
+    font = Pango::FontDescription.new(DEFAULT_TERMINAL_FONT) unless font
     font
   end
 
@@ -129,17 +104,17 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def add_matches
-    @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
+#    @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)
@@ -150,8 +125,16 @@ class TopinambourTerminal < Vte::Terminal
     widget.menu.set_pointing_to(rect)
     widget.menu.show
   end
-  
-  def manage_regex_on_click(widget, event)
-    #puts match_check_event(event).inspect
+
+  def manage_regex_on_click(_widget, event)
+    _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
   end
 end

data/lib/window.rb

@@ -14,16 +14,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Topinambour.  If not, see <http://www.gnu.org/licenses/>.
 
-class TopinambourWindow < Gtk::ApplicationWindow
-  extend TopinambourStyleProperties
+class TopinambourWindow
   attr_reader :notebook, :bar, :overlay, :current_label, :current_tab, :css_editor_style
 
-  type_register
-  install_style("string", "shell", "/usr/bin/fish")
-  install_style("int", "width", [-1, 2000, 1000])
-  install_style("int", "height", [-1, 2000, 500])
-  install_style("string", "css-editor-style", "classic")
-
   def initialize(application)
     super(:application => application)
     set_icon_from_file("#{DATA_PATH}/topinambour-icon.png")

metadata

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

data/lib/terminal_regex.rb

@@ -1,100 +0,0 @@
-# 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