Merge pull request JuliaLang#16 from nick-paul/option-overflow-fix

Long options are trimmed to the width of the terminal (JuliaLang#15)

src/AbstractMenu.jl

@@ -34,7 +34,7 @@ These functions must be implemented for all subtypes of AbstractMenu.
   - `pick(m::AbstractMenu, cursor::Int)`
   - `cancel(m::AbstractMenu)`
   - `options(m::AbstractMenu)`
-  - `writeLine(buf::IOBuffer, m::AbstractMenu, idx::Int, cur::Bool)`
+  - `writeLine(buf::IOBuffer, m::AbstractMenu, idx::Int, cur::Bool, term_width::Int)`
 
 ## Optional Functions
 
@@ -70,7 +70,7 @@ options(m::AbstractMenu) = error("unimplemented")
 # This function must be implemented for all menu types. It should write
 #   the option at index `idx` to the buffer. If cursor is `true` it
 #   should also display the cursor
-function writeLine(buf::IOBuffer, m::AbstractMenu, idx::Int, cur::Bool)
+function writeLine(buf::IOBuffer, m::AbstractMenu, idx::Int, cur::Bool, term_width::Int)
     error("unimplemented")
 end
 
@@ -252,7 +252,9 @@ function printMenu(out, m::AbstractMenu, cursor::Int; init::Bool=false)
             print(buf, " ")
         end
 
-        writeLine(buf, m, i, i == cursor)
+        term_width = Base.Terminals.width(TerminalMenus.terminal)
+
+        writeLine(buf, m, i, i == cursor, term_width)
 
         # dont print an \r\n on the last line
         i != (m.pagesize+m.pageoffset) && print(buf, "\r\n")

src/MultiSelectMenu.jl

@@ -85,16 +85,23 @@ function pick(menu::MultiSelectMenu, cursor::Int)
     return false #break out of the menu
 end
 
-function writeLine(buf::IOBuffer, menu::MultiSelectMenu, idx::Int, cursor::Bool)
+function writeLine(buf::IOBuffer, menu::MultiSelectMenu, idx::Int, cursor::Bool, term_width::Int)
+    cursor_len = length(CONFIG[:cursor])
     # print a ">" on the selected entry
-    cursor ? print(buf, CONFIG[:cursor]," ") : print(buf, "  ")
-    if idx in menu.selected
-        print(buf, CONFIG[:checked], " ")
-    else
-        print(buf, CONFIG[:unchecked], " ")
-    end
+    cursor ? print(buf, CONFIG[:cursor]) : print(buf, repeat(" ", cursor_len))
+    print(buf, " ") # Space between cursor and text
+
+    # Checked or unchecked?
+    status = idx in menu.selected ? :checked : :unchecked 
+
+    print(buf, CONFIG[status], " ")
+    padding = length(CONFIG[status]) + 1
+
+    line = replace(menu.options[idx], "\n", "\\n")
+    line = trimWidth(line, term_width, !cursor, cursor_len + padding)
+
+    print(buf, line)
 
-    print(buf, replace(menu.options[idx], "\n", "\\n"))
 end
 
 # d: Done, return from request

src/RadioMenu.jl

@@ -69,9 +69,14 @@ function pick(menu::RadioMenu, cursor::Int)
     return true #break out of the menu
 end
 
-function writeLine(buf::IOBuffer, menu::RadioMenu, idx::Int, cursor::Bool)
+function writeLine(buf::IOBuffer, menu::RadioMenu, idx::Int, cursor::Bool, term_width::Int)
+    cursor_len = length(CONFIG[:cursor])
     # print a ">" on the selected entry
-    cursor ? print(buf, CONFIG[:cursor] ," ") : print(buf, "  ")
+    cursor ? print(buf, CONFIG[:cursor]) : print(buf, repeat(" ", cursor_len))
+    print(buf, " ") # Space between cursor and text
 
-    print(buf, replace(menu.options[idx], "\n", "\\n"))
+    line = replace(menu.options[idx], "\n", "\\n")
+    line = trimWidth(line, term_width, !cursor, cursor_len)
+
+    print(buf, line)
 end

src/util.jl

@@ -32,6 +32,18 @@ function disableRawMode(term)
     return false
 end
 
+function trimWidth(str::String, term_width::Int, trim_right=true, pad::Int=2)
+    max_str_len = term_width - pad - 5
+    if length(str) <= max_str_len || length(str) < 6
+        return str
+    end
+    if trim_right
+        return string(str[1:max_str_len], "..")
+    else
+        return string("..", str[length(str) - max_str_len:end])
+    end
+end
+
 
 # Reads a single byte from STDIN
 readNextChar(stream::IO=STDIN) = Char(read(stream,1)[1])

test/multiselect_menu.jl

@@ -19,15 +19,16 @@ multi_menu = MultiSelectMenu(string.(1:20))
 TerminalMenus.config() # Use default chars
 CONFIG = TerminalMenus.CONFIG
 
+term_width = 100
 multi_menu = MultiSelectMenu(string.(1:10))
 buf = IOBuffer()
-TerminalMenus.writeLine(buf, multi_menu, 1, true)
+TerminalMenus.writeLine(buf, multi_menu, 1, true, term_width)
 @test String(take!(buf)) == string(CONFIG[:cursor], " ", CONFIG[:unchecked], " 1")
 TerminalMenus.config(cursor='+')
-TerminalMenus.writeLine(buf, multi_menu, 1, true)
+TerminalMenus.writeLine(buf, multi_menu, 1, true, term_width)
 @test String(take!(buf)) == string("+ ", CONFIG[:unchecked], " 1")
 TerminalMenus.config(charset=:unicode)
-TerminalMenus.writeLine(buf, multi_menu, 1, true)
+TerminalMenus.writeLine(buf, multi_menu, 1, true, term_width)
 @test String(take!(buf)) == string(CONFIG[:cursor], " ", CONFIG[:unchecked], " 1")
 
 # Test SDTIN

test/radio_menu.jl

@@ -22,15 +22,17 @@ TerminalMenus.cancel(radio_menu)
 TerminalMenus.config() # Use default chars
 CONFIG = TerminalMenus.CONFIG
 
+# Test writeLine function
+term_width = 100
 radio_menu = RadioMenu(string.(1:10))
 buf = IOBuffer()
-TerminalMenus.writeLine(buf, radio_menu, 1, true)
+TerminalMenus.writeLine(buf, radio_menu, 1, true, term_width)
 @test String(take!(buf)) == string(CONFIG[:cursor], " 1")
 TerminalMenus.config(cursor='+')
-TerminalMenus.writeLine(buf, radio_menu, 1, true)
+TerminalMenus.writeLine(buf, radio_menu, 1, true, term_width)
 @test String(take!(buf)) == "+ 1"
 TerminalMenus.config(charset=:unicode)
-TerminalMenus.writeLine(buf, radio_menu, 1, true)
+TerminalMenus.writeLine(buf, radio_menu, 1, true, term_width)
 @test String(take!(buf)) == string(CONFIG[:cursor], " 1")
 
 # Test using STDIN