Ticket #2163: mc-4.8.8-rotating-dash.patch

src/filemanager/cmd.c

@@ -320 +320 @@
                 data2 = mmap (0, size, PROT_READ, MAP_FILE | MAP_PRIVATE, file2, 0);
                 if (data2 != (char *) -1)
                 {
-                    rotate_dash ();
+                    rotate_dash (TRUE);
                     result = memcmp (data1, data2, size);
                     munmap (data2, size);
                 }
@@ -330 +330 @@
             /* Don't have mmap() :( Even more ugly :) */
             char buf1[BUFSIZ], buf2[BUFSIZ];
             int n1, n2;
-            rotate_dash ();
+            rotate_dash (TRUE);
             do
             {
                 while ((n1 = read (file1, buf1, BUFSIZ)) == -1 && errno == EINTR);
@@ -343 +343 @@
         }
         close (file1);
     }
+    rotate_dash (FALSE);
     return result;
 }
 

src/filemanager/dir.c

@@ -599 +599 @@
         next_free++;
 
         if ((next_free & 31) == 0)
-            rotate_dash ();
+            rotate_dash (TRUE);
     }
 
     if (next_free != 0)
@@ -608 +608 @@
   ret:
     mc_closedir (dirp);
     tree_store_end_check ();
+    rotate_dash (FALSE);
     return next_free;
 }
 
@@ -738 +739 @@
         list->list[next_free].second_sort_key = NULL;
         next_free++;
         if (!(next_free % 16))
-            rotate_dash ();
+            rotate_dash (TRUE);
     }
     mc_closedir (dirp);
     tree_store_end_check ();
@@ -748 +749 @@
         do_sort (list, sort, next_free - 1, lc_reverse, lc_case_sensitive, exec_ff);
     }
     clean_dir (&dir_copy, count);
+    rotate_dash (FALSE);
     return next_free;
 }
 

src/filemanager/file.c

@@ -828 +828 @@
     long dt;
 
     /* 1. Update rotating dash after some time */
-    rotate_dash ();
+    rotate_dash (TRUE);
 
     /* 3. Compute ETA */
     dt = (tv_current.tv_sec - tv_transfer_start.tv_sec);
@@ -1922 +1922 @@
     dst_status = DEST_FULL;     /* copy successful, don't remove target file */
 
   ret:
+    rotate_dash (FALSE);
     while (src_desc != -1 && mc_close (src_desc) < 0 && !ctx->skip_all)
     {
         temp_status = file_error (_("Cannot close source file \"%s\"\n%s"), src_path);

src/filemanager/find.c

@@ -1185 +1185 @@
 /* --------------------------------------------------------------------------------------------- */
 
 static void
-find_rotate_dash (const WDialog * h, gboolean finish)
+find_rotate_dash (const WDialog * h, gboolean show)
 {
     static const char rotating_dash[] = "|/-\\";
     static unsigned int pos = 0;
@@ -1197 +1197 @@
         pos = (pos + 1) % 4;
         tty_setcolor (h->color[DLG_COLOR_NORMAL]);
         widget_move (h, w->lines - 7, w->cols - 4);
-        tty_print_char (finish ? ' ' : rotating_dash[pos]);
+        tty_print_char (show ? rotating_dash[pos] : ' ');
         mc_refresh ();
     }
 }
@@ -1261 +1261 @@
                                                   ignore_count), ignore_count);
                             status_update (msg);
                         }
-                        find_rotate_dash (h, TRUE);
+                        find_rotate_dash (h, FALSE);
                         stop_idle (h);
                         return 0;
                     }
@@ -1360 +1360 @@
             ;
     }                           /* for */
 
-    find_rotate_dash (h, FALSE);
+    find_rotate_dash (h, TRUE);
 
     return 1;
 }
@@ -1770 +1770 @@
             next_free++;
             g_free (name);
             if (!(next_free & 15))
-                rotate_dash ();
+                rotate_dash (TRUE);
         }
 
         if (next_free)
@@ -1796 +1796 @@
     do_search (NULL);           /* force do_search to release resources */
     g_free (old_dir);
     old_dir = NULL;
+    rotate_dash (FALSE);
 
     return return_value;
 }

src/filemanager/layout.c

@@ -863 +863 @@
 /* --------------------------------------------------------------------------------------------- */
 
 void
-rotate_dash (void)
+rotate_dash (gboolean show)
 {
     static const char rotating_dash[] = "|/-\\";
     static size_t pos = 0;
@@ -871 +871 @@
     if (!nice_rotating_dash || (ok_to_refresh <= 0))
         return;
 
+    if (!show) {
+        tty_gotoyx (0, COLS - 1);
+        if (menubar_visible) {
+            tty_setcolor (MENU_INACTIVE_COLOR);
+            tty_print_char (' ');
+        } else {
+            tty_setcolor (NORMAL_COLOR);
+            tty_print_alt_char (ACS_URCORNER, FALSE);
+        }
+        mc_refresh ();
+        return;
+    }
+
     if (pos >= sizeof (rotating_dash) - 1)
         pos = 0;
     tty_gotoyx (0, COLS - 1);

src/filemanager/layout.h

@@ -79 +79 @@
 
 /* Rotating dash routines */
 void use_dash (gboolean flag);  /* Disable/Enable rotate_dash routines */
-void rotate_dash (void);
+void rotate_dash (gboolean show);
 
 #ifdef ENABLE_SUBSHELL
 gboolean do_load_prompt (void);

src/filemanager/panelize.c

@@ -368 +368 @@
         list->list[next_free].second_sort_key = NULL;
         next_free++;
         if (!(next_free & 32))
-            rotate_dash ();
+            rotate_dash (TRUE);
     }
 
     current_panel->is_panelized = TRUE;
@@ -392 +392 @@
     close_error_pipe (D_NORMAL, NULL);
     try_to_select (current_panel, NULL);
     panel_re_sort (current_panel);
+    rotate_dash (FALSE);
 }
 
 /* --------------------------------------------------------------------------------------------- */