Fix modes and add diff

Author: kdheepak

src/TerminalUserInterfaces.jl

@@ -30,4 +30,10 @@ include("widgets/list.jl")
 include("widgets/barchart.jl")
 include("widgets/grid.jl")
 
+function __init__()
+
+    backup_termios()
+
+end
+
 end # module

src/terminal.jl

@@ -10,6 +10,7 @@ struct Terminal
     stdin_channel::Channel{Char}
     kind::String
     wait::Float64
+    ispaused::Ref{Bool}
     function Terminal(stdout_io = stdout, stdin_io = stdin)
         width, height = terminal_size()
         rect = Rect(1, 1, width, height)
@@ -18,14 +19,23 @@ struct Terminal
         cursor_hidden = false
         stdout_channel = Channel{String}(Inf)
         stdin_channel = Channel{Char}(Inf)
+        ispaused = Ref{Bool}(false)
         stdout_task = @async while true
+            if ispaused[] == true
+                sleep(1)
+                continue
+            end
             print(stdout_io, take!(stdout_channel))
         end
         stdin_task = @async while true
+            if ispaused[] == true
+                sleep(1)
+                continue
+            end
             c = Char(read(stdin_io, 1)[])
             put!(stdin_channel, c)
         end
-        t = new(buffers, current, cursor_hidden, rect, Char[], stdout_channel, stdin_channel, get(ENV, "TERM", ""), 1 / 1000)
+        t = new(buffers, current, cursor_hidden, rect, Char[], stdout_channel, stdin_channel, get(ENV, "TERM", ""), 1 / 1000, ispaused)
         TERMINAL[] = t
         return t
     end
@@ -49,10 +59,14 @@ update_channel(t, arg::String) = put!(t.stdout_channel, arg)
 
 const TERMINAL = Ref{Terminal}()
 
-function flush(t::Terminal)
+function flush(t::Terminal, diff = true)
     previous_buffer = t.buffers[END - t.current[]]
     current_buffer = t.buffers[t.current[]]
-    draw(t, previous_buffer, current_buffer)
+    if diff
+        draw(t, previous_buffer, current_buffer)
+    else
+        draw(t, current_buffer)
+    end
     while isready(t.stdout_channel)
         sleep(1e-6)
     end
@@ -109,17 +123,35 @@ function update(t::Terminal)
     end
 end
 
-function draw(t::Terminal, buffer1::Buffer, buffer2::Buffer)
+function draw(t::Terminal, buffer::Buffer)
     save_cursor(t)
-    b1 = buffer1.content[:]
-    b2 = buffer2.content[:]
     move_cursor_home(t)
     iob = IOBuffer()
-    for cell in permutedims(buffer2.content)[:]
+    for cell in permutedims(buffer.content)[:]
         print(iob, cell.style, cell.char, inv(cell.style))
     end
     update_channel(t, String(take!(iob)))
     restore_cursor(t)
+    while isready(t.stdout_channel)
+        sleep(1e-6)
+    end
+    update(t)
+end
+
+function draw(t::Terminal, buffer1::Buffer, buffer2::Buffer)
+    save_cursor(t)
+    b1 = buffer1.content[:]
+    b2 = buffer2.content[:]
+    move_cursor_home(t)
+    R, C = size(buffer2.content)
+    for r = 1:R, c = 1:C
+        if buffer1.content[r, c] != buffer2.content[r, c]
+            move_cursor(t, r, c)
+            cell = buffer2.content[r, c]
+            update_channel(t, cell.style, cell.char, inv(cell.style))
+        end
+    end
+    restore_cursor(t)
 end
 
 function resize(t::Terminal, w::Int, h::Int)

src/utils.jl

@@ -99,6 +99,8 @@ tui_mode() = print(stdout, TUIMODE)
 default_mode() = print(stdout, DEFAULTMODE)
 
 function with_raw_mode(f::Function)
+    # if already in in raw mode don't enter raw mode again.
+    # entering raw mode
     entered_raw_mode = false
     if MODE[] != :raw
         enable_raw_mode()
@@ -179,22 +181,21 @@ function enable_raw_mode()
     termios.c_cc[TERMIOS.VMIN] = 0
     termios.c_cc[TERMIOS.VTIME] = 1
     TERMIOS.tcsetattr(stdin, TERMIOS.TCSANOW, termios)
-    MODE[] = :raw
 end
 
 function disable_raw_mode()
     TERMIOS.tcsetattr(stdin, TERMIOS.TCSANOW, BACKUP_STDIN_TERMIOS[])
+    MODE[] = :default
 end
 
-function initialize_backup_termios()
+function backup_termios()
     BACKUP_STDIN_TERMIOS[] = TERMIOS.termios()
     BACKUP_STDOUT_TERMIOS[] = TERMIOS.termios()
     TERMIOS.tcgetattr(stdin, BACKUP_STDIN_TERMIOS[])
     TERMIOS.tcgetattr(stdout, BACKUP_STDOUT_TERMIOS[])
 end
 
 function initialize()
-    initialize_backup_termios()
     tui_mode()
     hide_cursor()
     enable_raw_mode()