swm 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b9b935a723ff0b91c3e27f18b2d54153d691b57
-  data.tar.gz: 101329a7748b14884ffd2a1dbc6a821a2f272eff
+  metadata.gz: 6737404f8274bcc90d25baabc3dea109decebb3a
+  data.tar.gz: 46d9434f2c901bedb01808f0d49ac7afe55159e8
 SHA512:
-  metadata.gz: f425c6c926ff11f6a083d291df1b374573eb14343de122372b5f978db72769ed7d60b083e59c9f43a42868d21b5b9066db15b0f6917d292e01e52fe7cd015915
-  data.tar.gz: 85471aa02e014ae4fa1f5d8e6fdfdc1d04d1e6174558daeca1761caf0280da215012f693eafda7b464639873cbcb575c65808f51b27a752350bea4f50b5ef151
+  metadata.gz: 7c7792e75db029104688077385a794685967b49f7ec429f94a1cdecad1c8d6432a90906a7f477956b75cb9c051aced4bc0552a17f5555c9296640226aefc466d
+  data.tar.gz: e6ada0b85afd5c74868ee306ffe5ba503c6f8e89185f334b113afb936f94bc2a672cc4f93dbb6db574b879e6ab2823d15774d69bc3f0c89f33fc0d57310f6ba3

data/README.md

@@ -1,9 +1,9 @@
 # Simple Window Manager
 
-NOTE: THIS IS NOT YET DONE!
-
 SWM is a utility to place and resize windows, written for Ubuntu. It might work with other *nix distributions.
 
+SWM has been confirmed _not_ to work with OS X. Please help fix this :)
+
 ## Installation
 
     $ gem install swm
@@ -12,8 +12,8 @@ SWM is a utility to place and resize windows, written for Ubuntu. It might work
 
 Some command line tools are needed:
 
- - xdotool (for getting window id if current window)
- - wmctrl (for moving and reizing windows)
+ - xdotool (for getting window id of current window)
+ - wmctrl (for moving and resizing windows)
  - xdpyinfo (for getting screen dimensions)
  - xwininfo (for getting window information)
 
@@ -21,10 +21,14 @@ Install these with apt-get if they are not on your system.
 
 ## Usage
 
+SWM is meant to be assigned to shortcuts and will always work on the currently active window.
+
+For example, I have configured my `Super-1` - `Super-4` to place the current window in the four corners of my screen.
+
 ### 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.
+Move windows with the `move` subcommand.
+It accepts parameters `x` and `y` which can both be specified in percentages of free screen space.
 
 Examples:
 
@@ -38,8 +42,8 @@ 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 X these are: `left`, `middle` and `right`.
+ - For Y it is: `top`, `middle`, `bottom`.
 
 For example:
 

data/bin/swm

@@ -53,8 +53,10 @@ end
 
 def get_resize_options
   Trollop::options do
-    opt :width, "The width in pixels", type: Integer
-    opt :height, "The height in pixels", type: Integer
+    opt :x1, "The placement of the left edge:   left, middle, right, or 0%-100%", type: String
+    opt :x2, "The placement of the right edge:  left, middle, right, or 0%-100%", type: String
+    opt :y1, "The placement of the top edge:    top, middle, bottom, or 0%-100%", type: String
+    opt :y2, "The placement of the bottom edge: top, middle, bottom, or 0%-100%", type: String
   end
 end
 

data/lib/swm.rb

@@ -2,4 +2,6 @@ require_relative "swm/version"
 require_relative "swm/window"
 require_relative "swm/screen"
 require_relative "swm/command_runner"
+require_relative "swm/commands/command"
+require_relative "swm/commands/resize_command"
 require_relative "swm/commands/move_command"

data/lib/swm/commands/command.rb

@@ -0,0 +1,40 @@
+module Swm
+  class Command
+    def initialize(command_options = {}, global_options = {})
+      @command_options = command_options
+      @global_options = global_options
+    end
+
+    def run
+      raise "Override in sub derived class"
+    end
+
+    def get_x_percentage(name = :x)
+      get_placement_percentage name, {
+        left: 0,
+        middle: 50,
+        right: 100
+      }
+    end
+
+    def get_y_percentage(name = :y)
+      get_placement_percentage name, {
+        top: 0,
+        middle: 50,
+        bottom: 100
+      }
+    end
+
+    def get_placement_percentage(name, constants)
+      raw_value = @command_options[name]
+      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/commands/move_command.rb

@@ -1,9 +1,5 @@
 module Swm
-  class MoveCommand
-    def initialize(command_options = {}, global_options = {})
-      @command_options = command_options
-      @global_options = global_options
-    end
+  class MoveCommand < Command
 
     def run
       window = Swm::Window.current
@@ -20,32 +16,5 @@ module Swm
       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/commands/resize_command.rb

@@ -0,0 +1,28 @@
+module Swm
+  class ResizeCommand < Command
+
+    def run
+      x1 = get_x_percentage :x1
+      x2 = get_x_percentage :x2
+      y1 = get_y_percentage :y1
+      y2 = get_y_percentage :y2
+
+      screen_dimensions = Screen.dimensions
+      window = Swm::Window.current
+
+      x = y = width = height = nil
+      x =       (screen_dimensions[0] * x1 / 100.0).to_i if x1
+      y =       (screen_dimensions[1] * y1 / 100.0).to_i if y1
+      width =   (screen_dimensions[0] * x2 / 100.0).to_i - (x || window.pos_x) if x2
+      height =  (screen_dimensions[1] * y2 / 100.0).to_i - (y || window.pos_y) if y2
+
+      puts "x: #{x}"
+      puts "y: #{y}"
+      puts "width: #{width}"
+      puts "height: #{height}"
+
+      window.set x, y, width, height
+    end
+
+  end
+end

data/lib/swm/screen.rb

@@ -1,7 +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 }
+      @dimenesions ||= /(\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.1.0"
+  VERSION = "0.2.0"
 end

data/lib/swm/window.rb

@@ -27,8 +27,17 @@ module Swm
     def move(x, y)
       x ||= pos_x
       y ||= pos_y
-      command = "wmctrl -i -r #{@id} -e 0,#{x},#{y},#{width},#{height}"
+      set x, y, nil, nil
+    end
+
+    def set(x, y, w, h)
+      x ||= pos_x
+      y ||= pos_y
+      w ||= width
+      h ||= height
+      command = "wmctrl -i -r #{@id} -e 0,#{x},#{y},#{w},#{h}"
       exec command
+      clear_cache
     end
 
     private
@@ -68,5 +77,9 @@ module Swm
     def xwininfo_integer_property(name)
       /#{name}: +(\d+)/.match(xwininfo)[1].to_i
     end
+
+    def clear_cache
+      @xwininfo = nil
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: swm
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Lasse Skindstad Ebert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-16 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -102,7 +102,9 @@ files:
 - bin/swm
 - lib/swm.rb
 - lib/swm/command_runner.rb
+- lib/swm/commands/command.rb
 - lib/swm/commands/move_command.rb
+- lib/swm/commands/resize_command.rb
 - lib/swm/screen.rb
 - lib/swm/version.rb
 - lib/swm/window.rb
@@ -129,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Simple Window Manager for Ubuntu