console: cull lines outside of visible area

Lines that would be outside of the visible area are now culled.
The log messages were already culled, however with the introduction
of suggestions, they also needed a small update.

Author: christoph-heinrich

player/lua/console.lua

@@ -150,11 +150,14 @@ function ass_escape(str)
     return str
 end
 
--- Takes a list of strings and a max width in characters
--- returns a string containing the formatted table
-function format_table(list, width_max)
+-- Takes a list of strings, a max width in characters and
+-- optionally a max row count.
+-- The result contains at least one column.
+-- Rows are cut off from the top if rows_max is specified.
+-- returns a string containing the formatted table and the row count
+function format_table(list, width_max, rows_max)
     if #list == 0 then
-        return ''
+        return '', 0
     end
 
     local spaces_min = 2
@@ -198,7 +201,7 @@ function format_table(list, width_max)
         for row = 1, rows_needed do
             result = result .. list[row] .. '\n'
         end
-        return result
+        return result, rows_needed
     end
 
     local spaces = math.floor((width_max - width_total) / (columns_needed - 1))
@@ -209,7 +212,9 @@ function format_table(list, width_max)
     for column = 1, columns_needed - 1 do
         column_widths[column] = column_widths[column] + spaces
     end
-    for row = 1, rows_needed do
+    -- cut off rows
+    local start = rows_max and math.max(1, rows_needed - rows_max + 1) or 1
+    for row = start, rows_needed do
         local row_text = ''
         for column = 1, columns_needed do
             local i = row + (column - 1) * rows_needed
@@ -219,7 +224,7 @@ function format_table(list, width_max)
         end
         result = result .. row_text .. '\n'
     end
-    return result
+    return result, rows_needed
 end
 
 -- Render the REPL and console as an ASS OSD
@@ -265,26 +270,29 @@ function update()
     local before_cur = ass_escape(line:sub(1, cursor - 1))
     local after_cur = ass_escape(line:sub(cursor))
 
-    -- Render log messages as ASS. This will render at most screeny / font_size
-    -- messages.
+    -- Render log messages as ASS.
+    -- This will render at most screeny / font_size - 1 messages.
+
+    -- lines above the prompt
+    -- subtract 1.5 to account for the input line
+    local screeny_factor = 1 - global_margin_top - global_margin_bottom
+    local lines_max = math.ceil(screeny * screeny_factor / opts.font_size - 1.5)
+    -- Estimate how many characters fit in one line
+    local width_max = math.ceil(screenx / opts.font_size * opts.font_hw_ratio)
+
+    local suggestions, rows = format_table(suggestion_buffer, width_max, lines_max)
+    local suggestion_ass = style .. styles.suggestion .. ass_escape(suggestions)
+
     local log_ass = ''
     local log_messages = #log_buffer
-    local screeny_factor = (1 - global_margin_top - global_margin_bottom)
-    -- subtract 1.5 to account for the input line
-    local log_max_lines = screeny * screeny_factor / opts.font_size - 1.5
-    log_max_lines = math.ceil(log_max_lines)
+    local log_max_lines = math.max(0, lines_max - rows)
     if log_max_lines < log_messages then
         log_messages = log_max_lines
     end
     for i = #log_buffer - log_messages + 1, #log_buffer do
         log_ass = log_ass .. style .. log_buffer[i].style .. ass_escape(log_buffer[i].text)
     end
 
-    -- estimate how many characters fit in a line
-    local width_max = math.ceil(screenx / opts.font_size * opts.font_hw_ratio)
-    local table_string = ass_escape(format_table(suggestion_buffer, width_max))
-    local suggestion_ass = style .. styles.suggestion .. table_string
-
     ass:new_event()
     ass:an(1)
     ass:pos(2, screeny - 2 - global_margin_bottom * screeny)