X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=sidebar.c;h=e1bec5df1785696fb95bca3ffd54da31f2d545e5;hp=49555d50eec05e87d0f7d99bc83030175a849e17;hb=c30879afd71ee24e706b6d8c7b7916f36407e937;hpb=46cc2f0fc3459400d3c7d4dad7a1fbb952cadd46

diff --git a/sidebar.c b/sidebar.c
index 49555d5..e1bec5d 100644
--- a/sidebar.c
+++ b/sidebar.c
@@ -77,6 +77,36 @@ void calc_boundaries (int menu)
 	}
 }
 
+static char * shortened_hierarchy(char * box) {
+  int dots = 0;
+  char * last_dot;
+  int i,j;
+  char * new_box;
+  for (i=0;i<strlen(box);++i)
+    if (box[i] == '.') ++dots;
+  last_dot = strrchr(box,'.');
+  if (last_dot) {
+    ++last_dot;
+    new_box = safe_malloc(strlen(last_dot)+2*dots+1);
+    new_box[0] = box[0];
+    for (i=1,j=1;i<strlen(box);++i) {
+      if (box[i] == '.') {
+        new_box[j++] = '.';
+        new_box[j] = 0;
+        if (&box[i+1] != last_dot) {
+          new_box[j++] = box[i+1];
+          new_box[j] = 0;
+        } else {
+          strcat(&new_box[j],last_dot);
+          break;
+        }
+      }
+    }
+    return new_box;
+  }
+  return safe_strdup(box);
+}
+
 char *make_sidebar_entry(char *box, int size, int new)
 {
 	static char *entry = 0;
@@ -94,6 +124,9 @@ char *make_sidebar_entry(char *box, int size, int new)
     }
   }
 #endif
+  if (option(OPTSHORTENHIERARCHY)) {
+    box = shortened_hierarchy(box);
+  }
 	i = strlen(box);
 	strncpy( entry, box, i < SidebarWidth ? i :SidebarWidth );
 
@@ -103,6 +136,9 @@ char *make_sidebar_entry(char *box, int size, int new)
 			"% d(%d)", size, new);
 	else
 		sprintf( entry + SidebarWidth - 3 - quick_log10(size), "% d", size);
+  if (option(OPTSHORTENHIERARCHY)) {
+    free(box);
+  }
 	return entry;
 }