iconify 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77f5ba6428215e6714068c04ba0ac9f6112522e2
-  data.tar.gz: 86effae2ea2f63f5a2cccb91d6ba13aff88bafb4
+  metadata.gz: ac171efe65169c0ac77d43eb220ade5922c2fabe
+  data.tar.gz: b1b5d585fe38a96c5fef0000293e720c3ea098f8
 SHA512:
-  metadata.gz: 4c25bc69efd9b485c792ddedcf6b5ac9ff897b3f903959b3f6e42974b631244ad5da1c6c50465f1d18bb082bc0c20e7313dafcf3051f3715e6ccd8b029be559b
-  data.tar.gz: 838730d2b89ea8b625b57ce2a3c7fd8fc1ac4329f1f2ade8c4c3a6676b691df62429bda6085cfd23a82271cf38a29dd7691056ffe7fb9bfdb0347972eb89207c
+  metadata.gz: 01c795f2a4c8ddce60a0b78d03cb0b6b765ad13d506760d465fd5ed6042b936ca473a35adb9b0319c45692a1d285573525d0cda233dd29786b61f9fbce57bf61
+  data.tar.gz: cd8c6ca45d9ef94eea9916aa3e6bce3bd23f932ff5a5daebacd3fc422d25c60f3ad28091ca98f571521933cabe16eaf0ca61143b28526fc253d1a758d82f08a8

data/Rakefile

@@ -1,6 +1,6 @@
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => :spec
+task default: :spec

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "iconify"
+require 'bundler/setup'
+require 'iconify'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "iconify"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

data/iconify.gemspec

@@ -4,25 +4,25 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'iconify/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "iconify"
+  spec.name          = 'iconify'
   spec.version       = Iconify::VERSION
-  spec.authors       = ["Yoteichi"]
-  spec.email         = ["plonk@piano.email.ne.jp"]
+  spec.authors       = ['Yoteichi']
+  spec.email         = ['plonk@piano.email.ne.jp']
 
-  spec.summary       = %q{Iconify is a utility program to turn a command line into a status icon.}
-  spec.description   = %q{Iconify is a utility program to turn a command line into a status icon.}
-  spec.homepage      = "https://github.com/plonk/iconifiy"
+  spec.summary       = 'Iconify is a utility program to turn a command line into a status icon.'
+  spec.description   = 'Iconify is a utility program to turn a command line into a status icon.'
+  spec.homepage      = 'https://github.com/plonk/iconifiy'
   spec.licenses      = ['GPL-2']
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = "exe"
+  spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_dependency "gtk3"
-  spec.add_dependency "vte3"
+  spec.add_dependency 'gtk3'
+  spec.add_dependency 'vte3'
 
-  spec.add_development_dependency "bundler", "~> 1.11"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency 'bundler', '~> 1.11'
+  spec.add_development_dependency 'rake', '~> 10.0'
+  spec.add_development_dependency 'rspec', '~> 3.0'
 end

data/lib/iconify.rb

@@ -1,130 +1,241 @@
 require 'gtk3'
 require 'vte3'
 
-require "iconify/version"
-require "iconify/program"
+require 'iconify/version'
+require 'iconify/program'
 
 module Iconify
+  # メインウィンドウ
+  class TerminalWindow < Gtk::Window
+    include Gtk
 
-class TerminalWindow < Gtk::Window
-  include Gtk
+    type_register
+    signal_new('changed', GLib::Signal::ACTION, nil, nil)
 
-  type_register
-  signal_new('changed', GLib::Signal::ACTION, nil, nil)
+    attr_reader :state
 
-  attr_reader :state
+    # [String]
+    def initialize(argv)
+      super()
 
-  def initialize(argv)
-    super()
+      @argv = argv
+      @state = :stopped
 
-    @argv = argv
+      update_title
 
-    @terminal = Vte::Terminal.new
-    @terminal.font = Pango::FontDescription.new("monospace 14")
-    @terminal.set_size_request(@terminal.char_width * 80, @terminal.char_height * 24)
-    @terminal.cursor_blink_mode = Vte::CursorBlinkMode::OFF
+      @rerun_button = create_rerun_button
+      @kill_button  = create_kill_button
+      @quit_button  = create_quit_button
+      @terminal     = create_vte_terminal
+      @copy_button  = create_copy_button
+      @paste_button = create_paste_button
 
-    self.title = "iconify - #{argv[0]}"
+      layout
 
-    @state = :stopped
+      set_geometry_hints
+    end
 
-    vbox = Box.new(:vertical)
-    hbox = ButtonBox.new(:horizontal)
-    rerun_button = Button.new(label: "Rerun")
-    rerun_button.signal_connect('clicked') do
-      self.exec
+    def set_geometry_hints
+      @terminal.realize
+      @terminal.set_geometry_hints_for_window(self)
     end
-    signal_connect('changed') do
-      rerun_button.sensitive = (@state == :stopped)
+
+    def layout
+      vbox = Box.new(:vertical)
+      toolbar = Toolbar.new
+
+      toolbar.add(@rerun_button)
+      toolbar.add(@kill_button)
+      toolbar.add(SeparatorToolItem.new)
+      toolbar.add(@copy_button)
+      toolbar.add(@paste_button)
+      toolbar.add(SeparatorToolItem.new)
+      toolbar.add(@quit_button)
+      vbox.pack_start(toolbar, expand: false)
+
+      padding_box = Box.new(:vertical)
+      padding_box.pack_start(@terminal, expand: true, fill: true)
+      padding_box.border_width = 18
+      override_background_color(StateFlags::NORMAL, COLORS[15])
+      vbox.pack_start(padding_box, expand: true, fill: true)
+
+      add vbox
     end
 
-    kill_button = Button.new(label: "Kill")
-    kill_button.signal_connect('clicked') do 
-      Process.kill("KILL", @pid) if @pid
+    def create_copy_button
+      ToolButton.new(stock_id: Stock::COPY).tap do |b|
+        b.tooltip_text = 'Copy'
+        b.signal_connect('clicked') do
+          @terminal.copy_clipboard
+        end
+      end
     end
-    signal_connect('changed') do
-      kill_button.sensitive = (@state == :running)
+
+    def create_paste_button
+      ToolButton.new(stock_id: Stock::PASTE).tap do |b|
+        b.tooltip_text = 'Paste'
+        b.signal_connect('clicked') do
+          @terminal.paste_clipboard
+        end
+      end
     end
 
-    quit_button = Button.new(label: "Quit")
-    quit_button.signal_connect('clicked') do
-      Gtk.main_quit
+    def create_kill_button
+      ToolButton.new(label: 'Kill').tap do |b|
+        b.icon_name = Stock::STOP
+        b.tooltip_text = 'Stop the child process by sending the QUIT signal.'
+        b.signal_connect('clicked') do
+          Process.kill('KILL', @pid) if @pid
+        end
+      end
     end
-    hbox.pack_start(rerun_button)
-    hbox.pack_start(kill_button)
-    hbox.pack_start(quit_button)
-    vbox.pack_start(hbox, expand: false)
-    vbox.pack_start(@terminal, expand: true, fill: true)
 
-    add vbox
+    def create_rerun_button
+      ToolButton.new(label: 'Rerun').tap do |b|
+        b.icon_name = Stock::REFRESH
+        b.tooltip_text = 'Rerun the program.'
+        b.signal_connect('clicked') do
+          exec
+        end
+      end
+    end
 
-    @terminal.signal_connect('child-exited') do
-      @state = :stopped
-      @pid = nil
-      rerun_button.sensitive = true
-      signal_emit('changed')
+    def create_quit_button
+      ToolButton.new(label: 'Quit').tap do |b|
+        b.icon_name = Stock::QUIT
+        b.tooltip_text = 'Stop the program and quit.'
+        b.signal_connect('clicked') do
+          Gtk.main_quit
+        end
+      end
     end
-  end
 
-  def exec
-    @pid = @terminal.spawn(argv: @argv)
-    @state = :running
-    signal_emit('changed')
-  end
+    def update_title
+      self.title = "iconify - #{@argv[0]}"
+    end
 
-end
+    def changed
+      @rerun_button.sensitive = (@state == :stopped)
+      @kill_button.sensitive  = (@state == :running)
 
-class CommandStatusIcon < Gtk::StatusIcon
-  include Gtk
+      @copy_button.sensitive = @terminal.has_selection?
 
-  def initialize(name)
-    super()
+      signal_emit('changed')
+    end
 
-    @name = name
-  end
+    # the shimbun color scheme
+    COLORS = [[0x30, 0x30, 0x30],
+              [0xbe, 0x11, 0x37],
+              [0x29, 0x73, 0x2c],
+              [0xc9, 0x5c, 0x26],
+              [0x2a, 0x5a, 0xa2],
+              [0xcd, 0x3a, 0x93],
+              [0x07, 0x86, 0x92],
+              [0xd0, 0xd0, 0xd0],
+              [0x50, 0x50, 0x50],
+              [0xe6, 0x2b, 0x5d],
+              [0x40, 0x9e, 0x01],
+              [0xec, 0x75, 0x42],
+              [0x17, 0x7f, 0xe0],
+              [0xe9, 0x53, 0xba],
+              [0x00, 0xa9, 0xb2],
+              [0xf2, 0xf2, 0xf2]]
+             .map { |rgb| Gdk::RGBA.new(*rgb.map { |n| n.fdiv(255) }, 1.0) }
+
+    def create_vte_terminal
+      Vte::Terminal.new.tap do |t|
+        t.font = Pango::FontDescription.new('monospace 14')
+        t.set_size_request(t.char_width * 40, t.char_height * 12)
+        t.set_size(80, 24)
+        t.cursor_blink_mode = Vte::CursorBlinkMode::OFF
+        t.set_colors(COLORS[0], COLORS[15], COLORS)
+
+        t.signal_connect('child-exited') do
+          on_child_exited
+        end
+        t.signal_connect('selection-changed') do
+          changed
+        end
+      end
+    end
 
-  def set_state(state)
-    case state
-    when :running
-      @background_color = [0.67, 1.0, 0.0]
-      @foreground_color = [0.1, 0.1, 0.1]
-    when :stopped
-      @background_color = [192/255.0, 0.0, 0.0]
-      @foreground_color = [0.9, 0.9, 0.9]
-    else
-      raise "unknown sate #{state}"
-    end
-    redraw
+    def on_child_exited
+      @state = :stopped
+      @pid = nil
+      @rerun_button.sensitive = true
+      changed
+    end
+
+    def exec
+      @pid = @terminal.spawn(argv: @argv)
+      @state = :running
+      changed
+    end
   end
 
-  def redraw
-    # pixmap = Gdk::Pixmap.new(nil, 64, 64, 24)
+  # プログラム名を表示するステータスアイコン
+  class CommandStatusIcon < Gtk::StatusIcon
+    include Gtk
+    include Cairo
+
+    def initialize(name)
+      super()
 
-    image_surface = Cairo::ImageSurface.new(Cairo::FORMAT_ARGB32, 64, 64)
+      @name = name
+    end
 
-    cr = Cairo::Context.new(image_surface)
+    COLOR_SCHEME = {
+      running: [[0.67, 1.0, 0.0], [0.1, 0.1, 0.1]],
+      stopped: [[0.75, 0.0, 0.0], [0.9, 0.9, 0.9]]
+    }.freeze
 
-    cr.set_source_rgb(0.8, 0.8, 0.8)
-    cr.set_operator(Cairo::OPERATOR_SOURCE)
-    cr.paint
+    def update(state)
+      raise "unknown sate #{state}" unless COLOR_SCHEME.key?(state)
 
-    cr.set_source_rgb(*@background_color)
-    cr.rounded_rectangle(1, 1, 62, 62, 15)
-    cr.fill
+      @background_color, @foreground_color = COLOR_SCHEME[state]
+      redraw
+    end
 
-    cr.set_font_size(24)
-    cr.move_to(3, 64 / 2 + cr.font_extents.ascent / 2)
-    cr.set_source_rgba(*@foreground_color, 1)
-    cr.show_text(@name)
+    def using(destroyable)
+      yield destroyable
+      destroyable.destroy
+    end
 
-    cr.destroy
+    def paint_background(cr)
+      cr.save do
+        cr.set_source_rgb(0.8, 0.8, 0.8)
+        cr.set_operator(OPERATOR_SOURCE)
+        cr.paint
+      end
+    end
 
-    buf = image_surface.to_pixbuf(0, 0, 64, 64)
-    self.pixbuf = buf
+    def fill_rounded_rectangle(cr)
+      cr.save do
+        cr.set_source_rgb(*@background_color)
+        cr.rounded_rectangle(1, 1, 62, 62, 15)
+        cr.fill
+      end
+    end
 
-    image_surface.destroy
-  end
+    def draw_name(cr)
+      cr.save do
+        cr.set_font_size(24)
+        cr.move_to(3, 64 / 2 + cr.font_extents.ascent / 2)
+        cr.set_source_rgba(*@foreground_color, 1)
+        cr.show_text(@name)
+      end
+    end
 
-end
+    def redraw
+      using ImageSurface.new(FORMAT_ARGB32, 64, 64) do |surface|
+        using Context.new(surface) do |cr|
+          paint_background(cr)
+          fill_rounded_rectangle(cr)
+          draw_name(cr)
+        end
 
+        self.pixbuf = surface.to_pixbuf(0, 0, 64, 64)
+      end
+    end
+  end
 end

data/lib/iconify/program.rb

@@ -1,59 +1,82 @@
+require 'optparse'
+
 module Iconify
+  class Program
+    include Gtk
 
-class Program
-  def initialize(argv)
-    if argv.size < 1
-      STDERR.puts "arg"
-      exit 1
-    end
-    @argv = argv
-    @status_icon = CommandStatusIcon.new(argv[0])
-    @terminal_window = TerminalWindow.new(argv)
-    @terminal_window.signal_connect('delete-event') do
-      if @status_icon.embedded?
-        @terminal_window.hide
-      else
-        run_dialog("The status icon is not embedded in a notification area. The window cannot be hidden.")
+    def initialize(argv)
+      @start_minimized = false
+
+      parse_args!(argv)
+
+      @argv = argv
+      @status_icon = CommandStatusIcon.new(argv[0])
+      @terminal_window = TerminalWindow.new(argv)
+      @terminal_window.signal_connect('delete-event') do
+        if @status_icon.embedded?
+          @terminal_window.hide
+        else
+          run_dialog('The status icon is not embedded in a notification area. The window cannot be hidden.')
+        end
+        true # do not close
       end
-      true # do not close
-    end
-    @terminal_window.signal_connect('changed') do
-      @status_icon.set_state(@terminal_window.state)
-      @terminal_window.icon = @status_icon.pixbuf
-    end
-    @terminal_window.show_all
-    GLib::Timeout.add(500) do
-      if @status_icon.embedded?
-        @terminal_window.hide
-      else
-        run_dialog("Iconify has detected its status icon is not embedded in a notification area. The window cannot be hidden.")
+      @terminal_window.signal_connect('changed') do
+        @status_icon.update(@terminal_window.state)
+        @terminal_window.icon = @status_icon.pixbuf
+      end
+      @terminal_window.show_all
+      GLib::Timeout.add(500) do
+        if @start_minimized
+          if @status_icon.embedded?
+            @terminal_window.hide
+          else
+            run_dialog('Iconify has detected its status icon is not embedded in a notification area. The window cannot be hidden.')
+          end
+        end
+        false # one time
+      end
+
+      @status_icon.signal_connect('activate') do
+        if @terminal_window.visible? && @status_icon.embedded?
+          @terminal_window.hide
+        else
+          @terminal_window.show
+        end
       end
-      false # one time
     end
 
-    @status_icon.signal_connect("activate") do
-      if @terminal_window.visible? && @status_icon.embedded?
-        @terminal_window.hide
-      else
-        @terminal_window.show
+    def parse_args!(argv)
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Usage: iconify [OPTIONS] COMMAND [ARGUMENTS...]'
+
+        opts.on('-m', '--minimized', 'Start minimized') do |m|
+          @start_minimized = m
+        end
+      end
+      parser.parse!(argv)
+
+      if argv.empty?
+        STDERR.puts parser.banner
+        exit 1
       end
+    rescue OptionParser::InvalidOption => e
+      STDERR.puts e
+      exit 1
     end
-  end
 
-  def run_dialog(message)
-    dialog = Gtk::MessageDialog.new(@terminal_window,
-                                    Gtk::Dialog::DESTROY_WITH_PARENT,
-                                    Gtk::MessageDialog::QUESTION,
-                                    Gtk::MessageDialog::BUTTONS_CLOSE,
-                                    message)
-    dialog.run
-    dialog.destroy
-  end
+    def run_dialog(message)
+      dialog = MessageDialog.new(parent:  @terminal_window,
+                                 flags:   DialogFlags::DESTROY_WITH_PARENT,
+                                 type:    MessageType::QUESTION,
+                                 buttons: ButtonsType::CLOSE,
+                                 message: message)
+      dialog.run
+      dialog.destroy
+    end
 
-  def run
-    @terminal_window.exec
-    Gtk.main
+    def run
+      @terminal_window.exec
+      Gtk.main
+    end
   end
 end
-
-end

data/lib/iconify/version.rb

@@ -1,3 +1,3 @@
 module Iconify
-  VERSION = "0.2.0"
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: iconify
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Yoteichi