topinambour 2.0.4 → 2.0.6

data/lib/terminal_regex.rb

@@ -138,3 +138,12 @@ module TopinambourRegex
   REGEX_NEWS_MAN = "(?i:news:|man:|info:)[-[:alnum:]\\Q^_{|}~!\"#$%&'()*+,./;:=?`\\E]+"
   include ColorRegexes
 end
+
+module Pcre2
+  # PCRE2_UTF | PCRE2_NO_UTF_CHECK | PCRE2_MULTILINE
+  UTF = "0x00080000".to_i(16)
+  NO_UTF_CHECK = "0x40000000".to_i(16)
+  MULTILINE = "0x00000400".to_i(16)
+  ALL_FLAGS = UTF | NO_UTF_CHECK | MULTILINE
+
+end

data/lib/version.rb

@@ -0,0 +1,25 @@
+# Copyright 2018 Cedric 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/>.
+
+## Module that stores the version information for About class and
+#  the gemspec.
+module Version
+  MAJOR = 2
+  MINOR = 0
+  MICRO = 6
+
+  STRING = "#{MAJOR}.#{MINOR}.#{MICRO}".freeze
+end

data/lib/window.rb

@@ -14,137 +14,109 @@
 # 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
-  attr_reader :bar, :overlay, :terminal
-  def initialize(application)
-    super(application)
-    set_icon_name("utilities-terminal-symbolic")
-    set_name("topinambour-window")
-    load_settings
-    set_position(:center)
-    create_header_bar
-    @overlay = Gtk::Overlay.new
-    add(@overlay)
-    show_all
-    signal_connect "key-press-event" do |widget, event|
-      TopinambourShortcuts.handle_key_press(widget, event)
-    end
-  end
-
-  def add_terminal(cmd = nil)
-    cmd = cmd || application.settings["default-shell"]
-
-    terminal = TopinambourTermBox.new(cmd)
-    @overlay.add(terminal)
-    @terminal = terminal.term
-    terminal.term.load_settings
-  end
-
+## Actions of the window that will be called throught the Application instance.
+#  or throught terminal signals.
+module TopinambourWindowActions
   def quit_gracefully
-    application.quit
+    @application.quit
   end
 
   def show_color_selector
-    toggle_overlay(TopinambourColorSelector)
+    @overlay.toggle_overlay(TopinambourColorSelector)
   end
 
   def show_font_selector
-    toggle_overlay(TopinambourFontSelector)
-  end
-
-  def exit_overlay_mode
-    @overlay.children[1].destroy if in_overlay_mode?
+    @overlay.toggle_overlay(TopinambourFontSelector)
   end
 
   def display_about
-    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-2018 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" => "2.0.4",
-                          "website" => "https://github.com/cedlemo/topinambour",
-                          "website_label" => "Topinambour github repository"
-                         )
-  end
-
-  def in_overlay_mode?
-    @overlay.children.size > 1 ? true : false
-  end
-
-  def toggle_shrink
-    w, h = size
-    if @shrink_saved_height
-      resize(w, @shrink_saved_height)
-      @shrink_saved_height = nil
-    else
-      resize(w, 1)
-      @shrink_saved_height = h
-    end
+    About.dialog(self)
   end
 
   def show_shortcuts
-    resource_file = "/com/github/cedlemo/topinambour/shortcuts.ui"
-    builder = Gtk::Builder.new(:resource => resource_file)
-    shortcuts_win = builder["shortcuts-window"]
+    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
+end
 
-  def load_settings
-    height = application.settings["height"]
-    width = application.settings["width"]
-    resize(width, height)
+## Main window of Topinambour
+#
+class TopinambourWindow < Gtk::ApplicationWindow
+  attr_reader :terminal, :overlay
+  include TopinambourWindowActions
+
+  def initialize(application)
+    super(application)
+    @application = application
+    set_icon_name('utilities-terminal-symbolic')
+    set_name('topinambour-window')
+    set_position(:center)
+    @overlay = TopinambourOverlay.new
+    create_header_bar
+
+    signal_connect 'key-press-event' do |widget, event|
+      TopinambourShortcuts.handle_key_press(widget, event)
+    end
+
+    add(@overlay)
   end
 
-  def add_overlay(widget)
-    @overlay.add_overlay(widget)
-    @overlay.set_overlay_pass_through(widget, false)
+  def add_terminal(cmd = '/usr/bin/zsh')
+    terminal = TopinambourTermBox.new(cmd, self)
+    @terminal = terminal.term
+    @overlay.add_main_widget(terminal)
   end
 
   def create_header_bar
     headerbar = Gtk::HeaderBar.new
-    headerbar.name = "topinambour-headerbar"
+    headerbar.name = 'topinambour-headerbar'
     headerbar.show_close_button = true
     set_titlebar(headerbar)
   end
 
-  def main_menu_signal(builder)
-    button = builder["menu_button"]
-    ui_file = "/com/github/cedlemo/topinambour/main-menu-popover.ui"
-    menu_builder = Gtk::Builder.new(:resource => ui_file)
-    main_menu = menu_builder["main_menu_popover"]
-    button.set_popover(main_menu)
-    button.popover.modal = true
-    add_theme_menu_buttons_signals(menu_builder)
+  def exit_overlay_mode
+    @overlay.exit_overlay_mode
   end
+end
 
-  def add_theme_menu_buttons_signals(builder)
-    builder["css_reload_button"].signal_connect "clicked" do
-      application.reload_css_config
-      queue_draw
-    end
+## This overlay contains the main terminal and allows another widgets to be
+#  displayed on top of it.
+class TopinambourOverlay < Gtk::Overlay
+  def initialize
+    super()
+  end
 
-    builder["font_sel_button"].signal_connect "clicked" do
-      show_font_selector
-    end
+  def add_main_widget(terminal)
+    @terminal = terminal
+    add(@terminal)
+  end
 
-    builder["colors_sel_button"].signal_connect "clicked" do
-      show_color_selector
-    end
+  # Add a widget over the main widget of the overlay.
+  def add_secondary_widget(widget)
+    add_overlay(widget)
+    set_overlay_pass_through(widget, false)
+  end
+
+  # Check if there is a widget displayed on top of the main widget.
+  def in_overlay_mode?
+    children.size > 1
+  end
+
+  # Display only the main widget.
+  def exit_overlay_mode
+    children[1].destroy if in_overlay_mode?
   end
 
   def toggle_overlay(klass)
+    exit_overlay_mode
     if in_overlay_mode? && @overlay.children[1].class == klass
-      exit_overlay_mode
-      @terminal.grab_focus
+      @terminal.term.grab_focus
     else
-      exit_overlay_mode
-      add_overlay(klass.new(self))
-      @overlay.children[1].show_all
+      add_secondary_widget(klass.new(@terminal.toplevel))
+      children[1].show_all
     end
   end
 end

metadata

@@ -1,15 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: topinambour
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.6
 platform: ruby
 authors:
 - Cedric LE MOIGNE
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-08 00:00:00.000000000 Z
+date: 2019-03-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: gtk3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.2.6
 - !ruby/object:Gem::Dependency
   name: vte3
   requirement: !ruby/object:Gem::Requirement
@@ -30,8 +50,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.1.0
-description: Terminal Emulator based on the libs vte3 and gtk3 from the ruby-gnome2
-  project
+description: Terminal Emulator based on the ruby bindings of Gtk3 and Vte3
 email: cedlemo@gmx.com
 executables:
 - topinambour
@@ -53,16 +72,18 @@ files:
 - data/topinambour.gresource.xml
 - data/topinambour.gschema.xml
 - data/window-menu.ui
-- data/window.ui
+- lib/about.rb
 - lib/actions.rb
 - lib/application.rb
 - lib/color_selector.rb
 - lib/font_selector.rb
 - lib/preferences.rb
+- lib/profile.rb
 - lib/rgb_names_regexes.rb
 - lib/shortcuts.rb
 - lib/terminal.rb
 - lib/terminal_regex.rb
+- lib/version.rb
 - lib/window.rb
 homepage: https://github.com/cedlemo/topinambour
 licenses:
@@ -83,9 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
-summary: Ruby-gnome2 Terminal emulator
+summary: Vte3 Terminal emulator in ruby.
 test_files: []

data/data/window.ui

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.3 -->
-<interface>
-  <requires lib="gtk+" version="3.12"/>
-  <template class="window" parent="GtkWindow">
-    <property name="can_focus">False</property>
-    <child>
-      <object class="GtkNotebook" id="notebook">
-        <property name="visible">True</property>
-        <property name="can_focus">True</property>
-        <property name="show_border">False</property>
-        <property name="scrollable">True</property>
-        <property name="enable_popup">True</property>
-        <child>
-          <placeholder/>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 1</property>
-          </object>
-          <packing>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label2">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 2</property>
-          </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-        <child>
-          <placeholder/>
-        </child>
-        <child type="tab">
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">page 3</property>
-          </object>
-          <packing>
-            <property name="position">2</property>
-            <property name="tab_fill">False</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>