topinambour 1.0.8 → 1.0.9

data/lib/actions.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -37,9 +37,19 @@ module TopinambourActions
     action
   end
 
+  def self.generate_css_editor_action(application)
+    action = generate_action("css_editor") do |_act, _param|
+      application.windows[0].show_css_editor
+    end
+    action
+  end
+
   def self.generate_preferences_action(application)
     action = generate_action("preferences") do |_act, _param|
-      puts "TODO"
+      dialog = TopinambourPreferences.generate_dialog(application.windows.first)
+      
+      dialog.run
+      application.windows.first.notebook.current.grab_focus
     end
     action
   end
@@ -61,7 +71,7 @@ module TopinambourActions
         term.copy_clipboard
       else
         clipboard = Gtk::Clipboard.get_default(Gdk::Display.default)
-        clipboard.text = term.last_match
+        clipboard.text = term.last_match unless term.last_match.nil?
       end
     end
     action
@@ -75,7 +85,7 @@ module TopinambourActions
   end
 
   def self.add_actions_to(application)
-    %w(about preferences quit term_copy term_paste).each do |name|
+    %w(about preferences quit term_copy term_paste css_editor).each do |name|
       add_action_to(name, application)
     end
   end

data/lib/application.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -47,9 +47,9 @@ class TopinambourApplication < Gtk::Application
 
     begin
       load_custom_css_config
-    rescue
-      puts "Bad css file using default css"
-      load_default_css_config
+    rescue => e
+      puts "Bad css file using default css, #{e.message}"
+      load_default_css_config # Use last workin Css instead
     end
   end
 
@@ -90,8 +90,8 @@ class TopinambourApplication < Gtk::Application
     if File.exist?(USR_CSS)
       begin
         load_custom_css_config
-      rescue
-        puts "Bad css file using default css"
+      rescue => e
+        puts "Bad css file using default css #{e.message}"
         load_default_css_config
       end
     else

data/lib/color_selector.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -55,11 +55,8 @@ class TopinambourColorSelector < Gtk::Box
 
   def apply_new_css_properties(toplevel, props)
     toplevel.application.update_css(props)
-    toplevel.notebook.each do |tab|
-      next unless tab.class == TopinambourTerminal
-      tab.colors = @colors
-      tab.apply_colors
-    end
+    toplevel.notebook.send_to_all_terminals("colors=", [@colors])
+    toplevel.notebook.send_to_all_terminals("apply_colors", nil)
   end
 
   def generate_save_button

data/lib/css_editor.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify

data/lib/css_handler.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -72,14 +72,19 @@ module CssHandler
     parsed_color ? true : false
   end
 
-  def self.property_to_css_instructions(name, value)
-    if value.class == String && color_property?(value)
-      "#{name}: #{value}"
+  def self.value_to_css_value(value)
+     if value.class == String && color_property?(value)
+      "#{value}"
     elsif value.class == String
-      %(#{name}: "#{value}")
+      %("#{value}")
     else
-      "#{name}: #{value}"
+      "#{value}"
     end
+
+  end
+
+  def self.property_to_css_instructions(name, value)
+    "#{name}: #{value_to_css_value(value)}"
   end
 
   def self.props_with_name(tree, prop_name)
@@ -116,7 +121,7 @@ module CssHandler
     else
       tmp = ""
       if line_number == start_range.line
-        tmp += line[0..(start_range.offset - 2)] + value
+        tmp += line[0..(start_range.offset - 2)] + value_to_css_value(value)
       end
       tmp += line[(end_range.offset - 1)..-1] if line_number == end_range.line
       tmp

data/lib/font_selector.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -45,9 +45,7 @@ class TopinambourFontSelector < Gtk::Box
       font = @window.notebook.current.font
       new_props["-TopinambourTerminal-font"] = font.to_s
       toplevel.application.update_css(new_props)
-      toplevel.notebook.each do |tab|
-        tab.set_font(font) if tab.class == TopinambourTerminal
-      end
+      toplevel.notebook.send_to_all_terminals("set_font", font)
       toplevel.exit_overlay_mode
     end
     pack_start(save_button, :expand => false, :fill => false, :padding => 0)

data/lib/notebook.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -40,6 +40,7 @@ class TopinambourNotebook < Gtk::Notebook
     end
 
     set_show_tabs(false)
+    set_show_border(false)
   end
 
   def remove_all_pages
@@ -83,4 +84,11 @@ class TopinambourNotebook < Gtk::Notebook
     pix = surface.to_pixbuf(0, 0, w, h)
     current.preview = pix if pix
   end
+
+  def send_to_all_terminals(method_name, values)
+    each do |tab|
+      next unless tab.class == TopinambourTerminal
+      tab.send(method_name, *values)
+    end
+  end
 end

data/lib/preferences.rb

@@ -0,0 +1,185 @@
+# Copyright 2016 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/>.
+require "gtksourceview3"
+
+module TopinambourPreferences
+  def self.generate_dialog(parent)
+    resource_file = "/com/github/cedlemo/topinambour/prefs-dialog.ui"
+    builder = Gtk::Builder.new(:resource => resource_file)
+    dialog = builder["Preferences_dialog"]
+    dialog.transient_for = parent
+    add_source_view_style_chooser(builder, parent)
+    add_actions(builder, parent)
+    connect_response(dialog, builder)
+    dialog
+  end
+
+  def self.connect_response(dialog, builder)
+    dialog.signal_connect "response" do |widget, response|
+      case response
+      when 1
+        on_apply_response(widget, builder)
+      else
+        widget.destroy
+      end
+    end
+  end
+
+  def self.on_apply_response(widget, builder)
+    props = get_all_properties(widget, builder)
+    toplevel = widget.transient_for
+    toplevel.application.update_css(props)
+    widget.destroy
+  end
+
+  def self.get_all_properties(widget, builder)
+    props = {}
+    props.merge!(get_source_view_style(builder))
+    props.merge!(get_entry_value(builder))
+    props.merge!(get_switch_values(builder))
+    props.merge!(get_spin_values(widget))
+    props.merge!(get_combo_values(builder))
+  end
+
+  def self.add_actions(builder, parent)
+    %w(audible_bell allow_bold scroll_on_output
+       scroll_on_keystroke rewrap_on_resize mouse_autohide).each do |prop_name|
+      gen_switch_actions(prop_name, builder, parent)
+    end
+    gen_entry_actions("shell", builder, parent)
+    %w(cursor_shape cursor_blink_mode backspace_binding
+       delete_binding).each do |prop_name|
+      gen_combobox_actions(prop_name, builder, parent)
+    end
+    gen_spinbuttons_actions(builder, parent)
+  end
+
+  def self.gen_switch_actions(property_name, builder, parent)
+    switch = builder["#{property_name}_switch"]
+    switch.active = parent.notebook.current.send("#{property_name}?")
+    switch.signal_connect "state-set" do |_widget, state|
+      parent.notebook.send_to_all_terminals("#{property_name}=", state)
+      false
+    end
+  end
+
+  def self.gen_entry_actions(property_name, builder, parent)
+    entry = builder["#{property_name}_entry"]
+    entry.text = parent.shell
+    entry.set_icon_from_icon_name(:secondary, "edit-clear")
+    entry.signal_connect("activate") { |widget| parent.shell = widget.text }
+
+    entry.signal_connect "icon-release" do |widget, position|
+      if position == :secondary
+        parent.shell = widget.text = parent.style_get_property(property_name)
+      end
+    end
+  end
+
+  def self.gen_combobox_actions(property_name, builder, parent)
+    combobox = builder["#{property_name}_sel"]
+    id = parent.notebook.current.send("#{property_name}").nick + "_id"
+    combobox.active_id = id
+    combobox.signal_connect "changed" do |widget|
+      value = widget.active_id.gsub(/_id/, "").to_sym
+      parent.notebook.send_to_all_terminals("#{property_name}=", value)
+    end
+  end
+
+  def self.gen_spinbuttons_actions(builder, parent)
+    width_spin = builder["width_spin"]
+    height_spin = builder["height_spin"]
+    width_spin.set_range(0, 2000)
+    height_spin.set_range(0, 1000)
+    width_spin.value, height_spin.value = parent.size
+    gen_width_button_action(width_spin, parent)
+    gen_height_button_action(height_spin, parent)
+  end
+
+  def self.gen_width_button_action(spin_widget, parent)
+    spin_widget.signal_connect "value-changed" do |widget|
+      _, h = parent.size
+      parent.resize(widget.value, h)
+      w, _h = parent.size
+      widget.value = w if widget.value + 1 < w
+    end
+  end
+
+  def self.gen_height_button_action(spin_widget, parent)
+    spin_widget.signal_connect "value-changed" do |widget|
+      w, _h = parent.size
+      parent.resize(w, widget.value)
+      _, h = parent.size
+      widget.value = h if widget.value + 1 < h
+    end
+  end
+
+  # Hack because when added via glade, the builder fail to load the ui.
+  def self.add_source_view_style_chooser(builder, parent)
+    box = builder["gen_prefs_box"]
+    button = GtkSource::StyleSchemeChooserButton.new
+    sm = GtkSource::StyleSchemeManager.default
+    button.style_scheme = sm.get_scheme(parent.css_editor_style)
+    button.show
+    button.signal_connect "style-updated" do |widget|
+      parent.css_editor_style = widget.style_scheme.id
+    end
+    box.pack_start(button, :expand => true, :fill => false)
+  end
+
+  def self.get_source_view_style(builder)
+    box = builder["gen_prefs_box"]
+    penultimate = box.children.size - 2
+    style = box.children[penultimate].style_scheme.id
+    { "-TopinambourWindow-css-editor-style" =>  style }
+  end
+
+  def self.get_entry_value(builder)
+    text = builder["shell_entry"].text
+    { "-TopinambourWindow-shell" => text }
+  end
+
+  def self.get_switch_values(builder)
+    props = {}
+    %w(audible_bell allow_bold scroll_on_output
+       scroll_on_keystroke rewrap_on_resize mouse_autohide).each do |prop_name|
+      switch = builder["#{prop_name}_switch"]
+      name = prop_name.tr("_", "-")
+      props["-TopinambourTerminal-#{name}"] = switch.active?
+    end
+    props
+  end
+
+  def self.get_combo_values(builder)
+    props = {}
+    %w(cursor_shape cursor_blink_mode backspace_binding
+       delete_binding).each do |prop_name|
+      combobox = builder["#{prop_name}_sel"]
+      value = combobox.active_id.gsub(/_id\z/, "")
+      name = prop_name.tr("_", "-")
+      props["-TopinambourTerminal-#{name}"] = value.to_sym
+    end
+    props
+  end
+
+  def self.get_spin_values(widget)
+    props = {}
+    w, h = widget.transient_for.size
+    props["-TopinambourWindow-width"] = w
+    props["-TopinambourWindow-height"] = h
+    props
+  end
+end

data/lib/resize_message.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify

data/lib/rgb_names_regexes.rb

@@ -0,0 +1,3 @@
+module RgbNames
+COLOR_NAMES = "(snow|ghost white|GhostWhite|white smoke|WhiteSmoke|gainsboro|floral white|FloralWhite|old lace|OldLace|linen|antique white|AntiqueWhite|papaya whip|PapayaWhip|blanched almond|BlanchedAlmond|bisque|peach puff|PeachPuff|navajo white|NavajoWhite|moccasin|cornsilk|ivory|lemon chiffon|LemonChiffon|seashell|honeydew|mint cream|MintCream|azure|alice blue|AliceBlue|lavender|lavender blush|LavenderBlush|misty rose|MistyRose|white|black|dark slate gray|DarkSlateGray|dark slate grey|DarkSlateGrey|dim gray|DimGray|dim grey|DimGrey|slate gray|SlateGray|slate grey|SlateGrey|light slate gray|LightSlateGray|light slate grey|LightSlateGrey|gray|grey|light grey|LightGrey|light gray|LightGray|midnight blue|MidnightBlue|navy|navy blue|NavyBlue|cornflower blue|CornflowerBlue|dark slate blue|DarkSlateBlue|slate blue|SlateBlue|medium slate blue|MediumSlateBlue|light slate blue|LightSlateBlue|medium blue|MediumBlue|royal blue|RoyalBlue|blue|dodger blue|DodgerBlue|deep sky blue|DeepSkyBlue|sky blue|SkyBlue|light sky blue|LightSkyBlue|steel blue|SteelBlue|light steel blue|LightSteelBlue|light blue|LightBlue|powder blue|PowderBlue|pale turquoise|PaleTurquoise|dark turquoise|DarkTurquoise|medium turquoise|MediumTurquoise|turquoise|cyan|light cyan|LightCyan|cadet blue|CadetBlue|medium aquamarine|MediumAquamarine|aquamarine|dark green|DarkGreen|dark olive green|DarkOliveGreen|dark sea green|DarkSeaGreen|sea green|SeaGreen|medium sea green|MediumSeaGreen|light sea green|LightSeaGreen|pale green|PaleGreen|spring green|SpringGreen|lawn green|LawnGreen|green|chartreuse|medium spring green|MediumSpringGreen|green yellow|GreenYellow|lime green|LimeGreen|yellow green|YellowGreen|forest green|ForestGreen|olive drab|OliveDrab|dark khaki|DarkKhaki|khaki|pale goldenrod|PaleGoldenrod|light goldenrod yellow|LightGoldenrodYellow|light yellow|LightYellow|yellow|gold|light goldenrod|LightGoldenrod|goldenrod|dark goldenrod|DarkGoldenrod|rosy brown|RosyBrown|indian red|IndianRed|saddle brown|SaddleBrown|sienna|peru|burlywood|beige|wheat|sandy brown|SandyBrown|tan|chocolate|firebrick|brown|dark salmon|DarkSalmon|salmon|light salmon|LightSalmon|orange|dark orange|DarkOrange|coral|light coral|LightCoral|tomato|orange red|OrangeRed|red|hot pink|HotPink|deep pink|DeepPink|pink|light pink|LightPink|pale violet red|PaleVioletRed|maroon|medium violet red|MediumVioletRed|violet red|VioletRed|magenta|violet|plum|orchid|medium orchid|MediumOrchid|dark orchid|DarkOrchid|dark violet|DarkViolet|blue violet|BlueViolet|purple|medium purple|MediumPurple|thistle|snow1|snow2|snow3|snow4|seashell1|seashell2|seashell3|seashell4|AntiqueWhite1|AntiqueWhite2|AntiqueWhite3|AntiqueWhite4|bisque1|bisque2|bisque3|bisque4|PeachPuff1|PeachPuff2|PeachPuff3|PeachPuff4|NavajoWhite1|NavajoWhite2|NavajoWhite3|NavajoWhite4|LemonChiffon1|LemonChiffon2|LemonChiffon3|LemonChiffon4|cornsilk1|cornsilk2|cornsilk3|cornsilk4|ivory1|ivory2|ivory3|ivory4|honeydew1|honeydew2|honeydew3|honeydew4|LavenderBlush1|LavenderBlush2|LavenderBlush3|LavenderBlush4|MistyRose1|MistyRose2|MistyRose3|MistyRose4|azure1|azure2|azure3|azure4|SlateBlue1|SlateBlue2|SlateBlue3|SlateBlue4|RoyalBlue1|RoyalBlue2|RoyalBlue3|RoyalBlue4|blue1|blue2|blue3|blue4|DodgerBlue1|DodgerBlue2|DodgerBlue3|DodgerBlue4|SteelBlue1|SteelBlue2|SteelBlue3|SteelBlue4|DeepSkyBlue1|DeepSkyBlue2|DeepSkyBlue3|DeepSkyBlue4|SkyBlue1|SkyBlue2|SkyBlue3|SkyBlue4|LightSkyBlue1|LightSkyBlue2|LightSkyBlue3|LightSkyBlue4|SlateGray1|SlateGray2|SlateGray3|SlateGray4|LightSteelBlue1|LightSteelBlue2|LightSteelBlue3|LightSteelBlue4|LightBlue1|LightBlue2|LightBlue3|LightBlue4|LightCyan1|LightCyan2|LightCyan3|LightCyan4|PaleTurquoise1|PaleTurquoise2|PaleTurquoise3|PaleTurquoise4|CadetBlue1|CadetBlue2|CadetBlue3|CadetBlue4|turquoise1|turquoise2|turquoise3|turquoise4|cyan1|cyan2|cyan3|cyan4|DarkSlateGray1|DarkSlateGray2|DarkSlateGray3|DarkSlateGray4|aquamarine1|aquamarine2|aquamarine3|aquamarine4|DarkSeaGreen1|DarkSeaGreen2|DarkSeaGreen3|DarkSeaGreen4|SeaGreen1|SeaGreen2|SeaGreen3|SeaGreen4|PaleGreen1|PaleGreen2|PaleGreen3|PaleGreen4|SpringGreen1|SpringGreen2|SpringGreen3|SpringGreen4|green1|green2|green3|green4|chartreuse1|chartreuse2|chartreuse3|chartreuse4|OliveDrab1|OliveDrab2|OliveDrab3|OliveDrab4|DarkOliveGreen1|DarkOliveGreen2|DarkOliveGreen3|DarkOliveGreen4|khaki1|khaki2|khaki3|khaki4|LightGoldenrod1|LightGoldenrod2|LightGoldenrod3|LightGoldenrod4|LightYellow1|LightYellow2|LightYellow3|LightYellow4|yellow1|yellow2|yellow3|yellow4|gold1|gold2|gold3|gold4|goldenrod1|goldenrod2|goldenrod3|goldenrod4|DarkGoldenrod1|DarkGoldenrod2|DarkGoldenrod3|DarkGoldenrod4|RosyBrown1|RosyBrown2|RosyBrown3|RosyBrown4|IndianRed1|IndianRed2|IndianRed3|IndianRed4|sienna1|sienna2|sienna3|sienna4|burlywood1|burlywood2|burlywood3|burlywood4|wheat1|wheat2|wheat3|wheat4|tan1|tan2|tan3|tan4|chocolate1|chocolate2|chocolate3|chocolate4|firebrick1|firebrick2|firebrick3|firebrick4|brown1|brown2|brown3|brown4|salmon1|salmon2|salmon3|salmon4|LightSalmon1|LightSalmon2|LightSalmon3|LightSalmon4|orange1|orange2|orange3|orange4|DarkOrange1|DarkOrange2|DarkOrange3|DarkOrange4|coral1|coral2|coral3|coral4|tomato1|tomato2|tomato3|tomato4|OrangeRed1|OrangeRed2|OrangeRed3|OrangeRed4|red1|red2|red3|red4|DebianRed|DeepPink1|DeepPink2|DeepPink3|DeepPink4|HotPink1|HotPink2|HotPink3|HotPink4|pink1|pink2|pink3|pink4|LightPink1|LightPink2|LightPink3|LightPink4|PaleVioletRed1|PaleVioletRed2|PaleVioletRed3|PaleVioletRed4|maroon1|maroon2|maroon3|maroon4|VioletRed1|VioletRed2|VioletRed3|VioletRed4|magenta1|magenta2|magenta3|magenta4|orchid1|orchid2|orchid3|orchid4|plum1|plum2|plum3|plum4|MediumOrchid1|MediumOrchid2|MediumOrchid3|MediumOrchid4|DarkOrchid1|DarkOrchid2|DarkOrchid3|DarkOrchid4|purple1|purple2|purple3|purple4|MediumPurple1|MediumPurple2|MediumPurple3|MediumPurple4|thistle1|thistle2|thistle3|thistle4|gray0|grey0|gray1|grey1|gray2|grey2|gray3|grey3|gray4|grey4|gray5|grey5|gray6|grey6|gray7|grey7|gray8|grey8|gray9|grey9|gray10|grey10|gray11|grey11|gray12|grey12|gray13|grey13|gray14|grey14|gray15|grey15|gray16|grey16|gray17|grey17|gray18|grey18|gray19|grey19|gray20|grey20|gray21|grey21|gray22|grey22|gray23|grey23|gray24|grey24|gray25|grey25|gray26|grey26|gray27|grey27|gray28|grey28|gray29|grey29|gray30|grey30|gray31|grey31|gray32|grey32|gray33|grey33|gray34|grey34|gray35|grey35|gray36|grey36|gray37|grey37|gray38|grey38|gray39|grey39|gray40|grey40|gray41|grey41|gray42|grey42|gray43|grey43|gray44|grey44|gray45|grey45|gray46|grey46|gray47|grey47|gray48|grey48|gray49|grey49|gray50|grey50|gray51|grey51|gray52|grey52|gray53|grey53|gray54|grey54|gray55|grey55|gray56|grey56|gray57|grey57|gray58|grey58|gray59|grey59|gray60|grey60|gray61|grey61|gray62|grey62|gray63|grey63|gray64|grey64|gray65|grey65|gray66|grey66|gray67|grey67|gray68|grey68|gray69|grey69|gray70|grey70|gray71|grey71|gray72|grey72|gray73|grey73|gray74|grey74|gray75|grey75|gray76|grey76|gray77|grey77|gray78|grey78|gray79|grey79|gray80|grey80|gray81|grey81|gray82|grey82|gray83|grey83|gray84|grey84|gray85|grey85|gray86|grey86|gray87|grey87|gray88|grey88|gray89|grey89|gray90|grey90|gray91|grey91|gray92|grey92|gray93|grey93|gray94|grey94|gray95|grey95|gray96|grey96|gray97|grey97|gray98|grey98|gray99|grey99|gray100|grey100|dark grey|DarkGrey|dark gray|DarkGray|dark blue|DarkBlue|dark cyan|DarkCyan|dark magenta|DarkMagenta|dark red|DarkRed|light green|LightGreen)"
+end

data/lib/searchbar.rb

@@ -0,0 +1,54 @@
+# Copyright 2016 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/>.
+
+class TopinambourSearchBar < Gtk::SearchBar
+  def initialize(window)
+    super()
+
+    generate_search_entry(window)
+    set_halign(:center)
+    set_valign(:start)
+    set_hexpand(false)
+    set_vexpand(true)
+    connect_entry(@entry)
+    set_show_close_button = true
+    add(@entry)
+  end
+
+  def generate_search_entry(window)
+    @entry = Gtk::SearchEntry.new
+    term = window.notebook.current
+    @entry.signal_connect "next-match" do |entry|
+      puts "next-match"
+      term.search_find_next if @regex
+    end
+
+    @entry.signal_connect "previous-match" do |entry|
+      puts "prev match"
+      term.search_find_previous if @regex
+    end
+
+    @entry.signal_connect "search-changed" do |entry|
+      puts "search changed"
+      pattern = entry.buffer.text
+      if pattern != ""
+        @regex = GLib::Regex.new(pattern)
+        term.search_set_gregex(@regex, @regex.match_flags)
+        term.search_find_next
+      end
+    end
+  end
+end

data/lib/shortcuts.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -21,8 +21,9 @@ module TopinambourShortcuts
       (Gdk::ModifierType::CONTROL_MASK | Gdk::ModifierType::SHIFT_MASK)
   end
 
-  def self.handle_simple(keyval, window)
-    case keyval
+  def self.handle_simple(event, window)
+    overlay_mode = window.in_overlay_mode?
+    case event.keyval
     when Gdk::Keyval::KEY_Escape # escape from overlay mode
       if window.in_overlay_mode?
         window.exit_overlay_mode
@@ -32,8 +33,8 @@ module TopinambourShortcuts
     end
   end
 
-  def self.handle_ctrl_shift(keyval, window)
-    case keyval
+  def self.handle_ctrl_shift(event, window)
+    case event.keyval
     when Gdk::Keyval::KEY_W # close the current tab
       window.close_current_tab
       true
@@ -61,16 +62,34 @@ module TopinambourShortcuts
     when Gdk::Keyval::KEY_E
       window.show_css_editor
       true
+    when Gdk::Keyval::KEY_slash
+      window.show_searchbar
+      true
+    when Gdk::Keyval::KEY_Up
+      window.toggle_shrink
+      true
     end
   end
 
   def self.handle_key_press(window, event)
     keyval = event.keyval
-    #puts "#{Gdk::Keyval.to_name(keyval)} = #{keyval}"
     if ctrl_shift?(event)
-      handle_ctrl_shift(keyval, window)
+      handle_ctrl_shift(event, window)
     else
-      handle_simple(keyval, window)
+      handle_simple(event, window)
+    end
+  end
+
+  def self.handle_scroll(window, event)
+    if ctrl_shift?(event)
+      case event.direction
+      when Gdk::ScrollDirection::UP
+        window.opacity = window.opacity + 0.05
+        true
+      when Gdk::ScrollDirection::DOWN
+        window.opacity = window.opacity - 0.05
+        true
+      end
     end
   end
 end

data/lib/style_properties.rb

@@ -1,4 +1,4 @@
-# Copyright 2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -24,6 +24,15 @@ module TopinambourStyleProperties
                             GLib::Param::WRITABLE)
   end
 
+  def generate_boolean_rw_property(name, args)
+    GLib::Param::Boolean.new(name.downcase,
+                             name.capitalize,
+                             name.upcase,
+                             args,
+                             GLib::Param::READABLE |
+                             GLib::Param::WRITABLE)
+  end
+
   def generate_int_rw_property(name, args)
     GLib::Param::Int.new(name.downcase,
                          name.capitalize,
@@ -33,6 +42,15 @@ module TopinambourStyleProperties
                          GLib::Param::WRITABLE)
   end
 
+  def generate_enum_rw_property(name, args)
+    GLib::Param::Enum.new(name.downcase,
+                          name.capitalize,
+                          name.upcase,
+                          *args,
+                          GLib::Param::READABLE |
+                          GLib::Param::WRITABLE)
+  end
+
   def generate_boxed_rw_property(name, args)
     GLib::Param::Boxed.new(name.downcase,
                            name.capitalize,
@@ -62,42 +80,9 @@ TERMINAL_COLOR_NAMES = [:foreground, :background, :black, :red, :green, :yellow,
                        ]
 DEFAULT_TERMINAL_COLORS = %w(#aeafad #323232 #000000 #b9214f #A6E22E #ff9800
                              #3399ff #8e33ff #06a2dc #B0B0B0 #5D5D5D #ff5c8d
-                             #CDEE69 #ffff00 #9CD9F0 #FBB1F9 #77DFD8 #F7F7F7
-                            )
+                             #CDEE69 #ffff00 #9CD9F0 #FBB1F9 #77DFD8 #F7F7F7)
 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
@@ -107,9 +92,31 @@ class TopinambourTerminal < Vte::Terminal
                   name,
                   GLib::Type["GdkRGBA"])
   end
-  install_style("boxed",
-                "font",
+  install_style("boxed", "font",
                 GLib::Type["PangoFontDescription"])
+  install_style("boolean", "audible-bell", false)
+  install_style("boolean", "allow-bold", true)
+  install_style("boolean", "scroll-on-output", true)
+  install_style("boolean", "scroll-on-keystroke", true)
+  install_style("boolean", "rewrap-on-resize", true)
+  install_style("boolean", "mouse-autohide", true)
+  install_style("enum", "cursor-shape", [GLib::Type["VteCursorShape"],
+                                         Vte::CursorShape::BLOCK])
+  install_style("enum", "cursor-blink-mode", [GLib::Type["VteCursorBlinkMode"],
+                                         Vte::CursorBlinkMode::SYSTEM])
+  install_style("enum", "backspace-binding", [GLib::Type["VteEraseBinding"],
+                                              Vte::EraseBinding::AUTO])
+  install_style("enum", "delete-binding", [GLib::Type["VteEraseBinding"],
+                                           Vte::EraseBinding::AUTO])
+  def load_properties
+    %w(audible_bell allow_bold scroll_on_output scroll_on_keystroke
+       rewrap_on_resize mouse_autohide).each do |prop|
+      send("#{prop}=", style_get_property(prop.gsub(/_/,"-")))
+    end
+    %w(cursor_shape cursor_blink_mode backspace_binding delete_binding).each do |prop|
+      send("#{prop}=", style_get_property(prop.gsub(/_/,"-")))
+    end
+  end
 end
 
 class TopinambourWindow < Gtk::ApplicationWindow
@@ -119,4 +126,8 @@ class TopinambourWindow < Gtk::ApplicationWindow
   install_style("int", "width", [-1, 2000, 1000])
   install_style("int", "height", [-1, 2000, 500])
   install_style("string", "css-editor-style", "classic")
+
+  def load_properties
+
+  end
 end

data/lib/terminal.rb

@@ -1,4 +1,4 @@
-# Copyright 2015-2016 Cédric LE MOIGNE, cedlemo@gmx.com
+# Copyright 2015-2016 Cedric LE MOIGNE, cedlemo@gmx.com
 # This file is part of Topinambour.
 #
 # Topinambour is free software: you can redistribute it and/or modify
@@ -104,9 +104,11 @@ class TopinambourTerminal
   def configure
     set_rewrap_on_resize(true)
     set_scrollback_lines(-1)
+    search_set_wrap_around(true)
     @colors = css_colors
     set_font(css_font)
     apply_colors
+    load_properties
     add_matches
   end