rumai 4.0.0 → 4.1.0

data/lib/rumai/inochi.rb

@@ -18,12 +18,12 @@ module Rumai
   ##
   # Number of this release of this project.
   #
-  VERSION = '4.0.0'
+  VERSION = '4.1.0'
 
   ##
   # Date of this release of this project.
   #
-  RELDATE = '2011-02-25'
+  RELDATE = '2011-03-28'
 
   ##
   # Description of this release of this project.

data/lib/rumai/ixp/message.rb

@@ -60,7 +60,7 @@ module Rumai
       # Transforms this object into a string of 9P2000 bytes.
       #
       def to_9p
-        @fields.inject([]) {|s,f| s << f.to_9p(@values) }.join
+        @fields.map {|f| f.to_9p(@values) }.join
       end
 
       ##
@@ -182,17 +182,11 @@ module Rumai
         # Returns a Field class that best represents the given format.
         #
         def self.factory format
-          if format == String
-            StringField
-
-          elsif format.is_a? Class
-            ClassField
-
-          elsif format == 8
-            Integer8Field
-
-          else
-            Field
+          case format
+          when String then StringField
+          when Class then ClassField
+          when 8 then Integer8Field
+          else Field
           end
         end
 

data/lib/rumai/wm.rb

@@ -898,34 +898,107 @@ module Rumai
     #-----------------------------------------------------------------------
 
     ##
-    # Arranges the clients in this view, while maintaining
-    # their relative order, in the tiling fashion of LarsWM.
+    # Arranges columns with the following number of clients in them:
     #
-    # Only the first client in the primary column is kept; all others
-    # are evicted to the *top* of the secondary column.  Any subsequent
-    # columns are squeezed into the *bottom* of the secondary column.
+    # 1, N
     #
-    def arrange_as_larswm
-      maintain_focus do
-        # keep only one client in the primary column
-        main = Area.new(1, self)
-        main.length = 1
-        main.layout = :default
+    def tile_right
+      arrange_columns [1, num_managed_clients-1], :default
+    end
 
-        # collapse remaining areas into secondary column
-        extra = squeeze_columns(1..-1)
+    ##
+    # Arranges columns with the following number of clients in them:
+    #
+    # 1, 2, 3, ...
+    #
+    # Imagine an equilateral triangle with its
+    # base on the right side of the screen and
+    # its peak on the left side of the screen.
+    #
+    def tile_rightward
+      width, summit = calculate_right_triangle
+      heights = (1 .. width).to_a.push(summit)
+      arrange_columns heights, :default
+    end
 
-        if dock = extra.first
-          dock.layout = :default
-        end
+    ##
+    # Arranges columns with the following number of clients in them:
+    #
+    # N, 1
+    #
+    def tile_left
+      arrange_columns [num_managed_clients-1, 1], :default
+    end
+
+    ##
+    # Arranges columns with the following number of clients in them:
+    #
+    # ..., 3, 2, 1
+    #
+    # Imagine an equilateral triangle with its
+    # base on the left side of the screen and
+    # its peak on the right side of the screen.
+    #
+    def tile_leftward
+      width, summit = calculate_right_triangle
+      heights = (1 .. width).to_a.push(summit).reverse
+      arrange_columns heights, :default
+    end
+
+    ##
+    # Arranges columns with the following number of clients in them:
+    #
+    # 1, 2, 3, ..., 3, 2, 1
+    #
+    # Imagine two equilateral triangles with their bases on the left and right
+    # sides of the screen and their peaks meeting in the middle of the screen.
+    #
+    def tile_inward
+      arrange_columns calculate_equilateral_triangle.flatten, :default
+    end
+
+    ##
+    # Arranges columns with the following number of clients in them:
+    #
+    # ..., 3, 2, 1, 2, 3, ...
+    #
+    # Imagine two equilateral triangles with their bases meeting in the middle
+    # of the screen and their peaks reaching outward to the left and right
+    # sides of the screen.
+    #
+    def tile_outward
+      rising, summit, falling = calculate_equilateral_triangle
+      heights = falling[0..-2].concat(rising)
+
+      # distribute extra clients on the outsides
+      extra = summit[0].to_i + falling[-1].to_i
+      if extra > 0
+        split = extra / 2
+        carry = extra % 2
+        # put the remainder on the left side to minimize the need for
+        # rearrangement when clients are removed or added to the view
+        heights.unshift split + carry
+        heights.push split
       end
+
+      arrange_columns heights, :default
+    end
+
+    ##
+    # Arranges the clients in this view, while maintaining
+    # their relative order, in the given number of columns.
+    #
+    def stack num_columns = 2
+      heights = [num_managed_clients / num_columns] * num_columns
+      heights[-1] += num_managed_clients % num_columns
+      arrange_columns heights, :stack
     end
 
     ##
     # Arranges the clients in this view, while maintaining
-    # their relative order, in a (at best) square grid.
+    # their relative order, in (at best) a square grid.
     #
-    def arrange_in_grid max_clients_per_column = nil
+    def grid max_clients_per_column = nil
       # compute client distribution
       unless max_clients_per_column
         num_clients = num_managed_clients
@@ -946,91 +1019,61 @@ module Rumai
       end
     end
 
+    alias arrange_as_larswm tile_right
+    alias arrange_in_diamond tile_inward
+    alias arrange_in_stacks stack
+    alias arrange_in_grid grid
+
     ##
-    # Arranges the clients in this view, while maintaining
-    # their relative order, in the given number of columns.
+    # Applies the given length to each column in sequence. Also,
+    # the given layout is applied to all columns, if specified.
     #
-    def arrange_in_stacks num_stacks
-      return if num_stacks < 1
-
-      # compute client distribution
-      num_clients = num_managed_clients
-      return unless num_clients > 0
-
-      stack_length = num_clients / num_stacks
-      return if stack_length < 1
-
-      # apply the distribution
+    def arrange_columns lengths, layout = nil
+      i = 0
       maintain_focus do
-        each_column do |a|
-          a.length = stack_length
-          a.layout = :stack
+        each_column do |column|
+          if i < lengths.length
+            column.length = lengths[i]
+            column.layout = layout if layout
+            i += 1
+          else
+            break
+          end
         end
-
-        squeeze_columns num_stacks-1..-1
       end
     end
 
-    ##
-    # Arranges the clients in this view, while
-    # maintaining their relative order, in a (at
-    # best) equilateral triangle.  However, the
-    # resulting arrangement appears like a diamond
-    # because wmii does not waste screen space.
-    #
-    def arrange_in_diamond
-      num_clients = num_managed_clients
-      return unless num_clients > 1
-
-      # determine dimensions of the rising sub-triangle
-      rise = num_clients / 2
-
-      span = sum = 0
-      1.upto rise do |h|
-        if sum + h > rise
-          break
-        else
-          sum += h
-          span += 1
-        end
-      end
-
-      peak = num_clients - (sum * 2)
+    private
 
-      # quantify overall triangle as a sequence of heights
-      rise_seq = (1..span).to_a
-      fall_seq = rise_seq.reverse
+    def calculate_equilateral_triangle
+      num_clients = num_managed_clients
+      return [] unless num_clients > 1
 
-      heights = rise_seq
-      heights << peak if peak > 0
-      heights.concat fall_seq
+      # calculate the dimensions of the rising sub-triangle
+      num_rising_columns, num_summit_clients =
+        calculate_right_triangle(num_clients / 2)
 
-      # apply the heights
-      maintain_focus do
-        each_column do |col|
-          if h = heights.shift
-            col.length = h
-            col.layout = :default
-          end
-        end
-      end
+      # quantify entire triangle as a sequence of heights
+      heights = (1 .. num_rising_columns).to_a
+      summit = num_summit_clients > 0 ? [num_summit_clients] : []
+      [heights, summit, heights.reverse]
     end
 
-    private
+    def calculate_right_triangle num_rising_clients = num_managed_clients
+      num_rising_columns = num_clients_processed = 0
 
-    ##
-    # Squeezes all columns in the given index range into a single one.
-    #
-    def squeeze_columns range
-      extra = columns[range]
-
-      if extra.length > 1
-        extra.reverse.each_cons(2) do |src, dst|
-          dst.concat src
+      1.upto num_rising_clients do |height|
+        if num_clients_processed + height > num_rising_clients
+          break
+        else
+          num_clients_processed += height
+          num_rising_columns += 1
         end
       end
 
-      extra
+      num_summit_clients = num_rising_clients - num_clients_processed
+
+      [num_rising_columns, num_summit_clients]
     end
 
     ##

data/man/man1/rumai.1

@@ -2,12 +2,12 @@
 .\"     Title: rumai
 .\"    Author: [see the "AUTHORS" section]
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 2011-02-25
+.\"      Date: 2011-03-28
 .\"    Manual: \ \&
-.\"    Source: \ \& 4.0.0
+.\"    Source: \ \& 4.1.0
 .\"  Language: English
 .\"
-.TH "RUMAI" "1" "2011\-02\-25" "\ \& 4\&.0\&.0" "\ \&"
+.TH "RUMAI" "1" "2011\-03\-28" "\ \& 4\&.1\&.0" "\ \&"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -856,6 +856,154 @@ Its exit status will indicate whether all tests have passed\&. It may also print
 .sp
 \m[blue]\fBFork this project on GitHub\fR\m[] and send a pull request\&.
 .SH "HISTORY"
+.SS "Version 4\&.1\&.0 (2011\-03\-28)"
+.sp
+This release adds new automated client arrangements and cleans up the code\&.
+.PP
+\fBNew features\fR
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Added new automated client arrangements:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#tile_left()
+\- Horizontal mirror of the LarsWM arrangement\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#tile_leftward()
+\- Imagine an equilateral triangle with its base on the left side of the screen and its peak on the right side of the screen\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#tile_rightward()
+\- Imagine an equilateral triangle with its base on the right side of the screen and its peak on the left side of the screen\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#tile_inward()
+\- Imagine two equilateral triangles with their bases on the left and right sides of the screen and their peaks meeting in the middle of the screen\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#tile_outward()
+\- Imagine two equilateral triangles with their bases meeting in the middle of the screen and their peaks reaching outward to the left and right sides of the screen\&.
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Renamed existing automated client arrangement method names:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#arrange_as_larswm()
+is now aliased to
+tile_right()
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#arrange_in_diamond()
+is now aliased to
+tile_inward()
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#arrange_in_stacks()
+is now aliased to
+stack()
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+
+Rumai::View#arrange_in_grid()
+is now aliased to
+grid()
+.RE
+.RE
 .SS "Version 4\&.0\&.0 (2011\-02\-25)"
 .sp
 This release fixes a bug regarding the $WMII_ADDRESS environment variable\&.

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: rumai
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 4
-  - 0
-  - 0
-  version: 4.0.0
+  prerelease: 
+  version: 4.1.0
 platform: ruby
 authors: 
 - Suraj N. Kurapati
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-25 00:00:00 -08:00
+date: 2011-03-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,15 +21,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 5
-        - 0
-        - 2
         version: 5.0.2
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 6
         version: "6"
   type: :development
   version_requirements: *id001
@@ -45,15 +35,9 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 1
-        - 0
         version: 3.1.0
     - - <
       - !ruby/object:Gem::Version 
-        segments: 
-        - 4
         version: "4"
   type: :development
   version_requirements: *id002
@@ -92,21 +76,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Ruby interface to the wmii window manager