9 files changed, 289 insertions, 5 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 789e32f9..2018c4c1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,6 +61,8 @@ set (SOURCES
     src/gmutil.h
     src/history.c
     src/history.h
+    src/lookup.c
+    src/lookup.h
     src/stb_image.h
     src/stb_truetype.h
     src/visited.c
@@ -74,6 +76,8 @@ set (SOURCES
     src/ui/documentwidget.h
     src/ui/listwidget.c
     src/ui/listwidget.h
+    src/ui/lookupwidget.c
+    src/ui/lookupwidget.h
     src/ui/metrics.c
     src/ui/metrics.h
     src/ui/paint.c
diff --git a/src/history.c b/src/history.c
index 6e985903..63fa1104 100644
--- a/src/history.c
+++ b/src/history.c
@@ -24,6 +24,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "app.h"
 
 #include <the_Foundation/file.h>
+#include <the_Foundation/mutex.h>
 #include <the_Foundation/path.h>
 
 static const size_t maxStack_History_ = 50; /* back/forward navigable items */
@@ -52,6 +53,7 @@ iRecentUrl *copy_RecentUrl(const iRecentUrl *d) {
 /*----------------------------------------------------------------------------------------------*/
 
 struct Impl_History {
+    iMutex *mtx;
     iArray recent;    /* TODO: should be specific to a DocumentWidget */
     size_t recentPos; /* zero at the latest item */
 };
@@ -59,6 +61,7 @@ struct Impl_History {
 iDefineTypeConstruction(History)
 
 void init_History(iHistory *d) {
+    d->mtx = new_Mutex();
     init_Array(&d->recent, sizeof(iRecentUrl));
     d->recentPos = 0;
 }
@@ -66,18 +69,22 @@ void init_History(iHistory *d) {
 void deinit_History(iHistory *d) {
     clear_History(d);
     deinit_Array(&d->recent);
+    delete_Mutex(d->mtx);
 }
 
 iHistory *copy_History(const iHistory *d) {
+    lock_Mutex(d->mtx);
     iHistory *copy = new_History();
     iConstForEach(Array, i, &d->recent) {
         pushBack_Array(&copy->recent, copy_RecentUrl(i.value));
     }
     copy->recentPos = d->recentPos;
+    unlock_Mutex(d->mtx);
     return copy;
 }
 
 void serialize_History(const iHistory *d, iStream *outs) {
+    lock_Mutex(d->mtx);
     writeU16_Stream(outs, d->recentPos);
     writeU16_Stream(outs, size_Array(&d->recent));
     iConstForEach(Array, i, &d->recent) {
@@ -92,10 +99,12 @@ void serialize_History(const iHistory *d, iStream *outs) {
             write8_Stream(outs, 0);
         }
     }
+    unlock_Mutex(d->mtx);
 }
 
 void deserialize_History(iHistory *d, iStream *ins) {
     clear_History(d);
+    lock_Mutex(d->mtx);
     d->recentPos = readU16_Stream(ins);
     size_t count = readU16_Stream(ins);
     while (count--) {
@@ -109,13 +118,16 @@ void deserialize_History(iHistory *d, iStream *ins) {
         }
         pushBack_Array(&d->recent, &item);
     }
+    unlock_Mutex(d->mtx);
 }
 
 void clear_History(iHistory *d) {
+    lock_Mutex(d->mtx);
     iForEach(Array, s, &d->recent) {
         deinit_RecentUrl(s.value);
     }
     clear_Array(&d->recent);
+    unlock_Mutex(d->mtx);
 }
 
 iRecentUrl *recentUrl_History(iHistory *d, size_t pos) {
@@ -145,23 +157,29 @@ const iString *url_History(const iHistory *d, size_t pos) {
 }
 
 iRecentUrl *findUrl_History(iHistory *d, const iString *url) {
+    lock_Mutex(d->mtx);
     iReverseForEach(Array, i, &d->recent) {
         if (cmpStringCase_String(url, &((iRecentUrl *) i.value)->url) == 0) {
+            unlock_Mutex(d->mtx);
             return i.value;
         }
     }
+    unlock_Mutex(d->mtx);
     return NULL;
 }
 
 void replace_History(iHistory *d, const iString *url) {
+    lock_Mutex(d->mtx);
     /* Update in the history. */
     iRecentUrl *item = mostRecentUrl_History(d);
     if (item) {
         set_String(&item->url, url);
     }
+    unlock_Mutex(d->mtx);
 }
 
 void add_History(iHistory *d, const iString *url ){
+    lock_Mutex(d->mtx);
     /* Cut the trailing history items. */
     if (d->recentPos > 0) {
         for (size_t i = 0; i < d->recentPos - 1; i++) {
@@ -183,27 +201,34 @@ void add_History(iHistory *d, const iString *url ){
             remove_Array(&d->recent, 0);
         }
     }
+    unlock_Mutex(d->mtx);
 }
 
 iBool goBack_History(iHistory *d) {
+    lock_Mutex(d->mtx);
     if (d->recentPos < size_Array(&d->recent) - 1) {
         d->recentPos++;
         postCommandf_App("open history:1 scroll:%f url:%s",
                          mostRecentUrl_History(d)->normScrollY,
                          cstr_String(url_History(d, d->recentPos)));
+        unlock_Mutex(d->mtx);
         return iTrue;
     }
+    unlock_Mutex(d->mtx);
     return iFalse;
 }
 
 iBool goForward_History(iHistory *d) {
+    lock_Mutex(d->mtx);
     if (d->recentPos > 0) {
         d->recentPos--;
         postCommandf_App("open history:1 scroll:%f url:%s",
                          mostRecentUrl_History(d)->normScrollY,
                          cstr_String(url_History(d, d->recentPos)));
+        unlock_Mutex(d->mtx);
         return iTrue;
     }
+    unlock_Mutex(d->mtx);
     return iFalse;
 }
 
@@ -213,6 +238,7 @@ const iGmResponse *cachedResponse_History(const iHistory *d) {
 }
 
 void setCachedResponse_History(iHistory *d, const iGmResponse *response) {
+    lock_Mutex(d->mtx);
     iRecentUrl *item = mostRecentUrl_History(d);
     if (item) {
         delete_GmResponse(item->cachedResponse);
@@ -221,4 +247,5 @@ void setCachedResponse_History(iHistory *d, const iGmResponse *response) {
             item->cachedResponse = copy_GmResponse(response);
         }
     }
+    unlock_Mutex(d->mtx);
 }
diff --git a/src/lookup.c b/src/lookup.c
new file mode 100644
index 00000000..4f00a66a
--- /dev/null
+++ b/src/lookup.c
@@ -0,0 +1,39 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "lookup.h"
+
+iDefineTypeConstruction(LookupResult)
+
+void init_LookupResult(iLookupResult *d) {
+    d->type = none_LookupResultType;
+    init_String(&d->label);
+    init_String(&d->url);
+    init_String(&d->meta);
+    iZap(d->when);
+}
+
+void deinit_LookupResult(iLookupResult *d) {
+    deinit_String(&d->meta);
+    deinit_String(&d->url);
+    deinit_String(&d->label);
+}
diff --git a/src/lookup.h b/src/lookup.h
new file mode 100644
index 00000000..ecbe0036
--- /dev/null
+++ b/src/lookup.h
@@ -0,0 +1,46 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include <the_Foundation/string.h>
+#include <the_Foundation/time.h>
+
+iDeclareType(LookupResult)
+    
+enum iLookupResultType {
+    none_LookupResultType,
+    bookmark_LookupResultType,
+    history_LookupResultType, /* visited URLs */
+    content_LookupResultType, /* one of the pages in history, including current page */
+    identity_LookupResultType,
+};
+
+struct Impl_LookupResult {
+    enum iLookupResultType type;
+    iString label;
+    iString url;
+    iString meta;
+    iTime when;
+};
+
+iDeclareTypeConstruction(LookupResult)
diff --git a/src/ui/listwidget.c b/src/ui/listwidget.c
index 64e509ef..3c061bdc 100644
--- a/src/ui/listwidget.c
+++ b/src/ui/listwidget.c
@@ -62,7 +62,6 @@ struct Impl_ListWidget {
     SDL_Texture *visBuffer[2];
     int visBufferIndex;
     int visBufferScrollY;
-//    iBool visBufferValid;
     enum iBufferValidity visBufferValid;
 };
 
@@ -70,6 +69,7 @@ void init_ListWidget(iListWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
     setId_Widget(w, "list");
+    setBackgroundColor_Widget(w, uiBackground_ColorId); /* needed for filling visbuffer */
     setFlags_Widget(w, hover_WidgetFlag, iTrue);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
     setThumb_ScrollWidget(d->scroll, 0, 0);
@@ -150,7 +150,6 @@ int scrollPos_ListWidget(const iListWidget *d) {
 void setScrollPos_ListWidget(iListWidget *d, int pos) {
     d->scrollY = pos;
     d->hoverItem = iInvalidPos;
-//    invalidate_ListWidget(d);
     d->visBufferValid = partial_BufferValidity;
     refresh_Widget(as_Widget(d));
 }
@@ -166,7 +165,6 @@ void scrollOffset_ListWidget(iListWidget *d, int offset) {
     if (oldScroll != d->scrollY) {
         d->hoverItem = iInvalidPos;
         updateVisible_ListWidget(d);
-        //invalidate_ListWidget(d);
         d->visBufferValid = partial_BufferValidity;
         refresh_Widget(as_Widget(d));
     }
@@ -178,6 +176,9 @@ static int visCount_ListWidget_(const iListWidget *d) {
 }
 
 static iRanges visRange_ListWidget_(const iListWidget *d) {
+    if (d->itemHeight == 0) {
+        return (iRanges){ 0, 0 };
+    }
     iRanges vis = { d->scrollY / d->itemHeight, 0 };
     vis.end = iMin(size_PtrArray(&d->items), vis.start + visCount_ListWidget_(d));
     return vis;
@@ -186,7 +187,7 @@ static iRanges visRange_ListWidget_(const iListWidget *d) {
 size_t itemIndex_ListWidget(const iListWidget *d, iInt2 pos) {
     const iRect bounds = innerBounds_Widget(constAs_Widget(d));
     pos.y -= top_Rect(bounds) - d->scrollY;
-    if (pos.y < 0) return iInvalidPos;
+    if (pos.y < 0 || !d->itemHeight) return iInvalidPos;
     size_t index = pos.y / d->itemHeight;
     if (index >= size_Array(&d->items)) return iInvalidPos;
     return index;
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
new file mode 100644
index 00000000..d2550c16
--- /dev/null
+++ b/src/ui/lookupwidget.c
@@ -0,0 +1,134 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#include "lookupwidget.h"
+#include "lookup.h"
+#include "listwidget.h"
+
+#include <the_Foundation/mutex.h>
+#include <the_Foundation/thread.h>
+
+iDeclareType(LookupJob)
+
+struct Impl_LookupJob {
+    iString term;
+    iPtrArray results;
+};
+
+static void init_LookupJob(iLookupJob *d) {
+    init_String(&d->term);
+    init_PtrArray(&d->results);
+}
+
+static void deinit_LookupJob(iLookupJob *d) {
+    iForEach(PtrArray, i, &d->results) {
+        delete_LookupResult(i.ptr);
+    }
+    deinit_PtrArray(&d->results);
+    deinit_String(&d->term);
+}
+
+iDefineTypeConstruction(LookupJob)
+
+struct Impl_LookupWidget {
+    iWidget widget;
+    iListWidget *list;
+    iThread *work;
+    iCondition jobAvailable; /* wakes up the work thread */
+    iMutex *mtx;
+    iString nextJob;
+    iLookupJob *finishedJob;
+};
+
+static iThreadResult worker_LookupWidget_(iThread *thread) {
+    iLookupWidget *d = userData_Thread(thread);
+    lock_Mutex(d->mtx);
+    for (;;) {
+        wait_Condition(&d->jobAvailable, d->mtx);
+        if (isEmpty_String(&d->nextJob)) {
+            break; /* Time to quit. */
+        }
+        iLookupJob *job = new_LookupJob();
+        set_String(&job->term, &d->nextJob);
+        clear_String(&d->nextJob);
+        unlock_Mutex(d->mtx);
+        /* Do the lookup. */ {
+
+        }
+        /* Submit the result. */
+        lock_Mutex(d->mtx);
+        if (d->finishedJob) {
+            /* Previous results haven't been taken yet. */
+            delete_LookupJob(d->finishedJob);
+        }
+        d->finishedJob = job;
+    }
+    unlock_Mutex(d->mtx);
+    printf("[LookupWidget] worker has quit\n"); fflush(stdout);
+    return 0;
+}
+
+iDefineObjectConstruction(LookupWidget)
+
+void init_LookupWidget(iLookupWidget *d) {
+    iWidget *w = as_Widget(d);
+    init_Widget(w);
+    setId_Widget(w, "lookup");
+    setFlags_Widget(w, resizeChildren_WidgetFlag, iTrue);
+    d->list = addChild_Widget(w, iClob(new_ListWidget()));
+    d->work = new_Thread(worker_LookupWidget_);
+    setUserData_Thread(d->work, d);
+    init_Condition(&d->jobAvailable);
+    d->mtx = new_Mutex();
+    init_String(&d->nextJob);
+    d->finishedJob = NULL;
+}
+
+void deinit_LookupWidget(iLookupWidget *d) {
+    /* Stop the worker. */ {
+        iGuardMutex(d->mtx, {
+            clear_String(&d->nextJob);
+            signal_Condition(&d->jobAvailable);
+        });
+        join_Thread(d->work);
+        iRelease(d->work);
+    }
+    delete_LookupJob(d->finishedJob);
+    deinit_String(&d->nextJob);
+    delete_Mutex(d->mtx);
+    deinit_Condition(&d->jobAvailable);
+}
+
+static void draw_LookupWidget_(const iLookupWidget *d) {
+    const iWidget *w = constAs_Widget(d);
+    draw_Widget(w);
+}
+
+static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
+    iWidget *w = as_Widget(d);
+    return processEvent_Widget(w, ev);
+}
+
+iBeginDefineSubclass(LookupWidget, Widget)
+    .draw         = (iAny *) draw_LookupWidget_,
+    .processEvent = (iAny *) processEvent_LookupWidget_,
+iEndDefineSubclass(LookupWidget)
diff --git a/src/ui/lookupwidget.h b/src/ui/lookupwidget.h
new file mode 100644
index 00000000..31bcbcb9
--- /dev/null
+++ b/src/ui/lookupwidget.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Jaakko Keränen <jaakko.keranen@iki.fi>
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
+
+#pragma once
+
+#include "widget.h"
+
+iDeclareWidgetClass(LookupWidget)
+iDeclareObjectConstruction(LookupWidget)
+
+
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 50b8ef9b..e84967cc 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -503,7 +503,7 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
             const iBool wasChanged = setMode_SidebarWidget(d, arg_Command(cmd));
             updateItems_SidebarWidget_(d);
             if ((argLabel_Command(cmd, "show") && !isVisible_Widget(w)) ||
-                (argLabel_Command(cmd, "toggle") && !wasChanged)) {
+                (argLabel_Command(cmd, "toggle") && (!isVisible_Widget(w) || !wasChanged))) {
                 postCommand_App("sidebar.toggle");
             }
             scrollOffset_ListWidget(d->list, 0);
diff --git a/src/ui/window.c b/src/ui/window.c
index dabf80de..78567bb5 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 #include "inputwidget.h"
 #include "documentwidget.h"
 #include "sidebarwidget.h"
+#include "lookupwidget.h"
 #include "embedded.h"
 #include "command.h"
 #include "paint.h"
@@ -404,6 +405,8 @@ static void setupUserInterface_Window(iWindow *d) {
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("  \u2b9d  ", 'g', KMOD_PRIMARY | KMOD_SHIFT, "find.prev")));
         addChild_Widget(searchBar, iClob(newIcon_LabelWidget("\u2a2f", SDLK_ESCAPE, 0, "find.close")));
     }
+    iLookupWidget *lookup = new_LookupWidget();
+    addChildFlags_Widget(d->root, iClob(lookup), hidden_WidgetFlag);
     iWidget *tabsMenu = makeMenu_Widget(d->root,
                                         (iMenuItem[]){
                                             { "Close Tab", 0, 0, "tabs.close" },