[files-panel] limit file name width

Also, fix highlight for regex with '\x'

Author: tstack

src/base/snippet_highlighters.cc

@@ -326,13 +326,27 @@ regex_highlighter(attr_line_t& al, std::optional<int> x, line_range sub)
                     alb.overlay_attr(line_range(lpc - 1, lpc + 1),
                                      VC_ROLE.value(role_t::VCR_ERROR));
                     break;
-                case '0':
                 case 'x':
                     if (safe_read(line, lpc + 1) == '{') {
                         alb.overlay_attr(line_range(lpc - 1, lpc + 1),
                                          VC_ROLE.value(role_t::VCR_RE_SPECIAL));
-                    } else if (isdigit(safe_read(line, lpc + 1))
-                               && isdigit(safe_read(line, lpc + 2)))
+                    } else if (isxdigit(safe_read(line, lpc + 1))
+                               && isxdigit(safe_read(line, lpc + 2)))
+                    {
+                        alb.overlay_attr(line_range(lpc - 1, lpc + 3),
+                                         VC_ROLE.value(role_t::VCR_RE_SPECIAL));
+                    } else {
+                        alb.overlay_attr(line_range(lpc - 1, lpc + 1),
+                                         VC_STYLE.value(text_attrs::with_styles(
+                                             text_attrs::style::bold,
+                                             text_attrs::style::reverse)));
+                        alb.overlay_attr(line_range(lpc - 1, lpc + 1),
+                                         VC_ROLE.value(role_t::VCR_ERROR));
+                    }
+                    break;
+                case '0':
+                    if (isdigit(safe_read(line, lpc + 1))
+                        && isdigit(safe_read(line, lpc + 2)))
                     {
                         alb.overlay_attr(line_range(lpc - 1, lpc + 3),
                                          VC_ROLE.value(role_t::VCR_RE_SPECIAL));

src/files_sub_source.cc

@@ -93,8 +93,6 @@ from_selection(std::optional<vis_line_t> sel_vis)
 }
 }  // namespace files_model
 
-files_sub_source::files_sub_source() {}
-
 bool
 files_sub_source::list_input_handle_key(listview_curses& lv, const ncinput& ch)
 {
@@ -261,11 +259,8 @@ files_sub_source::text_value_for_line(textview_curses& tc,
     role_t cursor_role = lnav_data.ld_mode == ln_mode_t::FILES
         ? role_t::VCR_CURSOR_LINE
         : role_t::VCR_DISABLED_CURSOR_LINE;
-    const auto dim = tc.get_dimensions();
     const auto& fc = lnav_data.ld_active_files;
-    auto filename_width
-        = std::min(fc.fc_largest_path_length,
-                   std::max((size_t) 40, (size_t) dim.second - 30));
+    auto filename_width = std::min(fc.fc_largest_path_length, (size_t) 32);
 
     this->fss_curr_line.clear();
     auto& al = this->fss_curr_line;
@@ -349,7 +344,7 @@ files_sub_source::text_value_for_line(textview_curses& tc,
     }
     al.append(" ");
     al.appendf(FMT_STRING("{:<{}}"), fn, filename_width);
-    al.append("   ");
+    al.append("  ");
     {
         auto ag = alb.with_attr(VC_ROLE.value(role_t::VCR_NUMBER));
 

src/files_sub_source.hh

@@ -31,9 +31,12 @@
 #define files_sub_source_hh
 
 #include <chrono>
+#include <map>
+#include <optional>
 #include <string>
 #include <vector>
 
+#include "base/attr_line.hh"
 #include "file_collection.hh"
 #include "plain_text_source.hh"
 #include "textview_curses.hh"
@@ -43,8 +46,6 @@ class files_sub_source
     , public list_input_delegate
     , public text_delegate {
 public:
-    files_sub_source();
-
     bool empty() const override { return false; }
 
     bool list_input_handle_key(listview_curses& lv, const ncinput& ch) override;