ui-shared: Teach "breadcrumb" navigation to path limit display beneath tab bar

When a path limit is in effect, and displayed directly beneath the tab bar,
it should offer breadcrumb navigation (like what the 'tree' page does), to
allow changing the path limit easily.

Implementing this requires a robust way to link back to the current page with
a changed ctx->qry.path, but without losing track of the other query
arguments. This is solved by adding the new cgit_self_link() function, which
is then invoked repeatedly by the new cgit_print_path_crumbs() function while
manipulating ctx->qry.path.

Signed-off-by: Johan Herland <johan@herland.net>
Signed-off-by: Lars Hjemli <hjemli@gmail.com>

1 files changed, 80 insertions, 1 deletions

diff --git a/ui-shared.c b/ui-shared.c
index bc14e70..4fa506f 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -390,24 +390,82 @@ void cgit_diff_link(const char *name, const char *title, const char *class,
 void cgit_patch_link(const char *name, const char *title, const char *class,
                      const char *head, const char *rev)
 {
         reporevlink("patch", name, title, class, head, rev, NULL);
 }
 
 void cgit_stats_link(const char *name, const char *title, const char *class,
                      const char *head, const char *path)
 {
         reporevlink("stats", name, title, class, head, NULL, path);
 }
 
+void cgit_self_link(char *name, const char *title, const char *class,
+                    struct cgit_context *ctx)
+{
+        if (!strcmp(ctx->qry.page, "repolist"))
+                return cgit_index_link(name, title, class, ctx->qry.search,
+                                       ctx->qry.ofs);
+        else if (!strcmp(ctx->qry.page, "summary"))
+                return cgit_summary_link(name, title, class, ctx->qry.head);
+        else if (!strcmp(ctx->qry.page, "tag"))
+                return cgit_tag_link(name, title, class, ctx->qry.head,
+                                     ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL);
+        else if (!strcmp(ctx->qry.page, "tree"))
+                return cgit_tree_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "plain"))
+                return cgit_plain_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "log"))
+                return cgit_log_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path, ctx->qry.ofs,
+                                      ctx->qry.grep, ctx->qry.search,
+                                      ctx->qry.showmsg);
+        else if (!strcmp(ctx->qry.page, "commit"))
+                return cgit_commit_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path, 0);
+        else if (!strcmp(ctx->qry.page, "patch"))
+                return cgit_patch_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "refs"))
+                return cgit_refs_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "snapshot"))
+                return cgit_snapshot_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.has_sha1 ? ctx->qry.sha1 : NULL,
+                                      ctx->qry.path);
+        else if (!strcmp(ctx->qry.page, "diff"))
+                return cgit_diff_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.sha1, ctx->qry.sha2,
+                                      ctx->qry.path, 0);
+        else if (!strcmp(ctx->qry.page, "stats"))
+                return cgit_stats_link(name, title, class, ctx->qry.head,
+                                      ctx->qry.path);
+
+        /* Don't known how to make link for this page */
+        repolink(title, class, ctx->qry.page, ctx->qry.head, ctx->qry.path);
+        html("><!-- cgit_self_link() doesn't know how to make link for page '");
+        html_txt(ctx->qry.page);
+        html("' -->");
+        html_txt(name);
+        html("</a>");
+}
+
 void cgit_object_link(struct object *obj)
 {
         char *page, *shortrev, *fullrev, *name;
 
         fullrev = sha1_to_hex(obj->sha1);
         shortrev = xstrdup(fullrev);
         shortrev[10] = '\0';
         if (obj->type == OBJ_COMMIT) {
                 cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
                                  ctx.qry.head, fullrev, 0);
                 return;
         } else if (obj->type == OBJ_TREE)
@@ -641,24 +699,45 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search,
                 if (ctx.qry.grep)
                         html_hidden("qt", ctx.qry.grep);
                 if (ctx.qry.search)
                         html_hidden("q", ctx.qry.search);
         }
 }
 
 static const char *hc(struct cgit_context *ctx, const char *page)
 {
         return strcmp(ctx->qry.page, page) ? NULL : "active";
 }
 
+static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path)
+{
+        char *old_path = ctx->qry.path;
+        char *p = path, *q, *end = path + strlen(path);
+
+        ctx->qry.path = NULL;
+        cgit_self_link("root", NULL, NULL, ctx);
+        ctx->qry.path = p = path;
+        while (p < end) {
+                if (!(q = strchr(p, '/')))
+                        q = end;
+                *q = '\0';
+                html_txt("/");
+                cgit_self_link(p, NULL, NULL, ctx);
+                if (q < end)
+                        *q = '/';
+                p = q + 1;
+        }
+        ctx->qry.path = old_path;
+}
+
 static void print_header(struct cgit_context *ctx)
 {
         html("<table id='header'>\n");
         html("<tr>\n");
 
         if (ctx->cfg.logo && ctx->cfg.logo[0] != 0) {
                 html("<td class='logo' rowspan='2'><a href='");
                 if (ctx->cfg.logo_link)
                         html_attr(ctx->cfg.logo_link);
                 else
                         html_attr(cgit_rooturl());
                 html("'><img src='");
@@ -751,25 +830,25 @@ void cgit_print_pageheader(struct cgit_context *ctx)
                 html_attr(cgit_rooturl());
                 html("'>\n");
                 html("<input type='text' name='q' size='10' value='");
                 html_attr(ctx->qry.search);
                 html("'/>\n");
                 html("<input type='submit' value='search'/>\n");
                 html("</form>");
         }
         html("</td></tr></table>\n");
         if (ctx->qry.vpath) {
                 html("<div class='path'>");
                 html("path: ");
-                html_txt(ctx->qry.vpath);
+                cgit_print_path_crumbs(ctx, ctx->qry.vpath);
                 html("</div>");
         }
         html("<div class='content'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
         if (S_ISDIR(mode))
                 html("d");
         else if (S_ISLNK(mode))
                 html("l");
         else if (S_ISGITLINK(mode))