Merge pull request #4685 from MidnightCommander/feature/fix-filename-scrolling-color

Enable filename scrolling by default and fix background color

Author: zyv

doc/man/mc.1.in

@@ -519,6 +519,9 @@ move the selection bar one page down.
 .B prev\-page, Alt\-v
 move the selection bar one page up.
 .TP
+.B Alt\-(, Alt\-)
+scroll long filenames to the right or left.
+.TP
 .B Alt\-o
 If the currently selected file is a directory, load that directory on
 the other panel and moves the selection to the next file. If the

doc/man/ru/mc.1.in

@@ -567,6 +567,9 @@ Midnight Commander\-а. Для возврата к вашему приложен
 .B PageUp, Alt\-v
 Перемещает подсветку на одну страницу вверх.
 .TP
+.B Alt\-(, Alt\-)
+Прокручивает длинные имена файлов направо или налево.
+.TP
 .B Alt\-o
 Если выделенным элементом активной панели является каталог, установить
 этот каталог текущим в неактивной панели и перейти к следующему файлу.

lib/keybind.c

@@ -225,6 +225,8 @@ static name_keymap_t command_names[] = {
     ADD_KEYMAP_NAME (SelectExt),
     ADD_KEYMAP_NAME (ScrollLeft),
     ADD_KEYMAP_NAME (ScrollRight),
+    ADD_KEYMAP_NAME (ScrollHome),
+    ADD_KEYMAP_NAME (ScrollEnd),
     ADD_KEYMAP_NAME (PanelOtherCd),
     ADD_KEYMAP_NAME (PanelOtherCdLink),
     ADD_KEYMAP_NAME (CopySingle),

lib/keybind.h

@@ -209,6 +209,8 @@ enum
     CK_SortByMTime,
     CK_ScrollLeft,
     CK_ScrollRight,
+    CK_ScrollHome,
+    CK_ScrollEnd,
     CK_CycleListingFormat,
 
     // dialog

misc/mc.default.keymap

@@ -129,8 +129,10 @@ Bottom = alt-gt; end; c1
 # SortBySize =
 # SortByMTime =
 # Filter =
-# ScrollLeft =
-# ScrollRight =
+ScrollLeft = alt-lparenthesis
+ScrollRight = alt-rparenthesis
+# ScrollHome =
+# ScrollEnd =
 
 [dialog]
 Ok = enter

misc/mc.emacs.keymap

@@ -129,8 +129,10 @@ Bottom = alt-gt; end; c1
 # SortBySize =
 # SortByMTime =
 # Filter =
-# ScrollLeft =
-# ScrollRight =
+ScrollLeft = alt-lparenthesis
+ScrollRight = alt-rparenthesis
+# ScrollHome =
+# ScrollEnd =
 
 [dialog]
 Ok = enter

misc/mc.vim.keymap

@@ -129,8 +129,10 @@ Bottom = alt-gt; end; c1
 # SortBySize =
 # SortByMTime =
 # Filter =
-# ScrollLeft =
-# ScrollRight =
+ScrollLeft = alt-lparenthesis
+ScrollRight = alt-rparenthesis
+# ScrollHome =
+# ScrollEnd =
 
 [dialog]
 Ok = enter

src/filemanager/panel.c

@@ -32,6 +32,7 @@
 
 #include <config.h>
 
+#include <limits.h>  // UINT_MAX
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -721,27 +722,25 @@ format_file (WPanel *panel, int file_index, int width, file_attr_t attr, gboolea
             if (len <= 0)
                 break;
 
-            if (!isstatus && panel->content_shift > -1 && strcmp (fi->id, "name") == 0)
+            if (!isstatus && strcmp (fi->id, "name") == 0)
             {
-                int str_len;
-                int i;
+                const int str_len = str_length (txt);
+                const unsigned int len_diff = (unsigned int) DOZ (str_len, len);
 
                 *field_length = len + 1;
 
-                str_len = str_length (txt);
-                i = MAX (0, str_len - len);
-                panel->max_shift = MAX (panel->max_shift, i);
-                i = MIN (panel->content_shift, i);
+                panel->max_shift = MAX (panel->max_shift, len_diff);
 
-                if (i > -1)
+                if (len_diff != 0)
                 {
-                    name_offset = str_offset_to_pos (txt, i);
-                    if (str_len > len)
-                    {
-                        res = FILENAME_SCROLL_LEFT;
-                        if (str_length (txt + name_offset) > len)
-                            res |= FILENAME_SCROLL_RIGHT;
-                    }
+                    const unsigned int shift = MIN (panel->content_shift, len_diff);
+
+                    if (shift != 0)
+                        res |= FILENAME_SCROLL_LEFT;
+
+                    name_offset = str_offset_to_pos (txt, shift);
+                    if (str_length (txt + name_offset) > len)
+                        res |= FILENAME_SCROLL_RIGHT;
                 }
             }
 
@@ -758,7 +757,7 @@ format_file (WPanel *panel, int file_index, int width, file_attr_t attr, gboolea
             else
                 tty_lowlevel_setcolor (-color);
 
-            if (!isstatus && panel->content_shift > -1)
+            if (!isstatus)
                 prepared_text = str_fit_to_term (txt + name_offset, len, HIDE_FIT (fi->just_mode));
             else
                 prepared_text = str_fit_to_term (txt, len, fi->just_mode);
@@ -854,18 +853,32 @@ repaint_file (WPanel *panel, int file_index, file_attr_t attr)
             }
         }
 
-        widget_gotoyx (w, ypos, offset);
-        tty_setcolor (NORMAL_COLOR);
-        tty_print_string (panel_filename_scroll_left_char);
+        const int file_color =
+            attr == FATTR_CURRENT || attr == FATTR_MARKED_CURRENT ? SELECTED_COLOR : NORMAL_COLOR;
+
+        if ((ret_frm & FILENAME_SCROLL_LEFT) != 0)
+        {
+            const int scroll_left_char_color =
+                panel->list_format == list_long ? file_color : NORMAL_COLOR;
+
+            widget_gotoyx (w, ypos, offset);
+            tty_setcolor (scroll_left_char_color);
+            tty_print_string (panel_filename_scroll_left_char);
+        }
 
         if ((ret_frm & FILENAME_SCROLL_RIGHT) != 0)
         {
             offset += width;
             if (nth_column + 1 >= panel->list_cols)
                 offset++;
 
+            const int scroll_right_char_color =
+                panel->list_format != list_long && g_slist_length (panel->format) > 2
+                ? file_color
+                : NORMAL_COLOR;
+
             widget_gotoyx (w, ypos, offset);
-            tty_setcolor (NORMAL_COLOR);
+            tty_setcolor (scroll_right_char_color);
             tty_print_string (panel_filename_scroll_right_char);
         }
     }
@@ -958,7 +971,7 @@ paint_dir (WPanel *panel)
 
     items = panel_items (panel);
     // reset max len of filename because we have the new max length for the new file list
-    panel->max_shift = -1;
+    panel->max_shift = 0;
 
     for (i = 0; i < items; i++)
     {
@@ -3194,19 +3207,16 @@ panel_select_sort_order (WPanel *panel)
 }
 
 /* --------------------------------------------------------------------------------------------- */
-
 /**
- * panel_content_scroll_left:
- * @param panel the pointer to the panel on which we operate
- *
- * scroll long filename to the left (decrement scroll pointer)
+ * Scroll long filename to left
  *
+ * @param panel object
  */
 
 static void
 panel_content_scroll_left (WPanel *panel)
 {
-    if (panel->content_shift > -1)
+    if (panel->content_shift != 0)
     {
         if (panel->content_shift > panel->max_shift)
             panel->content_shift = panel->max_shift;
@@ -3219,24 +3229,58 @@ panel_content_scroll_left (WPanel *panel)
 
 /* --------------------------------------------------------------------------------------------- */
 /**
- * panel_content_scroll_right:
- * @param panel the pointer to the panel on which we operate
- *
- * scroll long filename to the right (increment scroll pointer)
+ * Scroll long filename to right
  *
+ * @param panel object
  */
 
 static void
 panel_content_scroll_right (WPanel *panel)
 {
-    if (panel->content_shift < 0 || panel->content_shift < panel->max_shift)
+    if (panel->content_shift == 0 || panel->content_shift < panel->max_shift)
     {
         panel->content_shift++;
         show_dir (panel);
         paint_dir (panel);
     }
 }
 
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Scroll long filename to home
+ *
+ * @param panel the pointer to the panel on which we operate
+ */
+
+static void
+panel_content_scroll_home (WPanel *panel)
+{
+    panel->content_shift = 0;
+    show_dir (panel);
+    paint_dir (panel);
+}
+
+/* --------------------------------------------------------------------------------------------- */
+/**
+ * Scroll long filename to end
+ *
+ * @param panel the pointer to the panel on which we operate
+ */
+
+static void
+panel_content_scroll_end (WPanel *panel)
+{
+    // set content_shift to the maximum possible value
+    panel->content_shift = UINT_MAX;
+
+    show_dir (panel);
+    paint_dir (panel);
+
+    // correct content shift after UINT_MAX
+    if (panel->content_shift > panel->max_shift)
+        panel->content_shift = panel->max_shift;
+}
+
 /* --------------------------------------------------------------------------------------------- */
 
 static void
@@ -3621,6 +3665,12 @@ panel_execute_cmd (WPanel *panel, long command)
     case CK_ScrollRight:
         panel_content_scroll_right (panel);
         break;
+    case CK_ScrollHome:
+        panel_content_scroll_home (panel);
+        break;
+    case CK_ScrollEnd:
+        panel_content_scroll_end (panel);
+        break;
     case CK_Search:
         start_search (panel);
         break;
@@ -4380,8 +4430,8 @@ panel_clean_dir (WPanel *panel)
     panel->quick_search.active = FALSE;
     panel->is_panelized = FALSE;
     panel->dirty = TRUE;
-    panel->content_shift = -1;
-    panel->max_shift = -1;
+    panel->content_shift = 0;
+    panel->max_shift = 0;
 
     dir_list_free_list (&panel->dir);
 }
@@ -4454,8 +4504,8 @@ panel_sized_empty_new (const char *panel_name, const WRect *r)
     panel->list_cols = 1;
     panel->brief_cols = 2;
     panel->dirty = TRUE;
-    panel->content_shift = -1;
-    panel->max_shift = -1;
+    panel->content_shift = 0;
+    panel->max_shift = 0;
 
     panel->list_format = list_full;
     panel->user_format = g_strdup (DEFAULT_USER_FORMAT);

src/filemanager/panel.h

@@ -137,8 +137,8 @@ typedef struct
         int chpoint;          // Point after last characters in @ch
     } quick_search;
 
-    int content_shift;  // Number of characters of filename need to skip from left side.
-    int max_shift;      // Max shift for visible part of current panel
+    unsigned int content_shift;  // Number of characters of filename need to skip from left side
+    unsigned int max_shift;      // Max shift for visible part of current panel
 } WPanel;
 
 /*** global variables defined in .c file *********************************************************/