more

Signed-off-by: Jens Nyberg <[email protected]>

Author: jezze

Makefile

@@ -1,8 +1,8 @@
 GL:=GLES3
 BIN_ALFI:=alfi
-OBJ_ALFI:=src/alfi.o src/list.o src/parser.o src/url.o src/resource.o src/pool.o src/attribute.o src/widget.o
+OBJ_ALFI:=src/alfi.o src/list.o src/parser.o src/url.o src/resource.o src/pool.o src/attribute.o src/widget.o src/history.o
 BIN_NAVI:=navi
-OBJ_NAVI:=src/navi.o src/list.o src/parser.o src/url.o src/resource.o src/pool.o src/attribute.o src/widget.o src/view.o src/gridfmt.o src/style.o src/nvg.o src/nvg_gl.o src/fons.o src/render.o src/animation.o src/history.o
+OBJ_NAVI:=src/navi.o src/list.o src/parser.o src/url.o src/resource.o src/pool.o src/attribute.o src/widget.o src/history.o src/view.o src/gridfmt.o src/style.o src/nvg.o src/nvg_gl.o src/fons.o src/render.o src/animation.o
 BIN_NAVI_RESOLVE:=navi-resolve
 CFLAGS_GL2:=-DNVG_GL_VERSION_GL2 -DNVG_GL_GLEW
 CFLAGS_GL3:=-DNVG_GL_VERSION_GL3 -DNVG_GL_GLEW

src/history.c

@@ -4,17 +4,17 @@
 #include "url.h"
 #include "history.h"
 
-static struct urlinfo stack[32];
+static struct history stack[32];
 static unsigned int historycount;
 
-struct urlinfo *history_get(unsigned int index)
+struct history *history_get(unsigned int index)
 {
 
     return &stack[historycount - index - 1];
 
 }
 
-struct urlinfo *history_push(void)
+struct history *history_push(void)
 {
 
     if (historycount < 31)
@@ -24,7 +24,7 @@ struct urlinfo *history_push(void)
 
 }
 
-struct urlinfo *history_pop(void)
+struct history *history_pop(void)
 {
 
     if (historycount > 1)
@@ -37,7 +37,7 @@ struct urlinfo *history_pop(void)
 char *history_geturl(unsigned int index)
 {
 
-    struct urlinfo *info = history_get(index);
+    struct history *info = history_get(index);
 
     if (info)
         return info->url;

src/history.h

@@ -1,4 +1,11 @@
-struct urlinfo *history_get(unsigned int index);
-struct urlinfo *history_push(void);
-struct urlinfo *history_pop(void);
+struct history
+{
+
+    char url[URL_SIZE];
+
+};
+
+struct history *history_get(unsigned int index);
+struct history *history_push(void);
+struct history *history_pop(void);
 char *history_geturl(unsigned int index);

src/navi.c

@@ -291,13 +291,13 @@ static void loadresources_linklabel(struct attribute_link *link, struct attribut
 {
 
     struct resource resource;
-    struct urlinfo info;
+    char url[URL_SIZE];
 
     if (!strlen(link->url))
         return;
 
-    url_merge(&info, history_geturl(0), link->url);
-    attribute_link_create(link, info.url);
+    url_merge(url, history_geturl(0), link->url);
+    attribute_link_create(link, url);
     resource_init(&resource, link->url);
     resource_load(&resource, 0, 0);
 
@@ -320,13 +320,13 @@ static void loadresources_linklabel(struct attribute_link *link, struct attribut
 static void loadresources_image(struct attribute_link *link)
 {
 
-    struct urlinfo info;
+    char url[URL_SIZE];
 
     if (!strlen(link->url))
         return;
 
-    url_merge(&info, history_geturl(0), link->url);
-    attribute_link_create(link, info.url);
+    url_merge(url, history_geturl(0), link->url);
+    attribute_link_create(link, url);
     render_loadimage(link->url);
 
 }
@@ -374,16 +374,21 @@ static void urlself(char *url, unsigned int count, void *data)
     if (temp.count)
     {
 
-        struct frame *frame = pool_getframe(widget_root->index);
-        struct urlinfo *info = history_get(0);
-        struct frame keyframe;
+        parser_parse(&parser, "main", temp.count, temp.data);
+
+        if (parser.errors)
+        {
 
-        if (info)
-            url_set(info, temp.urlinfo.url);
+            urlself("navi://syntaxerror", strlen(temp.url), temp.url);
 
-        if (!parser_parse(&parser, "main", temp.count, temp.data))
+        }
+
+        else
         {
 
+            struct frame *frame = pool_getframe(widget_root->index);
+            struct frame keyframe;
+
             loadresources();
             animation_initframe(&keyframe, view.scrollx + view.padw, view.scrolly + view.padh, view.unitw * 24, 0);
             animation_step(widget_root, &keyframe, &view, 1.0);
@@ -393,19 +398,12 @@ static void urlself(char *url, unsigned int count, void *data)
 
         }
 
-        else
-        {
-
-            urlself("navi://syntaxerror", strlen(temp.urlinfo.url), temp.urlinfo.url);
-
-        }
-
     }
 
     else
     {
 
-        urlself("navi://notfound", strlen(temp.urlinfo.url), temp.urlinfo.url);
+        urlself("navi://notfound", strlen(temp.url), temp.url);
 
     }
 
@@ -429,20 +427,21 @@ static void urlblank(char *url, unsigned int count, void *data)
 static void loadself(char *url, unsigned int count, void *data)
 {
 
-    struct urlinfo info;
+    char purl[URL_SIZE];
 
-    url_merge(&info, history_geturl(0), url);
-    urlself(info.url, count, data);
+    url_merge(purl, history_geturl(0), url);
+    urlself(purl, count, data);
 
 }
 
 static void loadblank(char *url, unsigned int count, void *data)
 {
 
-    struct urlinfo *info = history_push();
+    struct history *current = history_get(0);
+    struct history *next = history_push();
 
-    url_merge(info, history_geturl(1), url);
-    urlblank(info->url, count, data);
+    url_merge(next->url, current->url, url);
+    urlblank(next->url, count, data);
 
 }
 
@@ -1052,10 +1051,10 @@ static void onbutton(GLFWwindow *window, int button, int action, int mods)
             else
             {
 
-                struct urlinfo *info = history_pop();
+                struct history *last = history_pop();
 
-                if (info)
-                    urlblank(info->url, 0, 0);
+                if (last)
+                    urlblank(last->url, 0, 0);
 
             }
 

src/parser.c

@@ -1326,7 +1326,7 @@ static void parse_command_update(struct parser *parser)
 
 }
 
-static unsigned int parse(struct parser *parser, char *in)
+static void parse(struct parser *parser, char *in)
 {
 
     while (!parser->errors && parser->expr.offset < parser->expr.count)
@@ -1369,11 +1369,9 @@ static unsigned int parse(struct parser *parser, char *in)
 
     }
 
-    return parser->errors;
-
 }
 
-unsigned int parser_parse(struct parser *parser, char *in, unsigned int count, void *data)
+void parser_parse(struct parser *parser, char *in, unsigned int count, void *data)
 {
 
     parser->errors = 0;
@@ -1385,14 +1383,13 @@ unsigned int parser_parse(struct parser *parser, char *in, unsigned int count, v
     parser->expr.inside = 0;
     parser->expr.escaped = 0;
 
-    return parse(parser, in);
+    parse(parser, in);
 
 }
 
 void parser_init(struct parser *parser, void (*fail)(void), struct widget *(*find)(char *name), struct widget *(*create)(unsigned int type, char *id, char *in), struct widget *(*destroy)(struct widget *widget), void (*clear)(struct widget *widget))
 {
 
-    parser->errors = 0;
     parser->fail = fail;
     parser->find = find;
     parser->create = create;

src/parser.h

@@ -23,5 +23,5 @@ struct parser
 
 };
 
-unsigned int parser_parse(struct parser *parser, char *in, unsigned int count, void *data);
+void parser_parse(struct parser *parser, char *in, unsigned int count, void *data);
 void parser_init(struct parser *parser, void (*fail)(void), struct widget *(*find)(char *name), struct widget *(*create)(unsigned int type, char *id, char *in), struct widget *(*destroy)(struct widget *widget), void (*clear)(struct widget *widget));

src/pool.c

@@ -134,10 +134,10 @@ struct resource *pool_resource_find(char *url)
     while ((resource = nextresource(&usedresources, resource)))
     {
 
-        if (!strlen(resource->urlinfo.url))
+        if (!strlen(resource->url))
             continue;
 
-        if (!strcmp(resource->urlinfo.url, url))
+        if (!strcmp(resource->url, url))
             return resource;
 
     }

src/render.c

@@ -487,9 +487,9 @@ void render_filltextinput(struct style *style, char *text, int offset, struct st
     for (i = 0; (current = calcline(&style->font, style->box.w, current, end, &row)); i++)
     {
 
-        int length = row.end - row.start + 1;
+        int length = row.end - row.start;
 
-        if (offset >= 0 && offset < length)
+        if (offset >= 0 && offset <= length)
         {
 
             x = rendertext(&textpaint, &scissor, &style->font, x, y, row.start, row.start + offset);

src/resource.c

@@ -5,6 +5,7 @@
 #include "list.h"
 #include "url.h"
 #include "resource.h"
+#include "history.h"
 
 static void save(struct resource *resource, unsigned int count, void *data)
 {
@@ -75,7 +76,7 @@ static unsigned int resolve(struct resource *resource, const char *name, char *
 static unsigned int _curl_match(struct resource *resource)
 {
 
-    return !strncmp(resource->urlinfo.url, "http:", 5) || !strncmp(resource->urlinfo.url, "https:", 6);
+    return !strncmp(resource->url, "http:", 5) || !strncmp(resource->url, "https:", 6);
 
 }
 
@@ -98,7 +99,7 @@ static unsigned int _curl_load(struct resource *resource, unsigned int count, vo
         q[8] = "Content-Type: application/x-www-form-urlencoded";
         q[9] = "-d";
         q[10] = data;
-        q[11] = resource->urlinfo.url;
+        q[11] = resource->url;
         q[12] = 0;
 
 
@@ -114,7 +115,7 @@ static unsigned int _curl_load(struct resource *resource, unsigned int count, vo
         q[4] = "Navi/1.0";
         q[5] = "-X";
         q[6] = "GET";
-        q[7] = resource->urlinfo.url;
+        q[7] = resource->url;
         q[8] = 0;
 
     }
@@ -126,14 +127,14 @@ static unsigned int _curl_load(struct resource *resource, unsigned int count, vo
 static unsigned int _navi_match(struct resource *resource)
 {
 
-    return !strncmp(resource->urlinfo.url, "navi:", 5);
+    return !strncmp(resource->url, "navi:", 5);
 
 }
 
 static unsigned int _navi_load(struct resource *resource, unsigned int count, void *data)
 {
 
-    char *path = resource->urlinfo.url + 7;
+    char *path = resource->url + 7;
 
     if (!strncmp(path, "blank", 5))
     {
@@ -264,10 +265,11 @@ static unsigned int _navi_load(struct resource *resource, unsigned int count, vo
     else if (!strncmp(path, "lookup", 6))
     {
 
+        struct history *current = history_get(0);
         char *urlparam = data;
 
-        url_set(&resource->urlinfo, urlparam + 4);
-
+        strcpy(resource->url, urlparam + 4);
+        strcpy(current->url, resource->url);
         resource_load(resource, 0, 0);
 
         return resource->count;
@@ -291,7 +293,7 @@ static unsigned int _external_load(struct resource *resource, unsigned int count
     char *q[4];
 
     q[0] = "navi-resolve";
-    q[1] = resource->urlinfo.url;
+    q[1] = resource->url;
     q[2] = data;
     q[3] = 0;
 
@@ -336,7 +338,7 @@ unsigned int resource_dref(struct resource *resource)
 void resource_init(struct resource *resource, char *url)
 {
 
-    url_set(&resource->urlinfo, url);
+    strcpy(resource->url, url);
 
     resource->data = 0;
     resource->size = 0;
@@ -348,7 +350,7 @@ void resource_init(struct resource *resource, char *url)
 void resource_destroy(struct resource *resource)
 {
 
-    url_unset(&resource->urlinfo);
+    strcpy(resource->url, "");
 
     resource->data = 0;
     resource->size = 0;

src/resource.h

@@ -4,7 +4,7 @@ struct resource
 {
 
     struct list_item item;
-    struct urlinfo urlinfo;
+    char url[URL_SIZE];
     void *data;
     unsigned int size;
     unsigned int count;