diakonos 0.8.5 → 0.8.6

data/lib/diakonos/buffer.rb

@@ -346,7 +346,10 @@ class Buffer
     end
     
     def selection_mark
-        return @text_marks[ SELECTION ]
+      @text_marks[ SELECTION ]
+    end
+    def selecting?
+      !!selection_mark
     end
     
     def select_current_line
@@ -360,6 +363,11 @@ class Buffer
       @lines[ @last_row ]
     end
     
+    def select_all
+      anchorSelection( 0, 0, DONT_DISPLAY )
+      cursorTo( @lines.length - 1, @lines[ -1 ].length, DO_DISPLAY )
+    end
+    
     def select( from_regexp, to_regexp, include_ending = true )
       start_row = nil
       
@@ -721,7 +729,7 @@ class Buffer
           paste str, @indent_closers
           cursorTo r, c
           if /%_/ === str
-            find( [ /%_/ ], :down, '', CHOICE_YES_AND_STOP )
+            find( [ /%_/ ], :direction => :down, :replacement => '', :auto_choice => CHOICE_YES_AND_STOP )
           end
         else
           @diakonos.log h[ :regexp ].inspect + " does not match '#{line}'"
@@ -730,19 +738,104 @@ class Buffer
     end
     
     def collapseWhitespace
-        removeSelection( DONT_DISPLAY ) if selection_mark != nil
+      if selection_mark
+        removeSelection DONT_DISPLAY
+      end
         
-        line = @lines[ @last_row ]
-        head = line[ 0...@last_col ]
-        tail = line[ @last_col..-1 ]
-        new_head = head.sub( /\s+$/, '' )
-        new_line = new_head + tail.sub( /^\s+/, ' ' )
-        if new_line != line
-            takeSnapshot( TYPING )
-            @lines[ @last_row ] = new_line
-            cursorTo( @last_row, @last_col - ( head.length - new_head.length ) )
-            setModified
+      line = @lines[ @last_row ]
+      head = line[ 0...@last_col ]
+      tail = line[ @last_col..-1 ]
+      new_head = head.sub( /\s+$/, '' )
+      new_line = new_head + tail.sub( /^\s+/, ' ' )
+      if new_line != line
+        takeSnapshot( TYPING )
+        @lines[ @last_row ] = new_line
+        cursorTo( @last_row, @last_col - ( head.length - new_head.length ) )
+        setModified
+      end
+    end
+    
+    def selected_lines
+      selection = selection_mark
+      if selection
+        if selection.end_col == 0
+          end_row = selection.end_row - 1
+        else
+          end_row = selection.end_row
+        end
+        @lines[ selection.start_row..end_row ]
+      else
+        [ @lines[ @last_row ] ]
+      end
+    end
+    
+    def columnize( delimiter = /=>?|:|,/, num_spaces_padding = 1 )
+      takeSnapshot
+      
+      lines = selected_lines
+      column_width = 0
+      lines.each do |line|
+        pos = ( line =~ delimiter )
+        if pos
+          column_width = [ pos, column_width ].max
+        end
+      end
+      
+      padding = ' ' * num_spaces_padding
+      one_modified = false
+      
+      lines.each do |line|
+        old_line = line.dup
+        if line =~ /^(.+?)(#{delimiter.source})(.*)$/
+          pre = $1
+          del = $2
+          post = $3
+          if pre !~ /\s$/
+            del = " #{del}"
+          end
+          if post !~ /^\s/
+            del = "#{del} "
+          end
+          del.sub!( /^\s+/, ' ' * num_spaces_padding )
+          del.sub!( /\s+$/, ' ' * num_spaces_padding )
+          line.replace( ( "%-#{column_width}s" % pre ) + del + post )
         end
+        one_modified ||= ( line != old_line )
+      end
+      
+      if one_modified
+        setModified
+      end
+    end
+    
+    def comment_out
+      takeSnapshot
+      one_modified = false
+      selected_lines.each do |line|
+        old_line = line.dup
+        line.gsub!( /^(\s*)/, "\\1" + @settings[ "lang.#{@language}.comment_string" ].to_s )
+        line << @settings[ "lang.#{@language}.comment_close_string" ].to_s
+        one_modified ||= ( line != old_line )
+      end
+      if one_modified
+        setModified
+      end
+    end
+    
+    def uncomment
+      takeSnapshot
+      comment_string = Regexp.escape( @settings[ "lang.#{@language}.comment_string" ].to_s )
+      comment_close_string = Regexp.escape( @settings[ "lang.#{@language}.comment_close_string" ].to_s )
+      one_modified = false
+      selected_lines.each do |line|
+        old_line = line.dup
+        line.gsub!( /^(\s*)#{comment_string}/, "\\1" )
+        line.gsub!( /#{comment_close_string}$/, '' )
+        one_modified ||= ( line != old_line )
+      end
+      if one_modified
+        setModified
+      end
     end
 
     def deleteLine
@@ -761,7 +854,7 @@ class Buffer
         cursorTo( row, 0 )
         setModified
 
-        return retval
+        retval
     end
 
     def deleteToEOL
@@ -800,11 +893,15 @@ class Buffer
     def lineAt( y )
         row = @top_line + y
         if row < 0
-            return nil
+            nil
         else
-            return @lines[ row ]
+            @lines[ row ]
         end
     end
+    
+    def current_line
+      @lines[ @last_row ]
+    end
 
     # Returns true iff the given column, x, is less than the length of the given line, y.
     def inLine( x, y )
@@ -838,11 +935,11 @@ class Buffer
     end
 
     def currentRow
-        return @last_row
+        @last_row
     end
 
     def currentColumn
-        return @last_col
+        @last_col
     end
 
     # Returns the amount the view was actually panned.
@@ -1318,11 +1415,17 @@ class Buffer
     # split across newline characters.  Once the first element is found,
     # each successive element must match against lines following the first
     # element.
-    def find( regexps, direction = :down, replacement = nil, auto_choice = nil )
+    def find( regexps, options = {} )
         return if regexps.nil?
         regexp = regexps[ 0 ]
         return if regexp == nil or regexp == //
         
+        direction = options[ :direction ]
+        replacement = options[ :replacement ]
+        auto_choice = options[ :auto_choice ]
+        from_row = options[ :starting_row ] || @last_row
+        from_col = options[ :starting_col ] || @last_col
+        
         if direction == :opposite
             case @last_search_direction
                 when :up
@@ -1343,10 +1446,10 @@ class Buffer
             if direction == :down
                 # Check the current row first.
                 
-                if index = @lines[ @last_row ].index( regexp, ( @last_finding ? @last_finding.start_col : @last_col ) + 1 )
+                if index = @lines[ from_row ].index( regexp, ( @last_finding ? @last_finding.start_col : from_col ) + 1 )
                   match = Regexp.last_match
                   found_text = match[ 0 ]
-                  finding = Finding.new( @last_row, index, @last_row, index + found_text.length )
+                  finding = Finding.new( from_row, index, from_row, index + found_text.length )
                   if finding.match( regexps, @lines )
                     throw :found
                   else
@@ -1356,7 +1459,7 @@ class Buffer
                 
                 # Check below the cursor.
                 
-                ( (@last_row + 1)...@lines.length ).each do |i|
+                ( (from_row + 1)...@lines.length ).each do |i|
                     if index = @lines[ i ].index( regexp )
                       match = Regexp.last_match
                       found_text = match[ 0 ]
@@ -1373,7 +1476,7 @@ class Buffer
                 
                 wrapped = true
                 
-                ( 0...@last_row ).each do |i|
+                ( 0...from_row ).each do |i|
                     if index = @lines[ i ].index( regexp )
                       match = Regexp.last_match
                       found_text = match[ 0 ]
@@ -1388,12 +1491,12 @@ class Buffer
                 
                 # And finally, the other side of the current row.
                 
-                #if index = @lines[ @last_row ].index( regexp, ( @last_finding ? @last_finding.start_col : @last_col ) - 1 )
-                if index = @lines[ @last_row ].index( regexp )
-                    if index <= ( @last_finding ? @last_finding.start_col : @last_col )
+                #if index = @lines[ from_row ].index( regexp, ( @last_finding ? @last_finding.start_col : from_col ) - 1 )
+                if index = @lines[ from_row ].index( regexp )
+                    if index <= ( @last_finding ? @last_finding.start_col : from_col )
                       match = Regexp.last_match
                       found_text = match[ 0 ]
-                      finding = Finding.new( @last_row, index, @last_row, index + found_text.length )
+                      finding = Finding.new( from_row, index, from_row, index + found_text.length )
                       if finding.match( regexps, @lines )
                         throw :found
                       else
@@ -1405,11 +1508,11 @@ class Buffer
             elsif direction == :up
                 # Check the current row first.
                 
-                col_to_check = ( @last_finding ? @last_finding.end_col : @last_col ) - 1
-                if ( col_to_check >= 0 ) and ( index = @lines[ @last_row ][ 0...col_to_check ].rindex( regexp ) )
+                col_to_check = ( @last_finding ? @last_finding.end_col : from_col ) - 1
+                if ( col_to_check >= 0 ) and ( index = @lines[ from_row ][ 0...col_to_check ].rindex( regexp ) )
                   match = Regexp.last_match
                   found_text = match[ 0 ]
-                  finding = Finding.new( @last_row, index, @last_row, index + found_text.length )
+                  finding = Finding.new( from_row, index, from_row, index + found_text.length )
                   if finding.match( regexps, @lines )
                     throw :found
                   else
@@ -1419,7 +1522,7 @@ class Buffer
                 
                 # Check above the cursor.
                 
-                (@last_row - 1).downto( 0 ) do |i|
+                (from_row - 1).downto( 0 ) do |i|
                     if index = @lines[ i ].rindex( regexp )
                       match = Regexp.last_match
                       found_text = match[ 0 ]
@@ -1436,7 +1539,7 @@ class Buffer
                 
                 wrapped = true
                 
-                (@lines.length - 1).downto(@last_row + 1) do |i|
+                (@lines.length - 1).downto(from_row + 1) do |i|
                     if index = @lines[ i ].rindex( regexp )
                       match = Regexp.last_match
                       found_text = match[ 0 ]
@@ -1451,12 +1554,12 @@ class Buffer
                 
                 # And finally, the other side of the current row.
                 
-                search_col = ( @last_finding ? @last_finding.start_col : @last_col ) + 1
-                if index = @lines[ @last_row ].rindex( regexp )
+                search_col = ( @last_finding ? @last_finding.start_col : from_col ) + 1
+                if index = @lines[ from_row ].rindex( regexp )
                     if index > search_col
                       match = Regexp.last_match
                       found_text = match[ 0 ]
-                      finding = Finding.new( @last_row, index, @last_row, index + found_text.length )
+                      finding = Finding.new( from_row, index, from_row, index + found_text.length )
                       if finding.match( regexps, @lines )
                         throw :found
                       else
@@ -1468,7 +1571,9 @@ class Buffer
         end
         
         if finding
-            @diakonos.setILine( "(search wrapped around BOF/EOF)" ) if wrapped
+            if wrapped and not options[ :quiet ]
+              @diakonos.setILine( "(search wrapped around BOF/EOF)" )
+            end
             
             removeSelection( DONT_DISPLAY )
             @last_finding = finding
@@ -1510,11 +1615,11 @@ class Buffer
               case choice
               when CHOICE_YES
                 paste [ actual_replacement ]
-                find( regexps, direction, replacement )
+                find( regexps, :direction => direction, :replacement => replacement )
               when CHOICE_ALL
                 replaceAll( regexp, replacement )
               when CHOICE_NO
-                find( regexps, direction, replacement )
+                find( regexps, :direction => direction, :replacement => replacement )
               when CHOICE_CANCEL
                 # Do nothing further.
               when CHOICE_YES_AND_STOP
@@ -1523,7 +1628,11 @@ class Buffer
               end
             end
         else
+          removeSelection DONT_DISPLAY
+          clearMatches DO_DISPLAY
+          if not options[ :quiet ]
             @diakonos.setILine "/#{regexp.source}/ not found."
+          end
         end
     end
 
@@ -1559,10 +1668,12 @@ class Buffer
     end
 
     def findAgain( last_search_regexps, direction = @last_search_direction )
-        if @last_search_regexps == nil
-            @last_search_regexps = last_search_regexps
+        if @last_search_regexps.nil?
+          @last_search_regexps = last_search_regexps
+        end
+        if @last_search_regexps
+          find( @last_search_regexps, :direction => direction )
         end
-        find( @last_search_regexps, direction ) if( @last_search_regexps != nil )
     end
     
     def seek( regexp, direction = :down )
@@ -1717,38 +1828,70 @@ class Buffer
     end
 
     def undo
-        if @current_buffer_state < @buffer_states.length - 1
-            @current_buffer_state += 1
-            @lines = @buffer_states[ @current_buffer_state ]
-            cursorTo( @cursor_states[ @current_buffer_state - 1 ][ 0 ], @cursor_states[ @current_buffer_state - 1 ][ 1 ] )
-            @diakonos.setILine "Undo level: #{@current_buffer_state} of #{@buffer_states.length - 1}"
-            setModified
-        end
+      if @current_buffer_state < @buffer_states.length - 1
+        @current_buffer_state += 1
+        @lines = @buffer_states[ @current_buffer_state ]
+        cursorTo( @cursor_states[ @current_buffer_state - 1 ][ 0 ], @cursor_states[ @current_buffer_state - 1 ][ 1 ] )
+        @diakonos.setILine "Undo level: #{@current_buffer_state} of #{@buffer_states.length - 1}"
+        setModified
+      end
     end
 
     # Since redo is a Ruby keyword...
     def unundo
-        if @current_buffer_state > 0
-            @current_buffer_state += -1
-            @lines = @buffer_states[ @current_buffer_state ]
-            cursorTo( @cursor_states[ @current_buffer_state ][ 0 ], @cursor_states[ @current_buffer_state ][ 1 ] )
-            @diakonos.setILine "Undo level: #{@current_buffer_state} of #{@buffer_states.length - 1}"
-            setModified
+      if @current_buffer_state > 0
+        @current_buffer_state += -1
+        @lines = @buffer_states[ @current_buffer_state ]
+        cursorTo( @cursor_states[ @current_buffer_state ][ 0 ], @cursor_states[ @current_buffer_state ][ 1 ] )
+        @diakonos.setILine "Undo level: #{@current_buffer_state} of #{@buffer_states.length - 1}"
+        setModified
+      end
+    end
+    
+    def wrap_paragraph
+      start_row = end_row = @last_row
+      until start_row == 0 || @lines[ start_row - 1 ].strip == ''
+        start_row -= 1
+      end
+      until end_row == @lines.size || @lines[ end_row ].strip == ''
+        end_row += 1
+      end
+
+      lines = []
+      line = ''
+      words = @lines[ start_row...end_row ].join( ' ' ).scan( /\S+/ )
+      words.each do |word|
+        if word =~ /^[a-z']+[.!?]$/
+          word = "#{word} "
+        end
+        if line.length + word.length + 1 > ( @settings[ "lang.#{@language}.wrap_margin" ] || 80 )
+          lines << line.strip
+          line = ''
         end
+        line << " #{word}"
+      end
+      line.strip!
+      if not line.empty?
+        lines << line
+      end
+      if @lines[ start_row...end_row ] != lines
+        @lines[ start_row...end_row ] = lines
+        setModified
+      end
     end
 
     def goToLine( line = nil, column = nil )
-        cursorTo( line || @last_row, column || 0, DO_DISPLAY )
+      cursorTo( line || @last_row, column || 0, DO_DISPLAY )
     end
 
     def goToNextBookmark
-        cur_pos = Bookmark.new( self, @last_row, @last_col )
-        next_bm = @bookmarks.find do |bm|
-            bm > cur_pos
-        end
-        if next_bm != nil
-            cursorTo( next_bm.row, next_bm.col, DO_DISPLAY )
-        end
+      cur_pos = Bookmark.new( self, @last_row, @last_col )
+      next_bm = @bookmarks.find do |bm|
+        bm > cur_pos
+      end
+      if next_bm
+        cursorTo( next_bm.row, next_bm.col, DO_DISPLAY )
+      end
     end
 
     def goToPreviousBookmark

data/lib/diakonos/readline.rb

@@ -1,219 +1,255 @@
 module Diakonos
-
-class Readline
-
+  
+  class Readline
+    
     # completion_array is the array of strings that tab completion can use
-    def initialize( diakonos, window, initial_text = "", completion_array = nil, history = [] )
-        @window = window
-        @diakonos = diakonos
-        @initial_text = initial_text
-        @completion_array = completion_array
-        @list_filename = @diakonos.list_filename
-        
-        @history = history
-        @history << initial_text
-        @history_index = @history.length - 1
+    # The block returns true if a refresh is needed?
+    def initialize( diakonos, window, prompt, initial_text = "", completion_array = nil, history = [], &block )
+      @diakonos = diakonos
+      @window = window
+      @prompt = prompt
+      pos = redraw_prompt
+      @window.setpos( 0, pos )
+      @initial_text = initial_text
+      @completion_array = completion_array
+      @list_filename = @diakonos.list_filename
+      
+      @history = history
+      @history << initial_text
+      @history_index = @history.length - 1
+      
+      @block = block
     end
-
+    
+    def redraw_prompt
+      @diakonos.setILine @prompt
+    end
+    
+    def call_block
+      if @block
+        @block.call( @input )
+        @window.refresh
+      end
+    end
+    
     # Returns nil on cancel.
     def readline
-        @input = @initial_text
-        @icurx = @window.curx
-        @icury = @window.cury
-        @window.addstr @initial_text
-        @input_cursor = @initial_text.length
-        @opened_list_file = false
-
-        loop do
-            c = @window.getch
-
-            case c
-                when Curses::KEY_DC
-                    if @input_cursor < @input.length
-                        @window.delch
-                        @input = @input[ 0...@input_cursor ] + @input[ (@input_cursor + 1)..-1 ]
-                    end
-                when BACKSPACE, CTRL_H
-                    # Curses::KEY_LEFT
-                    if @input_cursor > 0
-                        @input_cursor += -1
-                        @window.setpos( @window.cury, @window.curx - 1 )
-                        
-                        # Curses::KEY_DC
-                        if @input_cursor < @input.length
-                            @window.delch
-                            @input = @input[ 0...@input_cursor ] + @input[ (@input_cursor + 1)..-1 ]
-                        end
-                    end
-                when ENTER
-                  item = @diakonos.current_list_item
-                  if item and File.directory? item
-                    completeInput
-                  else
-                    break
-                  end
-                when ESCAPE, CTRL_C, CTRL_D, CTRL_Q
-                    @input = nil
-                    break
-                when Curses::KEY_LEFT
-                    if @input_cursor > 0
-                        @input_cursor += -1
-                        @window.setpos( @window.cury, @window.curx - 1 )
-                    end
-                when Curses::KEY_RIGHT
-                    if @input_cursor < @input.length
-                        @input_cursor += 1
-                        @window.setpos( @window.cury, @window.curx + 1 )
-                    end
-                when Curses::KEY_HOME
-                    @input_cursor = 0
-                    @window.setpos( @icury, @icurx )
-                when Curses::KEY_END
-                    @input_cursor = @input.length
-                    @window.setpos( @window.cury, @icurx + @input.length )
-                when TAB
-                    completeInput
-                when Curses::KEY_NPAGE
-                    @diakonos.pageDown
-                    line = @diakonos.select_list_item
-                    if line
-                      @input = line
-                      cursorWriteInput
-                    end
-                when Curses::KEY_PPAGE
-                    @diakonos.pageUp
-                    line = @diakonos.select_list_item
-                    if line
-                      @input = line
-                      cursorWriteInput
-                    end
-                when Curses::KEY_UP
-                  if @diakonos.showing_list?
-                    @input = @diakonos.previous_list_item
-                    @diakonos.select_list_item
-                  elsif @history_index > 0
-                    @history[ @history_index ] = @input
-                    @history_index -= 1
-                    @input = @history[ @history_index ]
-                  end
-                  cursorWriteInput
-                when Curses::KEY_DOWN
-                  if @diakonos.showing_list?
-                    @input = @diakonos.next_list_item
-                    @diakonos.select_list_item
-                  elsif @history_index < @history.length - 1
-                    @history[ @history_index ] = @input
-                    @history_index += 1
-                    @input = @history[ @history_index ]
-                  end
-                  cursorWriteInput
-                when CTRL_K
-                    @input = ""
-                    cursorWriteInput
-                else
-                    if c > 31 and c < 255 and c != BACKSPACE
-                        if @input_cursor == @input.length
-                            @input << c
-                            @window.addch c
-                        else
-                            @input = @input[ 0...@input_cursor ] + c.chr + @input[ @input_cursor..-1 ]
-                            @window.setpos( @window.cury, @window.curx + 1 )
-                            redrawInput
-                        end
-                        @input_cursor += 1
-                    else
-                        @diakonos.log "Other input: #{c}"
-                    end
+      @input = @initial_text
+      if not @input.empty?
+        call_block
+      end
+      
+      @icurx = @window.curx
+      @icury = @window.cury
+      @window.addstr @initial_text
+      @input_cursor = @initial_text.length
+      @opened_list_file = false
+      
+      loop do
+        c = @window.getch
+        
+        case c
+        when Curses::KEY_DC
+          if @input_cursor < @input.length
+            @window.delch
+            @input = @input[ 0...@input_cursor ] + @input[ (@input_cursor + 1)..-1 ]
+            call_block
+          end
+        when BACKSPACE, CTRL_H
+          # Curses::KEY_LEFT
+          if @input_cursor > 0
+            @input_cursor += -1
+            @window.setpos( @window.cury, @window.curx - 1 )
+            
+            # Curses::KEY_DC
+            if @input_cursor < @input.length
+              @window.delch
+              @input = @input[ 0...@input_cursor ] + @input[ (@input_cursor + 1)..-1 ]
+              call_block
+            end
+          end
+        when ENTER, Curses::KEY_F3
+          item = @diakonos.current_list_item
+          if item and File.directory? item
+            completeInput
+          else
+            break
+          end
+        when ESCAPE, CTRL_C, CTRL_D, CTRL_Q
+          @input = nil
+          break
+        when Curses::KEY_LEFT
+          if @input_cursor > 0
+            @input_cursor += -1
+            @window.setpos( @window.cury, @window.curx - 1 )
+          end
+        when Curses::KEY_RIGHT
+          if @input_cursor < @input.length
+            @input_cursor += 1
+            @window.setpos( @window.cury, @window.curx + 1 )
+          end
+        when Curses::KEY_HOME
+          @input_cursor = 0
+          @window.setpos( @icury, @icurx )
+        when Curses::KEY_END
+          @input_cursor = @input.length
+          @window.setpos( @window.cury, @icurx + @input.length )
+        when TAB
+          completeInput
+        when Curses::KEY_NPAGE
+          @diakonos.pageDown
+          line = @diakonos.select_list_item
+          if line
+            @input = line
+            cursorWriteInput
+          end
+        when Curses::KEY_PPAGE
+          @diakonos.pageUp
+          line = @diakonos.select_list_item
+          if line
+            @input = line
+            cursorWriteInput
+          end
+        when Curses::KEY_UP
+          if @diakonos.showing_list?
+            if @diakonos.list_item_selected?
+              @diakonos.previous_list_item
+            end
+            @input = @diakonos.select_list_item
+          elsif @history_index > 0
+            @history[ @history_index ] = @input
+            @history_index -= 1
+            @input = @history[ @history_index ]
+          end
+          cursorWriteInput
+        when Curses::KEY_DOWN
+          if @diakonos.showing_list?
+            if @diakonos.list_item_selected?
+              @diakonos.next_list_item
+            end
+            @input = @diakonos.select_list_item
+          elsif @history_index < @history.length - 1
+            @history[ @history_index ] = @input
+            @history_index += 1
+            @input = @history[ @history_index ]
+          end
+          cursorWriteInput
+        when CTRL_K
+          @input = ""
+          if @block
+            @block.call @input
+          end
+          cursorWriteInput
+        else
+          if c > 31 and c < 255 and c != BACKSPACE
+            if @input_cursor == @input.length
+              @input << c
+              @window.addch c
+            else
+              @input = @input[ 0...@input_cursor ] + c.chr + @input[ @input_cursor..-1 ]
+              @window.setpos( @window.cury, @window.curx + 1 )
+              redrawInput
             end
+            @input_cursor += 1
+            call_block
+          else
+            @diakonos.log "Other input: #{c}"
+          end
         end
-        
-        @diakonos.closeListBuffer
-
-        @history[ -1 ] = @input
-        
-        return @input
+      end
+      
+      @diakonos.closeListBuffer
+      
+      @history[ -1 ] = @input
     end
 
     def redrawInput
-        curx = @window.curx
-        cury = @window.cury
-        @window.setpos( @icury, @icurx )
-        @window.addstr "%-#{ Curses::cols - curx }s%s" % [ @input, " " * ( Curses::cols - @input.length ) ]
-        @window.setpos( cury, curx )
-        @window.refresh
+      input = @input[ 0...Curses::cols ]
+      
+      curx = @window.curx
+      cury = @window.cury
+      @window.setpos( @icury, @icurx )
+      @window.addstr "%-#{ Curses::cols - curx }s%s" % [ input, " " * ( Curses::cols - input.length ) ]
+      @window.setpos( cury, curx )
+      @window.refresh
     end
-
+    
     # Redisplays the input text starting at the start of the user input area,
     # positioning the cursor at the end of the text.
     def cursorWriteInput
-        if @input != nil
-            @input_cursor = @input.length
-            @window.setpos( @window.cury, @icurx + @input.length )
-            redrawInput
-        end
+      if @input != nil
+        @input_cursor = @input.length
+        @window.setpos( @window.cury, @icurx + @input.length )
+        redrawInput
+      end
     end
 
     def completeInput
-        if @completion_array != nil and @input.length > 0
-            len = @input.length
-            matches = @completion_array.find_all { |el| el[ 0...len ] == @input and len < el.length }
-        else
-            matches = Dir.glob( ( @input.subHome() + "*" ).gsub( /\*\*/, "*" ) )
+      if @completion_array and @input.length > 0
+        len = @input.length
+        matches = @completion_array.find_all { |el| el[ 0...len ] == @input and len <= el.length }
+      else
+        matches = Dir.glob( ( @input.subHome() + "*" ).gsub( /\*\*/, "*" ) )
+      end
+      
+      if matches.length == 1
+        @input = matches[ 0 ]
+        cursorWriteInput
+        File.open( @list_filename, "w" ) do |f|
+          if @completion_array.nil?
+            f.puts "(unique)"
+          else
+            f.puts @input
+          end
         end
-        
-        if matches.length == 1
-            @input = matches[ 0 ]
-            cursorWriteInput
-            File.open( @list_filename, "w" ) do |f|
-                f.puts "(unique)"
-            end
-            if @completion_array == nil and FileTest.directory?( @input )
-                @input << "/"
-                cursorWriteInput
-                completeInput
+        if @completion_array.nil? and FileTest.directory?( @input )
+          @input << "/"
+          cursorWriteInput
+          completeInput
+        end
+      elsif matches.length > 1
+        common = matches[ 0 ]
+        File.open( @list_filename, "w" ) do |f|
+          i = nil
+          matches.each do |match|
+            f.print match
+            if FileTest.directory?( match )
+              f.print '/'
+            else
+              @diakonos.log "'#{match}' is not a directory"
             end
-        elsif matches.length > 1
-            common = matches[ 0 ]
-            File.open( @list_filename, "w" ) do |f|
-                i = nil
-                matches.each do |match|
-                    f.print match
-                    if FileTest.directory?( match )
-                      f.print '/'
-                    else
-                      @diakonos.log "'#{match}' is not a directory"
-                    end
-                    f.puts
-                    
-                    if match[ 0 ] != common[ 0 ]
-                        common = nil
-                        break
-                    end
-                    
-                    up_to = [ common.length - 1, match.length - 1 ].min
-                    i = 1
-                    while ( i <= up_to ) and ( match[ 0..i ] == common[ 0..i ] )
-                        i += 1
-                    end
-                    common = common[ 0...i ]
-                end
+            f.puts
+            
+            if match[ 0 ] != common[ 0 ]
+              common = nil
+              break
             end
-            if common == nil
-                File.open( @list_filename, "w" ) do |f|
-                    f.puts "(no matches)"
-                end
-            else
-                @input = common
-                cursorWriteInput
+            
+            up_to = [ common.length - 1, match.length - 1 ].min
+            i = 1
+            while ( i <= up_to ) and ( match[ 0..i ] == common[ 0..i ] )
+              i += 1
             end
+            common = common[ 0...i ]
+          end
+        end
+        if common == nil
+          File.open( @list_filename, "w" ) do |f|
+            f.puts "(no matches)"
+          end
         else
-            File.open( @list_filename, "w" ) do |f|
-                f.puts "(no matches)"
-            end
+          @input = common
+          cursorWriteInput
+        end
+      else
+        File.open( @list_filename, "w" ) do |f|
+          f.puts "(no matches)"
         end
-        @diakonos.openListBuffer
-        @window.setpos( @window.cury, @window.curx )
+      end
+      @diakonos.openListBuffer
+      @window.setpos( @window.cury, @window.curx )
     end
-end
+    
+  end
 
 end