X-Git-Url: https://gitweb.ps.run/ps-cgit/blobdiff_plain/d6dc3aee9acadfe368864f24ea18ccd47bbb0b9b..521e10c884055c800078e6dada97ccf6c5193aad:/ui-shared.c
diff --git a/ui-shared.c b/ui-shared.c
index 8827fff..d9d5da7 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -27,7 +27,7 @@ static char *http_date(time_t t)
tm->tm_hour, tm->tm_min, tm->tm_sec);
}
-void cgit_print_error(char *msg)
+void cgit_print_error(const char *msg)
{
html("
");
html_txt(msg);
@@ -83,7 +83,7 @@ char *cgit_fileurl(const char *reponame, const char *pagename,
} else {
tmp = fmt("?url=%s/%s/%s", reponame, pagename,
(filename ? filename : ""));
- delim = "&";
+ delim = "&";
}
if (query)
tmp = fmt("%s%s%s", tmp, delim, query);
@@ -133,7 +133,7 @@ char *cgit_currurl()
return fmt("%s/", ctx.cfg.virtual_root);
}
-static void site_url(char *page, char *search, int ofs)
+static void site_url(const char *page, const char *search, const char *sort, int ofs)
{
char *delim = "?";
@@ -146,13 +146,19 @@ static void site_url(char *page, char *search, int ofs)
if (page) {
htmlf("?p=%s", page);
- delim = "&";
+ delim = "&";
}
if (search) {
html(delim);
html("q=");
html_attr(search);
- delim = "&";
+ delim = "&";
+ }
+ if (sort) {
+ html(delim);
+ html("s=");
+ html_attr(sort);
+ delim = "&";
}
if (ofs) {
html(delim);
@@ -160,8 +166,8 @@ 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, const char *sort, int ofs)
{
html("
");
html_txt(name);
html("");
}
-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, const char *sort, int ofs)
{
- site_link(NULL, name, title, class, pattern, ofs);
+ site_link(NULL, name, title, class, pattern, sort, ofs);
}
-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)
{
char *delim = "?";
@@ -240,8 +246,9 @@ static char *repolink(char *title, char *class, char *page, char *head,
return fmt("%s", delim);
}
-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)
{
char *delim;
@@ -256,47 +263,48 @@ static void reporevlink(char *page, char *name, char *title, char *class,
html("");
}
-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)
{
reporevlink(NULL, name, title, class, head, NULL, NULL);
}
-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)
{
reporevlink("tag", name, title, class, head, rev, NULL);
}
-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)
{
reporevlink("tree", name, title, class, head, rev, path);
}
-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)
{
reporevlink("plain", name, title, class, head, rev, path);
}
-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)
{
char *delim;
delim = repolink(title, class, "log", head, path);
- if (rev && strcmp(rev, ctx.qry.head)) {
+ if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_url_arg(rev);
- delim = "&";
+ delim = "&";
}
if (grep && pattern) {
html(delim);
html("qt=");
html_url_arg(grep);
- delim = "&";
+ delim = "&";
html(delim);
html("q=");
html_url_arg(pattern);
@@ -305,7 +313,7 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
html(delim);
html("ofs=");
htmlf("%d", ofs);
- delim = "&";
+ delim = "&";
}
if (showmsg) {
html(delim);
@@ -316,8 +324,9 @@ void cgit_log_link(char *name, char *title, char *class, char *head,
html("");
}
-void cgit_commit_link(char *name, char *title, char *class, char *head,
- char *rev, int toggle_ssdiff)
+void cgit_commit_link(char *name, const char *title, const char *class,
+ const char *head, const char *rev, const char *path,
+ int toggle_ssdiff)
{
if (strlen(name) > ctx.cfg.max_msg_len && ctx.cfg.max_msg_len >= 15) {
name[ctx.cfg.max_msg_len] = '\0';
@@ -328,8 +337,8 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
char *delim;
- delim = repolink(title, class, "commit", head, NULL);
- if (rev && strcmp(rev, ctx.qry.head)) {
+ delim = repolink(title, class, "commit", head, path);
+ if (rev && ctx.qry.head && strcmp(rev, ctx.qry.head)) {
html(delim);
html("id=");
html_url_arg(rev);
@@ -338,27 +347,40 @@ void cgit_commit_link(char *name, char *title, char *class, char *head,
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("");
}
-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)
{
reporevlink("refs", name, title, class, head, rev, path);
}
-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)
{
reporevlink("snapshot", name, title, class, head, rev, archivename);
}
-void cgit_diff_link(char *name, char *title, char *class, char *head,
- char *new_rev, char *old_rev, char *path,
- int toggle_ssdiff)
+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)
{
char *delim;
@@ -378,24 +400,94 @@ void cgit_diff_link(char *name, char *title, char *class, char *head,
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("");
}
-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)
{
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.sort,
+ 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(">");
+ html_txt(name);
+ html("");
+}
+
void cgit_object_link(struct object *obj)
{
char *page, *shortrev, *fullrev, *name;
@@ -405,7 +497,7 @@ void cgit_object_link(struct object *obj)
shortrev[10] = '\0';
if (obj->type == OBJ_COMMIT) {
cgit_commit_link(fmt("commit %s...", shortrev), NULL, NULL,
- ctx.qry.head, fullrev, 0);
+ ctx.qry.head, fullrev, NULL, 0);
return;
} else if (obj->type == OBJ_TREE)
page = "tree";
@@ -417,7 +509,63 @@ void cgit_object_link(struct object *obj)
reporevlink(page, name, NULL, NULL, ctx.qry.head, fullrev, NULL);
}
-void cgit_print_date(time_t secs, char *format, int local_time)
+struct string_list_item *lookup_path(struct string_list *list,
+ const char *path)
+{
+ struct string_list_item *item;
+
+ while (path && path[0]) {
+ if ((item = string_list_lookup(list, path)))
+ return item;
+ if (!(path = strchr(path, '/')))
+ break;
+ path++;
+ }
+ return NULL;
+}
+
+void cgit_submodule_link(const char *class, char *path, const char *rev)
+{
+ struct string_list *list;
+ struct string_list_item *item;
+ char tail, *dir;
+ size_t len;
+
+ tail = 0;
+ list = &ctx.repo->submodules;
+ item = lookup_path(list, path);
+ if (!item) {
+ len = strlen(path);
+ tail = path[len - 1];
+ if (tail == '/') {
+ path[len - 1] = 0;
+ item = lookup_path(list, path);
+ }
+ }
+ html("
util, rev));
+ } else if (ctx.repo->module_link) {
+ dir = strrchr(path, '/');
+ if (dir)
+ dir++;
+ else
+ dir = path;
+ html_attr(fmt(ctx.repo->module_link, dir, rev));
+ } else {
+ html("#");
+ }
+ html("'>");
+ html_txt(path);
+ html("");
+ if (item && tail)
+ path[len - 1] = tail;
+}
+
+void cgit_print_date(time_t secs, const char *format, int local_time)
{
char buf[64];
struct tm *time;
@@ -432,7 +580,7 @@ void cgit_print_date(time_t secs, char *format, int local_time)
html_txt(buf);
}
-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)
{
time_t now, secs;
@@ -488,7 +636,7 @@ void cgit_print_http_headers(struct cgit_context *ctx)
else if (ctx->page.mimetype)
htmlf("Content-Type: %s\n", ctx->page.mimetype);
if (ctx->page.size)
- htmlf("Content-Length: %ld\n", ctx->page.size);
+ htmlf("Content-Length: %zd\n", ctx->page.size);
if (ctx->page.filename)
htmlf("Content-Disposition: inline; filename=\"%s\"\n",
ctx->page.filename);
@@ -527,11 +675,11 @@ void cgit_print_docstart(struct cgit_context *ctx)
html_attr(ctx->cfg.favicon);
html("'/>\n");
}
- if (host && ctx->repo) {
+ if (host && ctx->repo && ctx->qry.head) {
html("
\n");
}
@@ -611,14 +759,15 @@ int print_archive_ref(const char *refname, const unsigned char *sha1,
return 0;
}
-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)
{
char *url;
if (!ctx.cfg.virtual_root) {
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);
}
@@ -641,32 +790,61 @@ 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;
}
static void print_header(struct cgit_context *ctx)
{
+ char *logo = NULL, *logo_link = NULL;
+
html("