fix

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

Author: jezze

Makefile

@@ -1,18 +1,40 @@
-BIN1:=navi
-OBJ1:=src/navi.o src/list.o src/parser.o src/box.o
-BIN2:=alfi
-OBJ2:=src/alfi.o src/list.o src/parser.o
+BIN_ALFI:=alfi
+OBJ_ALFI:=src/alfi.o src/list.o src/parser.o src/call.o src/pool.o
+BIN_NAVI:=navi
+OBJ_NAVI:=src/navi.o src/list.o src/parser.o src/call.o src/pool.o src/box.o src/nvg.o src/nvg_gl.o
+BIN_NAVI_RESOLVE:=navi-resolve
 
-all: $(BIN1) $(BIN2)
+all: $(BIN_ALFI) $(BIN_NAVI) $(BIN_NAVI_RESOLVE)
 
 %.o: %.c
-	$(CC) -c -o $@ -Wall -Werror -std=c89 -pedantic $^
+	@echo CC $@
+	@$(CC) -c -o $@ -Wall -Werror -Wno-misleading-indentation -pedantic $^
 
-$(BIN1): $(OBJ1)
-	$(CC) -o $@ -Wall -Werror -std=c89 -pedantic $^ -lm -lGL -lglfw -lnanovg
+$(BIN_ALFI): $(OBJ_ALFI)
+	@echo LD $@
+	@$(CC) -o $@ -Wall -Werror -pedantic $^
 
-$(BIN2): $(OBJ2)
-	$(CC) -o $@ -Wall -Werror -std=c89 -pedantic $^
+$(BIN_NAVI): $(OBJ_NAVI)
+	@echo LD $@
+	@$(CC) -o $@ -Wall -Werror -pedantic $^ -lm -lGL -lGLEW -lglfw
+
+$(BIN_NAVI_RESOLVE): src/$(BIN_NAVI_RESOLVE)
+	@echo CP $@
+	@cp $^ $@
 
 clean:
-	$(RM) $(BIN1) $(OBJ1) $(BIN2) $(OBJ2)
+	@$(RM) $(BIN_ALFI) $(OBJ_ALFI) $(BIN_NAVI) $(OBJ_NAVI) $(BIN_NAVI_RESOLVE)
+
+install:
+	mkdir -p /usr/bin
+	cp $(BIN_NAVI) /usr/bin/$(BIN_NAVI)
+	cp $(BIN_ALFI) /usr/bin/$(BIN_ALFI)
+	cp $(BIN_NAVI_RESOLVE) /usr/bin/$(BIN_NAVI_RESOLVE)
+	mkdir -p /usr/share/navi
+	cp data/icofont.ttf /usr/share/navi/icofont.ttf
+	cp data/roboto-bold.ttf /usr/share/navi/roboto-bold.ttf
+	cp data/roboto-light.ttf /usr/share/navi/roboto-light.ttf
+	cp data/roboto-regular.ttf /usr/share/navi/roboto-regular.ttf
+	cp data/image6.jpg /usr/share/navi/image6.jpg
+	cp data/example.alfi /usr/share/navi/example.alfi
+

README.md

@@ -21,8 +21,8 @@ renders widgets in OpenGL. It is currently very much under development.
 
 ## Building / Installing
 
-You need to have the glfw3 and nanovg libraries installed in order to be able to
-build NAVI. Installing these depends on your distribution of choice.
+You need to have the glfw3 libraries installed in order to build NAVI from
+soure. How you install those depends on your distribution of choice.
 
 Build:
 

example.alfi data/example.alfi

@@ -2,19 +2,25 @@
 = window label "Example window"
 
 # A header and some text
-+ header label "What a wonderful world"
-+ text label "This is some text."
++ header label "This is the title that doesn't say anything right now!"
++ text label "This is some text. It is just here so I can see if word wrapping works the way it should or if there are some troubles with it. Word wrapping was actually one of the more trickier things to solve."
 + subheader label "This is a subheader"
 + text label "Below is a form."
 
 # Basic form elements
 + field id field1 type regular label "Username"
 + field id field2 type password label "Password"
-+ select id select1 range 1 1 label "Select"
-+ choice in select1 id choice1 label "Option 1"
-+ choice in select1 id choice2 label "Option 2"
-+ choice in select1 id choice3 label "Option 3"
-+ button id submit label "Submit"
++ field id field3 type regular label "Phone" data "+46"
++ select id select1 range 1 1 label "Make a choice"
++ choice in select1 label "Choice 1-1"
++ choice in select1 label "Choice 1-2"
++ choice in select1 label "Choice 1-3"
++ select id select2 range 1 1 label "Country" data "Sweden"
++ choice in select2 label "Denmark"
++ choice in select2 label "Finland"
++ choice in select2 label "Norway"
++ choice in select2 label "Sweden"
++ button id submit label "SEND"
 
 # Two nested lists
 + list id list1
@@ -24,6 +30,9 @@
 + text in list2 label "Item 2-1"
 + text in list2 label "Item 2-2"
 
+# An anchor link to another site
++ anchor label "This is a link" link "http://www.blunder.se/" "text/alfi"
+
 # A row of images
 + hstack id gallery halign left valign top
 + image in gallery link "data/image6.jpg" "image/jpeg"
@@ -47,14 +56,14 @@
 + table id table1 grid 24 0 0 0 6 0
 + text in table1 label "Cell 0-0"
 + text in table1 label "Cell 0-1"
-+ text in table1 label "Cell 0-2"
++ text in table1 label "Cell 0-2 containing a lot of extra text"
 + text in table1 label "Cell 0-3"
 + text in table1 label "Cell 1-0"
 + text in table1 label "Cell 1-1"
 + image in table1 link "data/image6.jpg" "image/jpeg"
 + text in table1 label "Cell 1-3"
 + text in table1 label "Cell 2-0"
-+ text in table1 label "Cell 2-1"
++ text in table1
 + text in table1 label "Cell 2-2"
 + text in table1 label "Cell 2-3"
 + text in table1 label "Cell 3-0"

src/alfi.c

@@ -1,92 +1,46 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include "list.h"
 #include "box.h"
 #include "widgets.h"
 #include "parser.h"
+#include "call.h"
+#include "pool.h"
 
-#define NWIDGETS                        512
-#define STRINGTABLESIZE                 8192
-
-static struct alfi_widget widgets[NWIDGETS];
-static char strings[STRINGTABLESIZE];
 static struct parser parser;
-static struct list freelist;
-static struct list usedlist;
 
-static struct alfi_widget *nextwidget(struct list *list, struct alfi_widget *widget)
+static struct alfi_widget *parser_find(char *name, unsigned int group)
 {
 
-    struct list_item *current = (widget) ? widget->item.next : list->head;
-
-    return (current) ? current->data : 0;
+    return pool_findbyname(group, name);
 
 }
 
-static struct alfi_widget *findwidgetbyname(struct list *list, unsigned int group, char *name)
+static char *parser_createstring(unsigned int size)
 {
 
-    struct alfi_widget *widget = 0;
-
-    while ((widget = nextwidget(list, widget)))
-    {
-
-        if (widget->group != group)
-            continue;
-
-        if (!widget->id.name)
-            continue;
-
-        if (!strcmp(widget->id.name, name))
-            return widget;
-
-    }
-
-    return 0;
+    return malloc(size);
 
 }
 
-static struct alfi_widget *nextchild(struct list *list, struct alfi_widget *widget, struct alfi_widget *parent)
+static void parser_destroystring(char *string)
 {
 
-    while ((widget = nextwidget(list, widget)))
-    {
-
-        if (widget->group != parent->group)
-            continue;
-
-        if (!widget->in.name)
-            continue;
-
-        if (findwidgetbyname(list, widget->group, widget->in.name) == parent)
-            return widget;
-
-    }
-
-    return 0;
-
-}
-
-static struct alfi_widget *parser_find(char *name, unsigned int group)
-{
-
-    return findwidgetbyname(&usedlist, group, name);
+    free(string);
 
 }
 
 static struct alfi_widget *parser_create(unsigned int type, unsigned int group, char *in)
 {
 
-    struct list_item *item = list_pickhead(&freelist);
-    struct alfi_widget *widget = item->data;
+    struct alfi_widget *widget = pool_create();
 
     widget->type = type;
     widget->group = group;
     widget->in.name = in;
 
-    list_add(&usedlist, item);
-
     return widget;
 
 }
@@ -96,7 +50,7 @@ static void parser_destroy(struct alfi_widget *widget)
 
     struct alfi_widget *child = 0;
 
-    while ((child = nextchild(&usedlist, child, widget)))
+    while ((child = pool_nextchild(child, widget)))
     {
 
         parser_destroy(child);
@@ -105,7 +59,8 @@ static void parser_destroy(struct alfi_widget *widget)
 
     }
 
-    list_move(&freelist, &usedlist, &widget->item);
+    call_destroy(widget);
+    pool_destroy(widget);
 
 }
 
@@ -117,29 +72,6 @@ static void parser_fail(unsigned int line)
 
 }
 
-static void load(void)
-{
-
-    unsigned int i;
-
-    for (i = 0; i < NWIDGETS; i++)
-    {
-
-        list_inititem(&widgets[i].item, &widgets[i]);
-        list_add(&freelist, &widgets[i].item);
-
-    }
-
-    parser.string.data = strings;
-    parser.string.count = STRINGTABLESIZE;
-    parser.string.offset = 0;
-    parser.find = parser_find;
-    parser.create = parser_create;
-    parser.destroy = parser_destroy;
-    parser.fail = parser_fail;
-
-}
-
 static void loadbase(unsigned int group)
 {
 
@@ -172,18 +104,14 @@ int main(int argc, char **argv)
 {
 
     char data[4096];
+    int count;
 
-    load();
+    pool_init();
+    parser_init(&parser, parser_fail, parser_find, parser_create, parser_destroy, parser_createstring, parser_destroystring);
     loadbase(1);
 
-    parser.expr.data = data;
-    parser.expr.count = fread(data, 1, 4096, stdin);
-    parser.expr.offset = 0;
-    parser.expr.line = 0;
-    parser.expr.linebreak = 0;
-    parser.expr.inside = 0;
-
-    parse(&parser, 1, "main");
+    while ((count = read(0, data, 4096)))
+        parser_parsedata(&parser, 1, "main", count, data);
 
     return 0;