swm 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d89ab5e08f05eda2cdc587670bb22c0549f94ba
-  data.tar.gz: ffdfbcabb6f8328716f5af2f231de1d4d4974c81
+  metadata.gz: 1b9b935a723ff0b91c3e27f18b2d54153d691b57
+  data.tar.gz: 101329a7748b14884ffd2a1dbc6a821a2f272eff
 SHA512:
-  metadata.gz: 8b56a4ac5b7279de96b58d5b62ca613bbab5b93052035864fd6aada9adbd622bbeac281578e0afec3322b7b7ed7cf736f7d2451c942c7ea2c5f6bb2d8db10de0
-  data.tar.gz: 7c4352911feb844c84209a99d79b89c64ecfca9273d85c0c55cf5f900a7c25ef17ae35fdba69253069fabdb8248a87d7c01e994a5c35bfbdb82ecbbac8316463
+  metadata.gz: f425c6c926ff11f6a083d291df1b374573eb14343de122372b5f978db72769ed7d60b083e59c9f43a42868d21b5b9066db15b0f6917d292e01e52fe7cd015915
+  data.tar.gz: 85471aa02e014ae4fa1f5d8e6fdfdc1d04d1e6174558daeca1761caf0280da215012f693eafda7b464639873cbcb575c65808f51b27a752350bea4f50b5ef151

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--format documentation

data/CHANGELOG.md

@@ -0,0 +1,3 @@
+## Version 0.1.0
+
+ - Moving windows is now supported with the `move` subcommand

data/Guardfile

@@ -0,0 +1,6 @@
+guard :rspec do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { "spec" }
+  watch(%w[ spec/spec_helper.rb Gemfile.lock ])  { "spec" }
+end
+

data/README.md

@@ -8,9 +8,49 @@ SWM is a utility to place and resize windows, written for Ubuntu. It might work
 
     $ gem install swm
 
+## Dependencies
+
+Some command line tools are needed:
+
+ - xdotool (for getting window id if current window)
+ - wmctrl (for moving and reizing windows)
+ - xdpyinfo (for getting screen dimensions)
+ - xwininfo (for getting window information)
+
+Install these with apt-get if they are not on your system.
+
 ## Usage
 
-TODO: Write usage instructions here
+### Moving windows
+
+Move windows with the move subcommand.
+It accepts parameters x and y which can both be specified in percentages of free screen space.
+
+Examples:
+
+    swm move --x 50% --y 50%
+
+Will center the window
+
+    swm move --x 0%
+
+Will move the window to the left edge of the sceen, preserving the Y position
+
+There are some predefined constants that can be used to specify position:
+
+ - For X these are: left, middle and right.
+ - For Y is is: top, middle, bottom
+
+For example:
+
+    swm move --x right --y middle
+
+Will move the window to the middle of the right edge.
+
+
+### Resizing windows
+
+Not yet supported
 
 ## Contributing
 

data/bin/swm

@@ -1,5 +1,61 @@
 #!/usr/bin/env ruby
 
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'trollop'
 require 'swm'
 
-Swm::Command.run ARGV
+def run
+  options = get_options
+  begin
+    Swm::CommandRunner.run options[:command], options[:command_options], options[:global_options]
+  rescue Exception => ex
+    puts ex.message
+    exit(1)
+  end
+end
+
+def get_options
+  global_options = Trollop::options do
+    banner "utility that can move and resize windows"
+    stop_on %w[ move resize ]
+  end
+  { global_options: global_options }.merge get_command
+end
+
+def get_command
+  command = ARGV.shift
+  Trollop.die "no command" unless command
+  command = command.to_sym
+  { command: command }.merge get_command_options(command)
+end
+
+def get_command_options(command)
+  {
+    command_options: case command
+    when :move
+      get_move_options
+    when :resize
+      get_resize_options
+    else
+      Trollop::die "unknown command #{command.to_s}"
+    end
+  }
+end
+
+def get_move_options
+  Trollop::options do
+    opt :x, "The placement on the x-axis: left, middle, right, or 0%-100%", type: String
+    opt :y, "The placement on the y-axis: top, middle, bottom, or 0%-100%", type: String
+  end
+end
+
+def get_resize_options
+  Trollop::options do
+    opt :width, "The width in pixels", type: Integer
+    opt :height, "The height in pixels", type: Integer
+  end
+end
+
+run

data/lib/swm.rb

@@ -1,4 +1,5 @@
-require "swm/version"
-
-module Swm
-end
+require_relative "swm/version"
+require_relative "swm/window"
+require_relative "swm/screen"
+require_relative "swm/command_runner"
+require_relative "swm/commands/move_command"

data/lib/swm/command_runner.rb

@@ -0,0 +1,13 @@
+module Swm
+
+  class CommandRunner
+    def self.run(command, command_options = {}, global_options = {})
+      command = get_command_class(command).new command_options, global_options
+      command.run
+    end
+
+    def self.get_command_class(command)
+      Swm.const_get "#{command.capitalize}Command"
+    end
+  end
+end

data/lib/swm/commands/move_command.rb

@@ -0,0 +1,51 @@
+module Swm
+  class MoveCommand
+    def initialize(command_options = {}, global_options = {})
+      @command_options = command_options
+      @global_options = global_options
+    end
+
+    def run
+      window = Swm::Window.current
+
+      x_percentage = get_x_percentage
+      y_percentage = get_y_percentage
+
+      screen_dimensions = Screen.dimensions
+
+      x = y = nil
+      x = ((screen_dimensions[0] - window.width) * x_percentage / 100.0).to_i if x_percentage
+      y = ((screen_dimensions[1] - window.height) * y_percentage / 100.0).to_i if y_percentage
+
+      window.move x, y
+    end
+
+    def get_x_percentage
+      get_placement_percentage :x, {
+        left: 0,
+        middle: 50,
+        right: 100
+      }
+    end
+
+    def get_y_percentage
+      get_placement_percentage :y, {
+        top: 0,
+        middle: 50,
+        bottom: 100
+      }
+    end
+
+    def get_placement_percentage(axis, constants)
+      raw_value = @command_options[axis]
+      return nil if raw_value.nil?
+      if value = constants[raw_value.to_sym]
+        value
+      elsif /(\d+(\.\d+)?)\%/ =~ raw_value
+        $1.to_f
+      else
+        raise "Unknown placement option: #{raw_value}. Valid options are percentages (e.g. 30%) and [#{constants.map{|x| x.first.to_s}.join(' ')}]"
+      end
+    end
+  end
+end

data/lib/swm/screen.rb

@@ -0,0 +1,7 @@
+module Swm
+  class Screen
+    def self.dimensions
+      /(\d+x\d+) pixels/.match(`xdpyinfo | grep dimensions`)[1].split('x').map{|s| s.to_i }
+    end
+  end
+end

data/lib/swm/version.rb

@@ -1,3 +1,3 @@
 module Swm
-  VERSION = "0.0.2"
+  VERSION = "0.1.0"
 end

data/lib/swm/window.rb

@@ -0,0 +1,72 @@
+module Swm
+  class Window
+    def self.current
+      Window.new `xdotool getwindowfocus`.to_i
+    end
+
+    def initialize(id)
+      @id = id
+    end
+
+    def width
+      xwininfo_integer_property "Width"
+    end
+
+    def height
+      xwininfo_integer_property "Height"
+    end
+
+    def pos_x
+      xwininfo_integer_property "Absolute upper-left X"
+    end
+
+    def pos_y
+      xwininfo_integer_property "Absolute upper-left Y"
+    end
+
+    def move(x, y)
+      x ||= pos_x
+      y ||= pos_y
+      command = "wmctrl -i -r #{@id} -e 0,#{x},#{y},#{width},#{height}"
+      exec command
+    end
+
+    private
+
+    ##
+    # xwininfo will tell stuff about the requested window
+    #
+    # Sample output:
+    #
+    # xwininfo: Window id: 0x3c00862 "xwininfo -id 62916706"
+    #
+    #  Absolute upper-left X:  1
+    #  Absolute upper-left Y:  52
+    #  Relative upper-left X:  0
+    #  Relative upper-left Y:  0
+    #  Width: 992
+    #  Height: 596
+    #  Depth: 32
+    #  Visual: 0x6c
+    #  Visual Class: TrueColor
+    #  Border width: 0
+    #  Class: InputOutput
+    #  Colormap: 0x3c00005 (not installed)
+    #  Bit Gravity State: NorthWestGravity
+    #  Window Gravity State: NorthWestGravity
+    #  Backing Store State: NotUseful
+    #  Save Under State: no
+    #  Map State: IsViewable
+    #  Override Redirect State: no
+    #  Corners:  +1+52  -927+52  -927-432  +1-432
+    #  -geometry 110x33+-7+24
+    #
+    def xwininfo
+      @xwininfo ||= `xwininfo -id #{@id}`
+    end
+
+    def xwininfo_integer_property(name)
+      /#{name}: +(\d+)/.match(xwininfo)[1].to_i
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,22 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# Require this file using `require "spec_helper"` to ensure that it is only
+# loaded once.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+
+require 'swm'
+
+RSpec.configure do |config|
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.run_all_when_everything_filtered = true
+  config.filter_run :focus
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = 'random'
+end
+RSpec.configure do |config|
+end

data/spec/unit/window_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Swm::Window do
+
+  let(:window) { Swm::Window.current }
+
+  describe 'height' do
+    subject { window.height }
+    it { should be_kind_of Integer }
+  end
+
+  describe 'width' do
+    subject { window.width }
+    it { should be_kind_of Integer }
+  end
+
+  describe 'pos_x' do
+    subject { window.pos_x }
+    it { should be_kind_of Integer }
+  end
+
+  describe 'pos_y' do
+    subject { window.pos_y }
+    it { should be_kind_of Integer }
+  end
+end

data/swm.gemspec

@@ -24,6 +24,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
+  spec.add_dependency "trollop"
+
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
+  spec.add_development_dependency "guard-rspec"
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: swm
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Lasse Skindstad Ebert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-15 00:00:00.000000000 Z
+date: 2013-06-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: trollop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +52,34 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: "\n    Simple Window Manager is a utillity to move and place windows
   in Ubuntu.\n    It might work with other *nix distributions.\n\n    The utillity
   is intended to be used with keyboard shortcuts, and is\n    always operating on
@@ -50,13 +92,22 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .rspec
+- CHANGELOG.md
 - Gemfile
+- Guardfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/swm
 - lib/swm.rb
+- lib/swm/command_runner.rb
+- lib/swm/commands/move_command.rb
+- lib/swm/screen.rb
 - lib/swm/version.rb
+- lib/swm/window.rb
+- spec/spec_helper.rb
+- spec/unit/window_spec.rb
 - swm.gemspec
 homepage: https://github.com/lasseebert/swm
 licenses:
@@ -82,4 +133,6 @@ rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Simple Window Manager for Ubuntu
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/unit/window_spec.rb