| -rw-r--r-- | ui-shared.c | 270 |
1 files changed, 203 insertions, 67 deletions
diff --git a/ui-shared.c b/ui-shared.c index 8a7cc32..ae29615 100644 --- a/ui-shared.c +++ b/ui-shared.c @@ -29,3 +29,3 @@ static char *http_date(time_t t) -void cgit_print_error(char *msg) +void cgit_print_error(const char *msg) { @@ -135,3 +135,3 @@ char *cgit_currurl() -static void site_url(char *page, char *search, int ofs) +static void site_url(const char *page, const char *search, int ofs) { @@ -162,4 +162,4 @@ static void site_url(char *page, char *search, int ofs) -static void site_link(char *page, char *name, char *title, char *class, - char *search, int ofs) +static void site_link(const char *page, const char *name, const char *title, + const char *class, const char *search, int ofs) { @@ -183,4 +183,4 @@ static void site_link(char *page, char *name, char *title, char *class, -void cgit_index_link(char *name, char *title, char *class, char *pattern, - int ofs) +void cgit_index_link(const char *name, const char *title, const char *class, + const char *pattern, int ofs) { @@ -189,4 +189,4 @@ void cgit_index_link(char *name, char *title, char *class, char *pattern, -static char *repolink(char *title, char *class, char *page, char *head, - char *path) +static char *repolink(const char *title, const char *class, const char *page, + const char *head, const char *path) { @@ -242,4 +242,5 @@ static char *repolink(char *title, char *class, char *page, char *head, -static void reporevlink(char *page, char *name, char *title, char *class, - char *head, char *rev, char *path) +static void reporevlink(const char *page, const char *name, const char *title, + const char *class, const char *head, const char *rev, + const char *path) { @@ -258,3 +259,4 @@ static void reporevlink(char *page, char *name, char *title, char *class, -void cgit_summary_link(char *name, char *title, char *class, char *head) +void cgit_summary_link(const char *name, const char *title, const char *class, + const char *head) { @@ -263,4 +265,4 @@ void cgit_summary_link(char *name, char *title, char *class, char *head) -void cgit_tag_link(char *name, char *title, char *class, char *head, - char *rev) +void cgit_tag_link(const char *name, const char *title, const char *class, + const char *head, const char *rev) { @@ -269,4 +271,4 @@ void cgit_tag_link(char *name, char *title, char *class, char *head, -void cgit_tree_link(char *name, char *title, char *class, char *head, - char *rev, char *path) +void cgit_tree_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path) { @@ -275,4 +277,4 @@ void cgit_tree_link(char *name, char *title, char *class, char *head, -void cgit_plain_link(char *name, char *title, char *class, char *head, - char *rev, char *path) +void cgit_plain_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path) { @@ -281,5 +283,5 @@ void cgit_plain_link(char *name, char *title, char *class, char *head, -void cgit_log_link(char *name, char *title, char *class, char *head, - char *rev, char *path, int ofs, char *grep, char *pattern, - int showmsg) +void cgit_log_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path, + int ofs, const char *grep, const char *pattern, int showmsg) { @@ -318,4 +320,5 @@ void cgit_log_link(char *name, char *title, char *class, char *head, -void cgit_commit_link(char *name, char *title, char *class, char *head, - char *rev) +void cgit_commit_link(char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path, + int toggle_ssdiff) { @@ -327,7 +330,35 @@ void cgit_commit_link(char *name, char *title, char *class, char *head, } - reporevlink("commit", name, title, class, head, rev, NULL); + + char *delim; + + delim = repolink(title, class, "commit", head, path); + if (rev && strcmp(rev, ctx.qry.head)) { + html(delim); + html("id="); + html_url_arg(rev); + delim = "&"; + } + if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { + html(delim); + html("ss=1"); + delim = "&"; + } + if (ctx.qry.context > 0 && ctx.qry.context != 3) { + html(delim); + html("context="); + htmlf("%d", ctx.qry.context); + delim = "&"; + } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; + } + html("'>"); + html_txt(name); + html("</a>"); } -void cgit_refs_link(char *name, char *title, char *class, char *head, - char *rev, char *path) +void cgit_refs_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path) { @@ -336,4 +367,5 @@ void cgit_refs_link(char *name, char *title, char *class, char *head, -void cgit_snapshot_link(char *name, char *title, char *class, char *head, - char *rev, char *archivename) +void cgit_snapshot_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, + const char *archivename) { @@ -342,4 +374,5 @@ void cgit_snapshot_link(char *name, char *title, char *class, char *head, -void cgit_diff_link(char *name, char *title, char *class, char *head, - char *new_rev, char *old_rev, char *path) +void cgit_diff_link(const char *name, const char *title, const char *class, + const char *head, const char *new_rev, const char *old_rev, + const char *path, int toggle_ssdiff) { @@ -358,2 +391,19 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, html_url_arg(old_rev); + delim = "&"; + } + if ((ctx.qry.ssdiff && !toggle_ssdiff) || (!ctx.qry.ssdiff && toggle_ssdiff)) { + html(delim); + html("ss=1"); + delim = "&"; + } + if (ctx.qry.context > 0 && ctx.qry.context != 3) { + html(delim); + html("context="); + htmlf("%d", ctx.qry.context); + delim = "&"; + } + if (ctx.qry.ignorews) { + html(delim); + html("ignorews=1"); + delim = "&"; } @@ -364,10 +414,10 @@ void cgit_diff_link(char *name, char *title, char *class, char *head, -void cgit_patch_link(char *name, char *title, char *class, char *head, - char *rev) +void cgit_patch_link(const char *name, const char *title, const char *class, + const char *head, const char *rev, const char *path) { - reporevlink("patch", name, title, class, head, rev, NULL); + reporevlink("patch", name, title, class, head, rev, path); } -void cgit_stats_link(char *name, char *title, char *class, char *head, - char *path) +void cgit_stats_link(const char *name, const char *title, const char *class, + const char *head, const char *path) { @@ -376,2 +426,60 @@ void cgit_stats_link(char *name, char *title, char *class, char *head, +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) @@ -385,3 +493,3 @@ void cgit_object_link(struct object *obj) cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL, - ctx.qry.head, fullrev); + ctx.qry.head, fullrev, NULL, 0); return; @@ -397,3 +505,3 @@ void cgit_object_link(struct object *obj) -void cgit_print_date(time_t secs, char *format, int local_time) +void cgit_print_date(time_t secs, const char *format, int local_time) { @@ -412,3 +520,3 @@ void cgit_print_date(time_t secs, char *format, int local_time) -void cgit_print_age(time_t t, time_t max_relative, char *format) +void cgit_print_age(time_t t, time_t max_relative, const char *format) { @@ -511,3 +619,3 @@ void cgit_print_docstart(struct cgit_context *ctx) html_attr(cgit_hosturl()); - html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.path, + html_attr(cgit_fileurl(ctx->repo->url, "atom", ctx->qry.vpath, fmt("h=%s", ctx->qry.head))); @@ -591,3 +699,4 @@ int print_archive_ref(const char *refname, const unsigned char *sha1, -void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) +void cgit_add_hidden_formfields(int incl_head, int incl_search, + const char *page) { @@ -597,4 +706,4 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) url = fmt("%s/%s", ctx.qry.repo, page); - if (ctx.qry.path) - url = fmt("%s/%s", url, ctx.qry.path); + if (ctx.qry.vpath) + url = fmt("%s/%s", url, ctx.qry.vpath); html_hidden("url", url); @@ -621,7 +730,26 @@ void cgit_add_hidden_formfields(int incl_head, int incl_search, char *page) -const char *fallback_cmd = "repolist"; +static const char *hc(struct cgit_context *ctx, const char *page) +{ + return strcmp(ctx->qry.page, page) ? NULL : "active"; +} -char *hc(struct cgit_cmd *cmd, const char *page) +static void cgit_print_path_crumbs(struct cgit_context *ctx, char *path) { - return (strcmp(cmd ? cmd->name : fallback_cmd, page) ? NULL : "active"); + 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; } @@ -677,7 +805,2 @@ void cgit_print_pageheader(struct cgit_context *ctx) { - struct cgit_cmd *cmd = cgit_get_cmd(ctx); - - if (!cmd && ctx->repo) - fallback_cmd = "summary"; - html("<div id='cgit'>"); @@ -688,20 +811,21 @@ void cgit_print_pageheader(struct cgit_context *ctx) if (ctx->repo) { - cgit_summary_link("summary", NULL, hc(cmd, "summary"), + cgit_summary_link("summary", NULL, hc(ctx, "summary"), ctx->qry.head); - cgit_refs_link("refs", NULL, hc(cmd, "refs"), ctx->qry.head, + cgit_refs_link("refs", NULL, hc(ctx, "refs"), ctx->qry.head, ctx->qry.sha1, NULL); - cgit_log_link("log", NULL, hc(cmd, "log"), ctx->qry.head, - NULL, NULL, 0, NULL, NULL, ctx->qry.showmsg); - cgit_tree_link("tree", NULL, hc(cmd, "tree"), ctx->qry.head, - ctx->qry.sha1, NULL); - cgit_commit_link("commit", NULL, hc(cmd, "commit"), - ctx->qry.head, ctx->qry.sha1); - cgit_diff_link("diff", NULL, hc(cmd, "diff"), ctx->qry.head, - ctx->qry.sha1, ctx->qry.sha2, NULL); + cgit_log_link("log", NULL, hc(ctx, "log"), ctx->qry.head, + NULL, ctx->qry.vpath, 0, NULL, NULL, + ctx->qry.showmsg); + cgit_tree_link("tree", NULL, hc(ctx, "tree"), ctx->qry.head, + ctx->qry.sha1, ctx->qry.vpath); + cgit_commit_link("commit", NULL, hc(ctx, "commit"), + ctx->qry.head, ctx->qry.sha1, ctx->qry.vpath, 0); + cgit_diff_link("diff", NULL, hc(ctx, "diff"), ctx->qry.head, + ctx->qry.sha1, ctx->qry.sha2, ctx->qry.vpath, 0); if (ctx->repo->max_stats) - cgit_stats_link("stats", NULL, hc(cmd, "stats"), - ctx->qry.head, NULL); + cgit_stats_link("stats", NULL, hc(ctx, "stats"), + ctx->qry.head, ctx->qry.vpath); if (ctx->repo->readme) reporevlink("about", "about", NULL, - hc(cmd, "about"), ctx->qry.head, NULL, + hc(ctx, "about"), ctx->qry.head, NULL, NULL); @@ -711,3 +835,3 @@ void cgit_print_pageheader(struct cgit_context *ctx) html_url_path(cgit_fileurl(ctx->qry.repo, "log", - ctx->qry.path, NULL)); + ctx->qry.vpath, NULL)); html("'>\n"); @@ -718,2 +842,3 @@ void cgit_print_pageheader(struct cgit_context *ctx) html_option("committer", "committer", ctx->qry.grep); + html_option("range", "range", ctx->qry.grep); html("</select>\n"); @@ -725,5 +850,5 @@ void cgit_print_pageheader(struct cgit_context *ctx) } else { - site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0); + site_link(NULL, "index", NULL, hc(ctx, "repolist"), NULL, 0); if (ctx->cfg.root_readme) - site_link("about", "about", NULL, hc(cmd, "about"), + site_link("about", "about", NULL, hc(ctx, "about"), NULL, 0); @@ -740,2 +865,8 @@ void cgit_print_pageheader(struct cgit_context *ctx) html("</td></tr></table>\n"); + if (ctx->qry.vpath) { + html("<div class='path'>"); + html("path: "); + cgit_print_path_crumbs(ctx, ctx->qry.vpath); + html("</div>"); + } html("<div class='content'>"); @@ -762,4 +893,10 @@ void cgit_print_snapshot_links(const char *repo, const char *head, const struct cgit_snapshot_format* f; + char *prefix; char *filename; + unsigned char sha1[20]; + if (get_sha1(fmt("refs/tags/%s", hex), sha1) == 0 && + (hex[0] == 'v' || hex[0] == 'V') && isdigit(hex[1])) + hex++; + prefix = xstrdup(fmt("%s-%s", cgit_repobasename(repo), hex)); for (f = cgit_snapshot_formats; f->suffix; f++) { @@ -767,4 +904,3 @@ void cgit_print_snapshot_links(const char *repo, const char *head, continue; - filename = fmt("%s-%s%s", cgit_repobasename(repo), hex, - f->suffix); + filename = fmt("%s%s", prefix, f->suffix); cgit_snapshot_link(filename, NULL, NULL, NULL, NULL, filename); |