Add cgit_index_link() function with support for offset

This function will be used to build a pager in ui-repolist.

Signed-off-by: Lars Hjemli <hjemli@gmail.com>

2 files changed, 19 insertions, 5 deletions

diff --git a/ui-shared.c b/ui-shared.c
index d08ede9..f366354 100644
--- a/ui-shared.c
+++ b/ui-shared.c
@@ -101,75 +101,86 @@ const char *cgit_repobasename(const char *reponame)
 		return ++rv;
 	return rvbuf;
 }
 
 char *cgit_currurl()
 {
 	if (!ctx.cfg.virtual_root)
 		return ctx.cfg.script_name;
 	else if (ctx.qry.page)
 		return fmt("%s/%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo, ctx.qry.page);
 	else if (ctx.qry.repo)
 		return fmt("%s/%s/", ctx.cfg.virtual_root, ctx.qry.repo);
 	else
 		return fmt("%s/", ctx.cfg.virtual_root);
 }
 
-static void site_url(char *page, char *search)
+static void site_url(char *page, char *search, int ofs)
 {
 	char *delim = "?";
 
 	if (ctx.cfg.virtual_root) {
 		html_attr(ctx.cfg.virtual_root);
 		if (ctx.cfg.virtual_root[strlen(ctx.cfg.virtual_root) - 1] != '/')
 			html("/");
 	} else
 		html(ctx.cfg.script_name);
 
 	if (page) {
 		htmlf("?p=%s", page);
 		delim = "&";
 	}
 	if (search) {
 		html(delim);
 		html("q=");
 		html_attr(search);
+		delim = "&";
+	}
+	if (ofs) {
+		html(delim);
+		htmlf("ofs=%d", ofs);
 	}
 }
 
 static void site_link(char *page, char *name, char *title, char *class,
-		       char *search)
+		      char *search, int ofs)
 {
 	html("<a");
 	if (title) {
 		html(" title='");
 		html_attr(title);
 		html("'");
 	}
 	if (class) {
 		html(" class='");
 		html_attr(class);
 		html("'");
 	}
 	html(" href='");
-	site_url(page, search);
+	site_url(page, search, ofs);
 	html("'>");
 	html_txt(name);
 	html("</a>");
 }
 
+void cgit_index_link(char *name, char *title, char *class, char *pattern,
+		     int ofs)
+{
+	site_link(NULL, name, title, class, pattern, ofs);
+}
+
 static char *repolink(char *title, char *class, char *page, char *head,
 		      char *path)
 {
 	char *delim = "?";
 
 	html("<a");
 	if (title) {
 		html(" title='");
 		html_attr(title);
 		html("'");
 	}
 	if (class) {
 		html(" class='");
 		html_attr(class);
 		html("'");
 	}
@@ -583,35 +594,36 @@ void cgit_print_pageheader(struct cgit_context *ctx)
 		if (ctx->cfg.virtual_root)
 			html_attr(cgit_fileurl(ctx->qry.repo, "log",
 					       ctx->qry.path, NULL));
 		html("'>\n");
 		add_hidden_formfields(1, 0, "log");
 		html("<select name='qt'>\n");
 		html_option("grep", "log msg", ctx->qry.grep);
 		html_option("author", "author", ctx->qry.grep);
 		html_option("committer", "committer", ctx->qry.grep);
 		html("</select>\n");
 		html("<input class='txt' type='text' size='10' name='q' value='");
 		html_attr(ctx->qry.search);
 		html("'/>\n");
 		html("<input type='submit' value='search'/>\n");
 		html("</form>\n");
 	} else {
-		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL);
+		site_link(NULL, "index", NULL, hc(cmd, "repolist"), NULL, 0);
 		if (ctx->cfg.root_readme)
-			site_link("about", "about", NULL, hc(cmd, "about"), NULL);
+			site_link("about", "about", NULL, hc(cmd, "about"),
+				  NULL, 0);
 		html("</td><td class='form'>");
 		html("<form method='get' action='");
 		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");
 	html("<div class='content'>");
 }
 
 void cgit_print_filemode(unsigned short mode)
 {
diff --git a/ui-shared.h b/ui-shared.h
index 76c2b1f..3005d30 100644
--- a/ui-shared.h
+++ b/ui-shared.h
@@ -1,25 +1,27 @@
 #ifndef UI_SHARED_H
 #define UI_SHARED_H
 
 extern char *cgit_repourl(const char *reponame);
 extern char *cgit_fileurl(const char *reponame, const char *pagename,
 			  const char *filename, const char *query);
 extern char *cgit_pageurl(const char *reponame, const char *pagename,
 			  const char *query);
 
+extern void cgit_index_link(char *name, char *title, char *class,
+			    char *pattern, int ofs);
 extern void cgit_tree_link(char *name, char *title, char *class, char *head,
 			   char *rev, char *path);
 extern void cgit_log_link(char *name, char *title, char *class, char *head,
 			  char *rev, char *path, int ofs, char *grep,
 			  char *pattern);
 extern void cgit_commit_link(char *name, char *title, char *class, char *head,
 			     char *rev);
 extern void cgit_patch_link(char *name, char *title, char *class, char *head,
 			    char *rev);
 extern void cgit_refs_link(char *name, char *title, char *class, char *head,
 			   char *rev, char *path);
 extern void cgit_snapshot_link(char *name, char *title, char *class,
 			       char *head, char *rev, char *archivename);
 extern void cgit_diff_link(char *name, char *title, char *class, char *head,
 			   char *new_rev, char *old_rev, char *path);
 extern void cgit_object_link(struct object *obj);