topinambour 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f39664ed80b51cfc2df2f4210e4ee36e4ce8b2d4
-  data.tar.gz: 649ba523bd608e16392ac95f920ce614e46401b1
+  metadata.gz: a0096f33f7deda14242cf4d17ff738edcd8596a7
+  data.tar.gz: 3495922b871cf7a0b9bacab870c34452cafb21c9
 SHA512:
-  metadata.gz: 84f94e1173d5fd2b5f2e4b5c1745dda97c845d90cf2b02786c2f83013812c4f51d53e9e1bacb26e1db32e7ea2da7bf4317bce25551e8103bd5fa18e9db3e142a
-  data.tar.gz: 7d67ab78fd8d2e64176d510342688b385979a6a86ff77d93be18b546543ebaf21a7c588efffdaa0241284d5bc2c7211ecb6bb128d63fc7e1f72328e11ad9e785
+  metadata.gz: 82c72cf7a2ddbe9ded6b50c657587565752b0ee0647fc19be298e7b6b2176a755d93d7a7c910341ba1d1eb0c65dd0f143e0fa2afbbb966757a57741531aa74e5
+  data.tar.gz: aa040c19ca5f66c91a3d43be69e15bf7f7f876b5a8c7ebf712ef3bbb45a8fdc0213eb69de618affc1a59ce68a703f9a843127f8deeabef3eb97ba46a310d2568

data/README.md

@@ -135,8 +135,10 @@ the ruby gem binaries (for example).
 
     export PATH="${PATH}:/home/${USER}/bin:${HOME}/gem/ruby/2.3.0/bin"
 
-
-
+## TODOs
+  * find out why there is the warning message related to the Vte::Regex.
+    * http://www.pcre.org/current/doc/html/pcre2.html
+    * https://www.regexbuddy.com/pcre.html
 ## Old version (before 1.0.11)
 
 <a href="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif"><img src="https://raw.github.com/cedlemo/topinambour/master/terminal_selector_screen.gif" style="width:576px;height:324px;" alt="Color selection gif"></a>

data/lib/font_selector.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
@@ -33,8 +33,7 @@ class TopinambourFontSelector < Gtk::Box
     font_button.use_font = true
     font_button.use_size = false
     font_button.signal_connect "font-set" do
-      font_desc = Pango::FontDescription.new(font_button.font_name)
-      @window.notebook.current.term.font = font_desc
+      @window.notebook.current.term.font = font_button.font_name
     end
     pack_start(font_button, :expand => false, :fill => false, :padding => 0)
 

data/lib/notebook.rb

@@ -86,7 +86,7 @@ class TopinambourNotebook < Gtk::Notebook
                                       w, h)
     cr = Cairo::Context.new(surface)
     current.term.draw(cr)
-    pix = surface.to_pixbuf(0, 0, w, h)
+    pix = surface.to_pixbuf(:src_x => 0, :src_y => 0, :width => w, :height => h)
     current.term.preview = pix if pix
   end
 

data/lib/terminal.rb

@@ -91,7 +91,8 @@ class TopinambourTerminal < Vte::Terminal
   end
 
   def font=(font_str)
-    application.settings["font"] = Pango::FontDescription.new(font_str)
+    application.settings["font"] = font_str
+    font = Pango::FontDescription.new(font_str)
     set_font(font)
     @font = font
   end
@@ -152,10 +153,20 @@ class TopinambourTerminal < Vte::Terminal
                 :CSS_COLORS]
     @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)
+      flags = [:optimize,
+               :multiline]
+      if Vte::Regex
+        # PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_MULTILINE
+        pcre2_utf = "0x00080000".to_i(16)
+        pcre2_no_utf_check = "0x40000000".to_i(16)
+        pcre2_multiline = "0x00000400".to_i(16)
+        flags = pcre2_utf | pcre2_no_utf_check | pcre2_multiline
+        regex = Vte::Regex.new(regex_name, flags, :for_match => true)
+        match_add_regex(regex, 0)
+      else
+        regex = GLib::Regex.new(regex_name, :compile_options => flags)
+        match_add_gregex(regex, 0)
+      end
     end
   end
 

data/lib/terminal_chooser.rb

@@ -94,6 +94,9 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     @notebook.children.each_with_index do |child, i|
       row = generate_list_box_row(child.term, i)
       @listbox.insert(row, i)
+      row.close_button.signal_connect "clicked" do |widget|
+        close_button_action(widget)
+      end
     end
     current_row = @listbox.get_row_at_index(@notebook.current_page)
     @listbox.select_row(current_row)
@@ -104,217 +107,147 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
     @notebook.hidden.each_with_index do |child, i|
       row = generate_hidden_list_box_row(child.term, i)
       @listbox_hidden.insert(row, i)
+      row.close_button.signal_connect "clicked" do |widget|
+        close_button_action(widget)
+      end
     end
   end
 
-  def generate_list_box_row(term, index)
-    list_box_row = Gtk::ListBoxRow.new
-    hbox = _generate_hbox_list_box_row(list_box_row, term, index)
-    button = generate_hide_button(list_box_row)
-    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
-    list_box_row.add(hbox)
-  end
-
-  def generate_hidden_list_box_row(term, index)
-    list_box_row = Gtk::ListBoxRow.new
-    hbox = _generate_hbox_list_box_row(list_box_row, term, index)
-    button = generate_show_button(list_box_row)
-    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
-    list_box_row.add(hbox)
-  end
-
-  def _generate_hbox_list_box_row(list_box_row, term, index)
-    hbox = Gtk::Box.new(:horizontal, 6)
-    label = leaning_label(index)
-    hbox.pack_start(label, :expand => false, :fill => false, :padding => 6)
-    button = generate_preview_button(term, list_box_row)
-    add_drag_and_drop_functionalities(button)
-    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
-    label = generate_label(term)
-    hbox.pack_start(label, :expand => true, :fill => false, :padding => 6)
-    button = generate_hidden_list_box_row_close(list_box_row)
-    hbox.pack_start(button, :expand => false, :fill => false, :padding => 6)
-    hbox
-  end
-
-  def generate_hidden_list_box_row_close(list_box_row)
-    button = Gtk::Button.new(:icon_name => "window-close-symbolic",
-                             :size => :button)
-    button.relief = :none
-    button.signal_connect "clicked" do
-      @notebook.hidden.delete_at(list_box_row.index)
-      list_box_row.destroy
+  def close_button_action(button)
+    row = button.parent.parent
+    listbox = row.parent
+    if listbox == @listbox
+      tab = @notebook.get_nth_page(row.index)
+      @notebook.n_pages == 1 ? @window.quit_gracefully : @notebook.remove(tab)
+      row.destroy
+      update_tabs_num_labels
+    elsif listbox == @listbox_hidden
+      @notebook.hidden.delete_at(row.index)
+      row.destroy
+      update_tabs_num_labels
     end
-    button
   end
 
-  def leaning_label(index)
-    label = Gtk::Label.new("tab. #{index + 1}")
-    label.angle = 45
-    label
+  def generate_list_box_row(term, index)
+    list_box_row = ChooserListRow.new(term, index, @notebook)
+    generate_hide_button(list_box_row)
   end
 
-  def generate_preview_button(child, list_box_row)
-    button = Gtk::Button.new
-    button.image = generate_preview_image(child.preview)
-    button.signal_connect("clicked") do
-      if list_box_row.parent == @listbox
-        @notebook.current_page = list_box_row.index
-      end
-    end
-    button
+  def generate_hidden_list_box_row(term, index)
+    list_box_row = ChooserListRow.new(term, index, @notebook)
+    generate_show_button(list_box_row)
   end
 
-  def generate_preview_image(pixbuf)
-    # scaled_pix = pixbuf.scale(150, 75, :bilinear)
-    scaled_pix = pixbuf.scale(200, 100, :bilinear)
-    img = Gtk::Image.new(:pixbuf => scaled_pix)
-    img.show
-    img
+  def generate_show_button(list_box_row)
+    list_box_row.generate_new_action_button("Show")
+    list_box_row.action_button.signal_connect "clicked" do
+      tab_num = list_box_row.index
+      @window.notebook.unhide(tab_num)
+      list_box_row_bkp = generate_hide_button(list_box_row)
+      @listbox_hidden.remove(list_box_row)
+      @listbox.insert(list_box_row_bkp, -1)
+      update_tabs_num_labels
+    end
+    list_box_row
   end
 
   def generate_hide_button(list_box_row)
-    button = Gtk::Button.new(:label => "Hide")
-    button.valign = :center
-    button.vexpand = false
-    button.signal_connect "clicked" do
+    list_box_row.generate_new_action_button("Hide")
+    list_box_row.action_button.signal_connect "clicked" do
       num = list_box_row.index
       @notebook.n_pages == 1 ? @window.quit_gracefully : @notebook.hide(num)
-      list_box_row_bkp = change_button_hide_to_show(list_box_row)
+      list_box_row_bkp = generate_show_button(list_box_row)
       @listbox.remove(list_box_row)
       @listbox_hidden.insert(list_box_row_bkp, -1)
       update_tabs_num_labels
     end
-    button
+    list_box_row
   end
 
-  def generate_show_button(list_box_row)
-    button = Gtk::Button.new(:label => "Show")
-    button.valign = :center
-    button.vexpand = false
-    button.signal_connect "clicked" do
-      tab_num = list_box_row.index
-      @window.notebook.unhide(tab_num)
-      list_box_row_bkp = change_button_show_to_hide(list_box_row)
-      @listbox_hidden.remove(list_box_row)
-      @listbox.insert(list_box_row_bkp, -1)
-      update_tabs_num_labels
+  def update_tabs_num_labels
+    @listbox.children.each_with_index do |row, i|
+      hbox = row.children[0]
+      label = hbox.children[0]
+      label.text = "tab. #{i + 1}"
     end
-    button
-  end
-
-  def change_button_hide_to_show(list_box_row)
-    list_box_row_bkp = list_box_row
-    container = list_box_row_bkp.children[0]
-    hide_button = list_box_row_bkp.children[0].children[4]
-    container.remove(hide_button)
-    show_button = generate_show_button(list_box_row_bkp)
-    show_button.show
-    container.pack_start(show_button,
-                         :expand => false, :fill => false, :padding => 6)
-    list_box_row_bkp
-  end
-
-  def change_button_show_to_hide(list_box_row)
-    list_box_row_bkp = list_box_row
-    container = list_box_row_bkp.children[0]
-    show_button = list_box_row_bkp.children[0].children[4]
-    container.remove(show_button)
-    hide_button = generate_hide_button(list_box_row_bkp)
-    hide_button.show
-    container.pack_start(hide_button,
-                         :expand => false, :fill => false, :padding => 6)
-    list_box_row_bkp
+    update_hidden_tabs_num_labels
   end
 
-  def generate_close_tab_button(list_box_row)
-    button = Gtk::Button.new(:icon_name => "window-close-symbolic",
-                             :size => :button)
-    button.relief = :none
-    button.signal_connect "clicked" do
-      tab = @notebook.get_nth_page(list_box_row.index)
-      @notebook.n_pages == 1 ? @window.quit_gracefully : @notebook.remove(tab)
-      list_box_row.destroy
-      update_tabs_num_labels
+  def update_hidden_tabs_num_labels
+    @listbox_hidden.children.each_with_index do |row, i|
+      hbox = row.children[0]
+      label = hbox.children[0]
+      label.text = "tab. #{i + 1}"
     end
-    button
   end
+end
 
-  def add_label_popup_entry_icon_release(entry, label, term)
-    entry.signal_connect "icon-release" do |widget, position|
-      if position == :secondary
-        term.custom_title = nil
-        label.text = term.window_title
-        term.toplevel.current_label.text = label.text
-        widget.buffer.text = label.text
-      end
-    end
+class ChooserListRow < Gtk::ListBoxRow
+  attr_reader :close_button
+  def initialize(term, index, notebook)
+    super()
+    @notebook = notebook
+    @hbox = Gtk::Box.new(:horizontal, 6)
+    fill_hbox_list_box_row(term, index)
+    generate_action_button
+    add(@hbox)
   end
 
-  def add_label_popup_entry_activate_signal(entry, popup, label, term)
-    entry.signal_connect "activate" do |widget|
-      label.text = widget.buffer.text
-      term.custom_title = widget.buffer.text
-      popup.destroy
-    end
+  def action_button
+    @hbox.children[4]
   end
 
-  def generate_label_popup(label, event, term)
-    entry = initialize_entry_popup(label)
-    pp = Gtk::Popover.new
-    add_label_popup_entry_activate_signal(entry, pp, label, term)
-    add_label_popup_entry_icon_release(entry, label, term)
-    pp.add(entry)
-    set_popup_position(pp, label, event)
+  def generate_new_action_button(label)
+    button = Gtk::Button.new(:label => label)
+    button.valign = :center
+    button.vexpand = false
+    @hbox.remove(action_button)
+    @hbox.pack_start(button,
+                     :expand => false, :fill => false, :padding => 6)
+    show_all
   end
 
-  def initialize_entry_popup(label)
-    entry = Gtk::Entry.new
-    entry.max_width_chars = 50
-    entry.buffer.text = label.text
-    entry.set_icon_from_icon_name(:secondary, "edit-clear-symbolic")
-    entry
-  end
+  private
 
-  def set_popup_position(popup, label, event)
-    x, y = event.window.coords_to_parent(event.x, event.y)
-    rect = Gdk::Rectangle.new(x - label.allocation.x, y - label.allocation.y,
-                              1, 1)
-    popup.pointing_to = rect
-    popup.relative_to = label
-    popup.show_all
+  def fill_hbox_list_box_row(term, index)
+    label = leaning_label(index)
+    @hbox.pack_start(label, :expand => false, :fill => false, :padding => 6)
+    @prev_button = generate_preview_button(term)
+    add_drag_and_drop_functionalities
+    @hbox.pack_start(@prev_button, :expand => false, :fill => false, :padding => 6)
+    label = EditableLabel.new(term)
+    @hbox.pack_start(label, :expand => true, :fill => false, :padding => 6)
+    generate_close_button
+    @hbox.pack_start(@close_button, :expand => false, :fill => false, :padding => 6)
+    @hbox
   end
 
-  def generate_label(term)
-    label = Gtk::Label.new(term.terminal_title)
-    label.halign = :start
-    label.selectable = true
-    label.signal_connect "button-release-event" do |w, e|
-      generate_label_popup(w, e, term)
-    end
+  def leaning_label(index)
+    label = Gtk::Label.new("tab. #{index + 1}")
+    label.angle = 45
     label
   end
 
-  def update_tabs_num_labels
-    @listbox.children.each_with_index do |row, i|
-      hbox = row.children[0]
-      label = hbox.children[0]
-      label.text = "tab. #{i + 1}"
+  def generate_preview_button(child)
+    button = Gtk::Button.new
+    button.image = generate_preview_image(child.preview)
+    button.signal_connect("clicked") do
+      @notebook.current_page = index parent.class == Gtk::ListBox
     end
-    update_hidden_tabs_num_labels
+    button
   end
 
-  def update_hidden_tabs_num_labels
-    @listbox_hidden.children.each_with_index do |row, i|
-      hbox = row.children[0]
-      label = hbox.children[0]
-      label.text = "tab. #{i + 1}"
-    end
+  def generate_preview_image(pixbuf)
+    # scaled_pix = pixbuf.scale(150, 75, :bilinear)
+    scaled_pix = pixbuf.scale(200, 100, :bilinear)
+    img = Gtk::Image.new(:pixbuf => scaled_pix)
+    img.show
+    img
   end
 
-  def add_drag_and_drop_functionalities(button)
-    add_dnd_source(button)
-    add_dnd_destination(button)
+  def add_drag_and_drop_functionalities
+    add_dnd_source(@prev_button)
+    add_dnd_destination(@prev_button)
   end
 
   def add_dnd_source(button)
@@ -382,13 +315,83 @@ class TopinambourTermChooser < Gtk::ScrolledWindow
   end
 
   def drag_image_and_reorder_terms(src_index, dest_index)
-    dragged = @window.notebook.get_nth_page(src_index)
-    @window.notebook.reorder_child(dragged, dest_index)
-    @window.notebook.children.each_with_index do |child, i|
+    dragged = @notebook.get_nth_page(src_index)
+    @notebook.reorder_child(dragged, dest_index)
+    @notebook.children.each_with_index do |child, i|
       list_box_row = @listbox.get_row_at_index(i)
       row_h_box = list_box_row.children[0]
       row_h_box.children[1].image = generate_preview_image(child.term.preview)
       row_h_box.children[2].text = child.term.terminal_title
     end
   end
+
+  def generate_close_button
+    @close_button = Gtk::Button.new(:icon_name => "window-close-symbolic",
+                                    :size => :button)
+    @close_button.relief = :none
+  end
+
+  def generate_action_button
+    action_button = Gtk::Button.new(:label => "")
+    action_button.valign = :center
+    action_button.vexpand = false
+    @hbox.pack_start(action_button,
+                     :expand => false, :fill => false, :padding => 6)
+  end
+end
+
+class EditableLabel < Gtk::Label
+  def initialize(term)
+    super(term.terminal_title)
+    set_halign(:start)
+    set_selectable(true)
+    signal_connect "button-release-event" do |w, e|
+      generate_label_popup(w, e, term)
+    end
+    label
+  end
+
+  def generate_label_popup(label, event, term)
+    initialize_entry_popup(label)
+    @popup = Gtk::Popover.new
+    add_label_popup_entry_activate_signal(label, term)
+    add_label_popup_entry_icon_release(label, term)
+    @popup.add(@entry)
+    set_popup_position(label, event)
+  end
+
+  def initialize_entry_popup(label)
+    @entry = Gtk::Entry.new
+    @entry.max_width_chars = 50
+    @entry.buffer.text = label.text
+    @entry.set_icon_from_icon_name(:secondary, "edit-clear-symbolic")
+  end
+
+  def add_label_popup_entry_icon_release(label, term)
+    @entry.signal_connect "icon-release" do |widget, position|
+      if position == :secondary
+        term.custom_title = nil
+        label.text = term.window_title
+        term.toplevel.current_label.text = label.text
+        widget.buffer.text = label.text
+      end
+    end
+  end
+
+  def add_label_popup_entry_activate_signal(label, term)
+    @entry.signal_connect "activate" do |widget|
+      label.text = widget.buffer.text
+      term.custom_title = widget.buffer.text
+      @popup.destroy
+    end
+  end
+
+  def set_popup_position(label, event)
+    x, y = event.window.coords_to_parent(event.x, event.y)
+    rect = Gdk::Rectangle.new(x - label.allocation.x, y - label.allocation.y,
+                              1, 1)
+    @popup.pointing_to = rect
+    @popup.relative_to = label
+    @popup.show_all
+  end
 end

data/lib/window.rb

@@ -86,11 +86,11 @@ class TopinambourWindow < Gtk::ApplicationWindow
     Gtk::AboutDialog.show(self,
                           "authors" => ["Cedric Le Moigne <cedlemo@gmx.com>"],
                           "comments" => "Terminal Emulator based on the ruby bindings of Gtk3 and Vte3",
-                          "copyright" => "Copyright (C) 2015-2016 Cedric Le Moigne",
+                          "copyright" => "Copyright (C) 2015-2017 Cedric Le Moigne",
                           "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.13",
+                          "version" => "1.0.14",
                           "website" => "https://github.com/cedlemo/topinambour",
                           "website_label" => "Topinambour github repository"
                          )

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Cedric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-17 00:00:00.000000000 Z
+date: 2017-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: vte3
@@ -87,7 +87,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Ruby-gnome2 Terminal emulator