Add a favicon option to cgitrc

[ps-cgit] / ui-tree.c

diff --git a/ui-tree.c b/ui-tree.c
index ef44d6145a82635ad8bc7112232d94014ca78c1a..5a2dd3f2946e3b5a2783744be144eb4628da8131 100644 (file)
--- a/ui-tree.c
+++ b/ui-tree.c
@@ -7,6 +7,8 @@
  */
 
 #include "cgit.h"
  */
 
 #include "cgit.h"

+#include "html.h"
+#include "ui-shared.h"

 
 char *curr_rev;
 char *match_path;
 
 char *curr_rev;
 char *match_path;


@@ -15,8 +17,9 @@ int header = 0;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;
 static void print_object(const unsigned char *sha1, char *path)
 {
        enum object_type type;

-       unsigned char *buf;
+       char *buf;

        unsigned long size, lineno, start, idx;
        unsigned long size, lineno, start, idx;

+       const char *linefmt = "<tr><td class='no'><a id='n%1$d' name='n%1$d' href='#n%1$d'>%1$d</a></td><td class='txt'>";

 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {
 
        type = sha1_object_info(sha1, &size);
        if (type == OBJ_BAD) {


@@ -33,24 +36,27 @@ static void print_object(const unsigned char *sha1, char *path)
        }
 
        html(" blob: <a href='");
        }
 
        html(" blob: <a href='");

-       html_attr(cgit_pageurl(cgit_query_repo, "blob", fmt("id=%s", sha1_to_hex(sha1))));
+       html_attr(cgit_pageurl(ctx.qry.repo, "blob",
+                              fmt("id=%s&path=%s", sha1_to_hex(sha1), path)));

        htmlf("'>%s</a>",sha1_to_hex(sha1));
 
        htmlf("'>%s</a>",sha1_to_hex(sha1));
 

-       html("<table class='blob'>\n");
+       html("<table summary='blob content' class='blob'>\n");

        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';
        idx = 0;
        start = 0;
        lineno = 0;
        while(idx < size) {
                if (buf[idx] == '\n') {
                        buf[idx] = '\0';

-                       htmlf("<tr><td class='no'><a name='%1$d'>%1$d</a></td><td class='txt'>",
-                             ++lineno);
+                       htmlf(linefmt, ++lineno);

                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }
                        html_txt(buf + start);
                        html("</td></tr>\n");
                        start = idx + 1;
                }
                idx++;
        }

+       htmlf(linefmt, ++lineno);
+       html_txt(buf + start);
+       html("</td></tr>\n");

        html("</table>\n");
 }
 
        html("</table>\n");
 }
 


@@ -64,40 +70,42 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
        unsigned long size = 0;
 
        name = xstrdup(pathname);
        unsigned long size = 0;
 
        name = xstrdup(pathname);

-       fullpath = fmt("%s%s%s", cgit_query_path ? cgit_query_path : "",
-                      cgit_query_path ? "/" : "", name);
+       fullpath = fmt("%s%s%s", ctx.qry.path ? ctx.qry.path : "",
+                      ctx.qry.path ? "/" : "", name);

 
 

-       type = sha1_object_info(sha1, &size);
-       if (type == OBJ_BAD && !S_ISGITLINK(mode)) {
-               htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
-                     name,
-                     sha1_to_hex(sha1));
-               return 0;
+       if (!S_ISGITLINK(mode)) {
+               type = sha1_object_info(sha1, &size);
+               if (type == OBJ_BAD) {
+                       htmlf("<tr><td colspan='3'>Bad object: %s %s</td></tr>",
+                             name,
+                             sha1_to_hex(sha1));
+                       return 0;
+               }

        }
 
        html("<tr><td class='ls-mode'>");
        }
 
        html("<tr><td class='ls-mode'>");

-       html_filemode(mode);
+       cgit_print_filemode(mode);

        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");
        html("</td><td>");
        if (S_ISGITLINK(mode)) {
                htmlf("<a class='ls-mod' href='");

-               html_attr(fmt(cgit_repo->module_link,
+               html_attr(fmt(ctx.repo->module_link,

                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {
                              name,
                              sha1_to_hex(sha1)));
                html("'>");
                html_txt(name);
                html("</a>");
        } else if (S_ISDIR(mode)) {

-               cgit_tree_link(name, NULL, "ls-dir", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-dir", ctx.qry.head,

                               curr_rev, fullpath);
        } else {
                               curr_rev, fullpath);
        } else {

-               cgit_tree_link(name, NULL, "ls-blob", cgit_query_head,
+               cgit_tree_link(name, NULL, "ls-blob", ctx.qry.head,

                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");
                               curr_rev, fullpath);
        }
        htmlf("</td><td class='ls-size'>%li</td>", size);
 
        html("<td>");

-       cgit_log_link("log", NULL, "button", cgit_query_head, curr_rev,
-                     fullpath, 0);
+       cgit_log_link("log", NULL, "button", ctx.qry.head, curr_rev,
+                     fullpath, 0, NULL, NULL);

        html("</td></tr>\n");
        free(name);
        return 0;
        html("</td></tr>\n");
        free(name);
        return 0;


@@ -105,7 +113,7 @@ static int ls_item(const unsigned char *sha1, const char *base, int baselen,
 
 static void ls_head()
 {
 
 static void ls_head()
 {

-       html("<table class='list'>\n");
+       html("<table summary='tree listing' class='list'>\n");

        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");
        html("<tr class='nohover'>");
        html("<th class='left'>Mode</th>");
        html("<th class='left'>Name</th>");


@@ -150,10 +158,10 @@ static int walk_tree(const unsigned char *sha1, const char *base, int baselen,
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);
        if (state == 0) {
                memcpy(buffer, base, baselen);
                strcpy(buffer+baselen, pathname);

-               url = cgit_pageurl(cgit_query_repo, "tree",
+               url = cgit_pageurl(ctx.qry.repo, "tree",

                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");
                                   fmt("h=%s&amp;path=%s", curr_rev, buffer));
                html("/");

-               cgit_tree_link(xstrdup(pathname), NULL, NULL, cgit_query_head,
+               cgit_tree_link(xstrdup(pathname), NULL, NULL, ctx.qry.head,

                               curr_rev, buffer);
 
                if (strcmp(match_path, buffer))
                               curr_rev, buffer);
 
                if (strcmp(match_path, buffer))


@@ -185,7 +193,7 @@ void cgit_print_tree(const char *rev, char *path)
        const char *paths[] = {path, NULL};
 
        if (!rev)
        const char *paths[] = {path, NULL};
 
        if (!rev)

-               rev = cgit_query_head;
+               rev = ctx.qry.head;

 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {
 
        curr_rev = xstrdup(rev);
        if (get_sha1(rev, sha1)) {


@@ -199,7 +207,7 @@ void cgit_print_tree(const char *rev, char *path)
        }
 
        html("path: <a href='");
        }
 
        html("path: <a href='");

-       html_attr(cgit_pageurl(cgit_query_repo, "tree", fmt("h=%s", rev)));
+       html_attr(cgit_pageurl(ctx.qry.repo, "tree", fmt("h=%s", rev)));

        html("'>root</a>");
 
        if (path == NULL) {
        html("'>root</a>");
 
        if (path == NULL) {