console.lua: fix highlighting the selected item with --msg-module

With --msg-module the select menu also highlights the "statusline" on
the next line. Fix this by resetting the color before \n instead of
after it.

This requires changing all log code to not preemptively add a newline,
which is actually simpler, though we have to modify the messages
received with log-message which already contain a newline.

player/lua/console.lua

@@ -428,7 +428,7 @@ local function populate_log_with_matches(max_width)
 
     if first_match_to_print > 1 then
         log[1] = {
-            text = '↑ (' .. (first_match_to_print - 1) .. ' hidden items)' .. '\n',
+            text = '↑ (' .. (first_match_to_print - 1) .. ' hidden items)',
             style = styles.disabled,
             terminal_style = terminal_styles.disabled,
         }
@@ -437,7 +437,7 @@ local function populate_log_with_matches(max_width)
     for i = first_match_to_print, last_match_to_print do
         log[#log + 1] = {
             text = (max_width and truncate_utf8(matches[i].text, max_width)
-                    or matches[i].text) .. '\n',
+                    or matches[i].text),
             style = i == selected_match and styles.selected_suggestion or '',
             terminal_style = i == selected_match and terminal_styles.selected_suggestion or '',
         }
@@ -445,7 +445,7 @@ local function populate_log_with_matches(max_width)
 
     if last_match_to_print < #matches then
         log[#log + 1] = {
-            text = '↓ (' .. (#matches - last_match_to_print) .. ' hidden items)' .. '\n',
+            text = '↓ (' .. (#matches - last_match_to_print) .. ' hidden items)',
             style = styles.disabled,
             terminal_style = terminal_styles.disabled,
         }
@@ -463,7 +463,7 @@ local function print_to_terminal()
 
     local log = ''
     for _, log_line in ipairs(log_buffers[id]) do
-        log = log .. log_line.terminal_style .. log_line.text .. '\027[0m'
+        log = log .. log_line.terminal_style .. log_line.text .. '\027[0m\n'
     end
 
     local suggestions = ''
@@ -563,7 +563,8 @@ local function update()
         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)
+        log_ass = log_ass .. style .. log_buffer[i].style ..
+                  ass_escape(log_buffer[i].text) .. '\\N'
     end
 
     ass:new_event()
@@ -745,7 +746,7 @@ local function help_command(param)
             end
         end
         if not cmd then
-            log_add('No command matches "' .. param .. '"!\n', styles.error,
+            log_add('No command matches "' .. param .. '"!', styles.error,
                     terminal_styles.error)
             return
         end
@@ -761,7 +762,7 @@ local function help_command(param)
             output = output .. 'This command supports variable arguments.\n'
         end
     end
-    log_add(output)
+    log_add(output:sub(1, -2))
 end
 
 -- Run the current command and clear the line (Enter)
@@ -1738,7 +1739,7 @@ mp.register_script_message('log', function (message)
 
     message = utils.parse_json(message)
 
-    log_add(message.text .. '\n',
+    log_add(message.text,
             message.error and styles.error or message.style,
             message.error and terminal_styles.error or message.terminal_style)
 end)
@@ -1753,13 +1754,13 @@ mp.register_script_message('set-log', function (log)
 
     for i = 1, #log do
         if type(log[i]) == 'table' then
-            log[i].text = log[i].text .. '\n'
+            log[i].text = log[i].text
             log[i].style = log[i].style or ''
             log[i].terminal_style = log[i].terminal_style or ''
             log_buffers[id][i] = log[i]
         else
             log_buffers[id][i] = {
-                text = log[i] .. '\n',
+                text = log[i],
                 style = '',
                 terminal_style = '',
             }
@@ -1830,7 +1831,7 @@ mp.register_event('log-message', function(e)
     if e.level == 'trace' then return end
 
     -- Use color for debug/v/warn/error/fatal messages.
-    log_add('[' .. e.prefix .. '] ' .. e.text, styles[e.level],
+    log_add('[' .. e.prefix .. '] ' .. e.text:sub(1, -2), styles[e.level],
             terminal_styles[e.level])
 end)