dumon 0.1.4 → 0.1.5

data/README.md

@@ -28,7 +28,7 @@ Dual monitor manager for Linux with GTK2 based user interface represented by sys
 
 * or as daemon process
 
- > ruby -r dumon -e 'Dumon::run' --daemon
+ > ruby -r dumon -e 'Dumon::run true'
 
  > dumon --daemon
 

data/bin/dumon

@@ -2,4 +2,4 @@
 
 require 'dumon'
 
-Dumon::run
+Dumon::run(ARGV[0] == '--daemon')

data/lib/dumon.rb

@@ -23,8 +23,8 @@ module Dumon
 
   ###
   # Runs the application.
-  def self.run
-    if ARGV[0] == '--daemon'
+  def self.run(daemon=false)
+    if daemon
       if RUBY_VERSION < '1.9'
         Dumon::logger.warn 'Daemon mode supported only in Ruby >= 1.9'
       else
@@ -55,4 +55,4 @@ Dumon::logger.info \
 
 # development
 #Dumon::logger.level = Logger::DEBUG
-#Dumon::run
+#Dumon::run(ARGV[0] == '--daemon')

data/lib/dumon/omanager.rb

@@ -39,7 +39,8 @@ module Dumon
     ###
     # Distributes output to given devices with given order and resolution.
     # *param* outputs in form [["LVDS1", "1600x900"], [VGA1", "1920x1080"]]
-    def sequence(outputs)
+    # *param* primary name of primary output
+    def sequence(outputs, primary)
       raise NotImplementedError, 'this should be overridden by concrete sub-class'
     end
 
@@ -145,7 +146,7 @@ module Dumon
       `#{cmd}`
     end
 
-    def sequence(outputs) #:nodoc:
+    def sequence(outputs, primary=:none) #:nodoc:
       raise 'not an array' unless outputs.kind_of?(Array)
       outputs.each { |pair| raise 'item not a pair' if !pair.kind_of?(Array) and pair.size != 2 }
 
@@ -155,6 +156,7 @@ module Dumon
         resolution = outputs[i][1]
         resolution = self.default_resolution(output) if resolution.nil?
         cmd << " --output #{output} --mode #{resolution}"
+        cmd << ' --primary' if primary.to_s == output
         cmd << " --right-of #{outputs[i - 1][0]}" if i > 0
       end
 

data/lib/dumon/ui.rb

@@ -59,6 +59,9 @@ module Dumon
       # {"LVDS1" => "1600x900", "VGA1" => "800x600"}
       @selected_resolution = {}
 
+      # primary output
+      @primary = :none
+
       @tray = Gtk::StatusIcon.new
       @tray.visible = true
       @tray.pixbuf = Gdk::Pixbuf.new(::File.join(::File.dirname(__FILE__), '..', 'monitor.png'))
@@ -120,7 +123,7 @@ module Dumon
 
       # mirror
       item = Gtk::MenuItem.new('mirror')
-      if outputs.keys.size > 1
+      if outputs.keys.size >= 2
         submenu = Gtk::Menu.new
         item.set_submenu(submenu)
       else
@@ -134,20 +137,44 @@ module Dumon
       end
       rslt.append(item)
 
+      # separator
+      item = Gtk::SeparatorMenuItem.new
+      rslt.append(item)
+
+      # primary output
+      item = Gtk::MenuItem.new('primary output')
+      if outputs.keys.size >= 2
+        submenu = Gtk::Menu.new
+        item.set_submenu(submenu)
+      else
+        item.sensitive = false
+      end
+
+      radios = []
+      prims = outputs.keys.clone << :none
+      prims.each do |o|
+        si = Gtk::RadioMenuItem.new(radios, o.to_s)
+        si.active = (@primary.to_s == o.to_s)
+        radios << si
+        si.signal_connect('activate') { @primary = o.to_s if si.active? }
+        submenu.append(si)
+      end
+      rslt.append(item)
+
       # sequence (currently supporting only 2 output devices)
       if outputs.keys.size >= 2
         o0 = outputs.keys[0]
         o1 = outputs.keys[1]
         item = Gtk::MenuItem.new("#{o0} left of #{o1}")
         item.signal_connect('activate') do
-          self.omanager.sequence([[o0, @selected_resolution[o0]], [o1, @selected_resolution[o1]]])
+          self.omanager.sequence([[o0, @selected_resolution[o0]], [o1, @selected_resolution[o1]]], @primary)
           # clear preferred resolution, by next rendering will be read from real state
           @selected_resolution.clear
         end
         rslt.append(item)
         item = Gtk::MenuItem.new("#{o1} left of #{o0}")
         item.signal_connect('activate') do
-          self.omanager.sequence([[o1, @selected_resolution[o1]], [o0, @selected_resolution[o0]]])
+          self.omanager.sequence([[o1, @selected_resolution[o1]], [o0, @selected_resolution[o0]]], @primary)
           # clear preferred resolution, by next rendering will be read from real state
           @selected_resolution.clear
         end

data/lib/dumon/version.rb

@@ -2,6 +2,7 @@ module Dumon
 
   # Version history.
   VERSION_HISTORY = [
+    ['0.1.5',   '2013-02-08', 'Enh #2: Support for primary output'],
     ['0.1.4',   '2013-02-07', 'Enh #1: Starting as daemon'],
     ['0.1.3',   '2013-02-03', 'Changed starting mechanism'],
     ['0.1.2',   '2013-02-01', 'Refactoring: class name optimalization'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumon
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gtk2