7 files changed, 94 insertions, 20 deletions

diff --git a/src/app.c b/src/app.c
index 6b78f2e4..5c857223 100644
--- a/src/app.c
+++ b/src/app.c
@@ -830,6 +830,27 @@ iBool handleCommand_App(const char *cmd) {
         setCommandHandler_Widget(dlg, handleIdentityCreationCommands_);
         return iTrue;
     }
+    else if (equal_Command(cmd, "ident.signin")) {
+        const iString *url = collect_String(suffix_Command(cmd, "url"));
+        signIn_GmCerts(
+            d->certs,
+            findIdentity_GmCerts(d->certs, collect_Block(hexDecode_Rangecc(range_Command(cmd, "ident")))),
+            url);
+        postCommand_App("idents.changed");
+        return iTrue;
+    }
+    else if (equal_Command(cmd, "ident.signout")) {
+        iGmIdentity *ident = findIdentity_GmCerts(
+            d->certs, collect_Block(hexDecode_Rangecc(range_Command(cmd, "ident"))));
+        if (arg_Command(cmd)) {
+            clearUse_GmIdentity(ident);
+        }
+        else {
+            setUse_GmIdentity(ident, collect_String(suffix_Command(cmd, "url")), iFalse);
+        }
+        postCommand_App("idents.changed");
+        return iTrue;
+    }
     else if (equal_Command(cmd, "theme.set")) {
         const int isAuto = argLabel_Command(cmd, "auto");
         d->theme = arg_Command(cmd);
diff --git a/src/gmcerts.c b/src/gmcerts.c
index 0dc52041..addd75d3 100644
--- a/src/gmcerts.c
+++ b/src/gmcerts.c
@@ -253,7 +253,7 @@ static void loadIdentities_GmCerts_(iGmCerts *d) {
     }
 }
 
-static iGmIdentity *findIdentity_GmCerts_(iGmCerts *d, const iBlock *fingerprint) {
+iGmIdentity *findIdentity_GmCerts(iGmCerts *d, const iBlock *fingerprint) {
     iForEach(PtrArray, i, &d->idents) {
         iGmIdentity *ident = i.ptr;
         if (cmp_Block(fingerprint, &ident->fingerprint) == 0) { /* TODO: could use a hash */
@@ -273,7 +273,7 @@ static void loadIdentityFromCertificate_GmCerts_(iGmCerts *d, const iString *crt
     }
     iTlsCertificate *cert = newPemKey_TlsCertificate(readFile_(crtPath), readFile_(keyPath));
     iBlock *finger = fingerprint_TlsCertificate(cert);
-    iGmIdentity *ident = findIdentity_GmCerts_(d, finger);
+    iGmIdentity *ident = findIdentity_GmCerts(d, finger);
     if (!ident) {
         /* User-provided certificate. */
         ident = new_GmIdentity();
@@ -497,8 +497,10 @@ const iPtrArray *identities_GmCerts(const iGmCerts *d) {
 }
 
 void signIn_GmCerts(iGmCerts *d, iGmIdentity *identity, const iString *url) {
-    signOut_GmCerts(d, url);
-    setUse_GmIdentity(identity, url, iTrue);
+    if (identity) {
+        signOut_GmCerts(d, url);
+        setUse_GmIdentity(identity, url, iTrue);
+    }
 }
 
 void signOut_GmCerts(iGmCerts *d, const iString *url) {
diff --git a/src/gmcerts.h b/src/gmcerts.h
index 2ab4396e..f0ed37b5 100644
--- a/src/gmcerts.h
+++ b/src/gmcerts.h
@@ -82,6 +82,7 @@ void                deleteIdentity_GmCerts  (iGmCerts *, iGmIdentity *identity);
 const iString *     certificatePath_GmCerts (const iGmCerts *, const iGmIdentity *identity);
 
 iGmIdentity *       identity_GmCerts        (iGmCerts *, unsigned int id);
+iGmIdentity *       findIdentity_GmCerts    (iGmCerts *, const iBlock *fingerprint);
 const iGmIdentity * constIdentity_GmCerts   (const iGmCerts *, unsigned int id);
 const iGmIdentity * identityForUrl_GmCerts  (const iGmCerts *, const iString *url);
 const iPtrArray *   identities_GmCerts      (const iGmCerts *);
diff --git a/src/history.c b/src/history.c
index 10de5b9a..562c23bf 100644
--- a/src/history.c
+++ b/src/history.c
@@ -271,19 +271,25 @@ const iStringArray *searchContents_History(const iHistory *d, const iRegExp *pat
                 iString entry;
                 init_String(&entry);
                 iRangei cap = m.range;
-                cap.start   = iMax(cap.start - 15, 0);
-                cap.end     = iMin(cap.end + 15, (int) size_Block(&resp->body));
+                const int prefix = iMin(10, cap.start);
+                cap.start   = cap.start - prefix;
+                cap.end     = iMin(cap.end + 30, (int) size_Block(&resp->body));
+                const size_t maxLen = 60;
+                if (size_Range(&cap) > maxLen) {
+                    cap.end = cap.start + maxLen;
+                }
                 iString content;
                 initRange_String(&content, (iRangecc){ m.subject + cap.start, m.subject + cap.end });
                 /* This needs cleaning up; highlight the matched word. */
                 replace_Block(&content.chars, '\n', ' ');
                 replace_Block(&content.chars, '\r', ' ');
-//                insertData_Block(&content.chars, 10, uiTextStrong_ColorEscape, 2);
-//                insertData_Block(&content.chars, size_String(&content) - 10, uiText_ColorEscape, 2);
+                if (prefix + size_Range(&m.range) < size_String(&content)) {
+                    insertData_Block(&content.chars, prefix + size_Range(&m.range), uiText_ColorEscape, 2);
+                }
+                insertData_Block(&content.chars, prefix, uiTextStrong_ColorEscape, 2);
                 format_String(
                     &entry, "match len:%zu str:%s", size_String(&content), cstr_String(&content));
                 deinit_String(&content);
-                //appendRange_String(&entry, );
                 appendFormat_String(&entry, " url:%s", cstr_String(&url->url));
                 if (!contains_StringSet(&inserted, &url->url)) {
                     pushFront_StringArray(urls, &entry);
diff --git a/src/ui/command.c b/src/ui/command.c
index cf8c7032..44e66121 100644
--- a/src/ui/command.c
+++ b/src/ui/command.c
@@ -96,12 +96,16 @@ iString *suffix_Command(const char *cmd, const char *label) {
 }
 
 const iString *string_Command(const char *cmd, const char *label) {
+    return collect_String(newRange_String(range_Command(cmd, label)));
+}
+
+iRangecc range_Command(const char *cmd, const char *label) {
     iRangecc val = { suffixPtr_Command(cmd, label), NULL };
     if (val.start) {
         for (val.end = val.start; *val.end && !isspace(*val.end); val.end++) {}
-        return collect_String(newRange_String(val));
+        return val;
     }
-    return collectNew_String();
+    return iNullRange;
 }
 
 iInt2 dir_Command(const char *cmd) {
diff --git a/src/ui/command.h b/src/ui/command.h
index 4798baa6..43992b8e 100644
--- a/src/ui/command.h
+++ b/src/ui/command.h
@@ -22,6 +22,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */
 
 #pragma once
 
+#include <the_Foundation/range.h>
 #include <the_Foundation/vec2.h>
 
 iBool   equal_Command           (const char *commandWithArgs, const char *command);
@@ -36,5 +37,6 @@ iInt2   coord_Command           (const char *);
 iInt2   dir_Command             (const char *);
 
 const iString * string_Command      (const char *, const char *label); /* space-delimited */
+iRangecc        range_Command       (const char *, const char *label); /* space-delimited */
 const char *    suffixPtr_Command   (const char *, const char *label); /* until end-of-command */
 iString *       suffix_Command      (const char *, const char *label); /* until end-of-command */
diff --git a/src/ui/lookupwidget.c b/src/ui/lookupwidget.c
index dbe734bf..676f8678 100644
--- a/src/ui/lookupwidget.c
+++ b/src/ui/lookupwidget.c
@@ -422,6 +422,8 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
     clear_ListWidget(d->list);
     sort_Array(&job->results, cmpPtr_LookupResult_);
     enum iLookupResultType lastType = none_LookupResultType;
+    const size_t maxPerType = 10; /* TODO: Setting? */
+    size_t perType = 0;
     iConstForEach(PtrArray, i, &job->results) {
         const iLookupResult *res = i.ptr;
         if (lastType != res->type) {
@@ -434,6 +436,42 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
             addItem_ListWidget(d->list, item);
             iRelease(item);
             lastType = res->type;
+            perType = 0;
+        }
+        if (perType > maxPerType) {
+            continue;
+        }
+        if (res->type == identity_LookupResultType) {
+            const iString *docUrl = url_DocumentWidget(document_App());
+            iBlock *finger = hexDecode_Rangecc(range_String(&res->meta));
+            const iGmIdentity *ident = findIdentity_GmCerts(certs_App(), finger);
+            /* Sign in/out. */ {
+                const iBool isUsed = isUsedOn_GmIdentity(ident, docUrl);
+                iLookupItem *item  = new_LookupItem(res);
+                item->fg           = uiText_ColorId;
+                item->font         = uiContent_FontId;
+                format_String(&item->text,
+                              "%s \u2014 " uiTextStrong_ColorEscape "%s on this page",
+                              cstr_String(&res->label),
+                              isUsed ? "Stop using" : "Use");
+                format_String(&item->command, "ident.sign%s ident:%s url:%s",
+                              isUsed ? "out arg:0" : "in", cstr_String(&res->meta), cstr_String(docUrl));
+                addItem_ListWidget(d->list, item);
+                iRelease(item);
+            }
+            if (isUsed_GmIdentity(ident)) {
+                iLookupItem *item  = new_LookupItem(res);
+                item->fg           = uiText_ColorId;
+                item->font         = uiContent_FontId;
+                format_String(&item->text,
+                              "%s \u2014 " uiTextStrong_ColorEscape "Stop using everywhere",
+                              cstr_String(&res->label));
+                format_String(&item->command, "ident.signout arg:1 ident:%s", cstr_String(&res->meta));
+                addItem_ListWidget(d->list, item);
+                iRelease(item);
+            }
+            delete_Block(finger);
+            continue;
         }
         iLookupItem *item = new_LookupItem(res);
         const char *url = cstr_String(&res->url);
@@ -463,19 +501,16 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
             case content_LookupResultType: {
                 item->fg = uiText_ColorId;
                 item->font = uiContent_FontId;
-                format_String(&item->text, "%s \u2014 %s", cstr_String(&res->label), url);
+                format_String(&item->text, "%s \u2014 pe%s", url, cstr_String(&res->label));
                 format_String(&item->command, "open url:%s", cstr_String(&res->url));
                 break;
             }
-            case identity_LookupResultType: {
-                item->fg = uiText_ColorId;
-                item->font = uiContent_FontId;
-                format_String(&item->text, "%s", cstr_String(&res->label));
+            default:
                 break;
-            }
         }
         addItem_ListWidget(d->list, item);
         iRelease(item);
+        perType++;
     }
     delete_LookupJob(job);
     /* Re-select the item at the cursor. */
@@ -483,6 +518,7 @@ static void presentResults_LookupWidget_(iLookupWidget *d) {
         d->cursor = iMin(d->cursor, numItems_ListWidget(d->list) - 1);
         ((iListItem *) item_ListWidget(d->list, d->cursor))->isSelected = iTrue;
     }
+    scrollOffset_ListWidget(d->list, 0);
     updateVisible_ListWidget(d->list);
     invalidate_ListWidget(d->list);
     setFlags_Widget(as_Widget(d), hidden_WidgetFlag, numItems_ListWidget(d->list) == 0);
@@ -557,13 +593,15 @@ static iBool processEvent_LookupWidget_(iLookupWidget *d, const SDL_Event *ev) {
         }
     }
     if (isCommand_Widget(w, ev, "list.clicked")) {
-        setTextCStr_InputWidget(findWidget_App("url"), "");
+        iInputWidget *url = findWidget_App("url");
+//        setTextCStr_InputWidget(findWidget_App("url"), "");
         const iLookupItem *item = constItem_ListWidget(d->list, arg_Command(cmd));
         if (item && !isEmpty_String(&item->command)) {
-            postCommandString_App(&item->command);
+            setText_InputWidget(url, url_DocumentWidget(document_App()));
+            setFocus_Widget(NULL);
             setFlags_Widget(w, hidden_WidgetFlag, iTrue);
             setCursor_LookupWidget_(d, iInvalidPos);
-            setFocus_Widget(NULL);
+            postCommandString_App(&item->command);
         }
         return iTrue;
     }