iOS: Further tweaks for mobile

5 files changed, 97 insertions, 30 deletions

diff --git a/src/app.c b/src/app.c
index 3307d8dd..bb8ebb42 100644
--- a/src/app.c
+++ b/src/app.c
@@ -82,7 +82,7 @@ static const char *defaultDataDir_App_ = "~/Library/Application Support/fi.skyja
 #endif
 #if defined (iPlatformAppleMobile)
 #define EMB_BIN "../../Resources/resources.lgr"
-static const char *defaultDataDir_App_ = "~/config";
+static const char *defaultDataDir_App_ = "~/Library/Application Support";
 #endif
 #if defined (iPlatformMsys)
 #define EMB_BIN "../resources.lgr"
@@ -397,6 +397,9 @@ static void saveState_App_(const iApp *d) {
             serializeState_DocumentWidget(i.object, stream_File(f));
         }
     }
+    else {
+        fprintf(stderr, "[App] failed to save state: %s\n", strerror(errno));
+    }
     iRelease(f);
 }
 
@@ -600,6 +603,39 @@ const iString *debugInfo_App(void) {
     return msg;
 }
 
+static void clearCache_App_(void) {
+    iForEach(ObjectList, i, iClob(listDocuments_App())) {
+        clearCache_History(history_DocumentWidget(i.object));
+    }
+}
+
+void trimCache_App(void) {
+    iApp *d = &app_;
+    size_t cacheSize = 0;
+    const size_t limit = d->prefs.maxCacheSize * 1000000;
+    iObjectList *docs = listDocuments_App();
+    iForEach(ObjectList, i, docs) {
+        cacheSize += cacheSize_History(history_DocumentWidget(i.object));
+    }
+    init_ObjectListIterator(&i, docs);
+    iBool wasPruned = iFalse;
+    while (cacheSize > limit) {
+        iDocumentWidget *doc = i.object;
+        const size_t pruned = pruneLeastImportant_History(history_DocumentWidget(doc));
+        if (pruned) {
+            cacheSize -= pruned;
+            wasPruned = iTrue;
+        }
+        next_ObjectListIterator(&i);
+        if (!i.value) {
+            if (!wasPruned) break;
+            wasPruned = iFalse;
+            init_ObjectListIterator(&i, docs);
+        }
+    }
+    iRelease(docs);
+}
+
 iLocalDef iBool isWaitingAllowed_App_(iApp *d) {
 #if defined (LAGRANGE_IDLE_SLEEP)
     if (d->isIdling) {
@@ -631,6 +667,14 @@ void processEvents_App(enum iAppEventMode eventMode) {
                     processEvents_App(postedEventsOnly_AppEventMode);
                 }
                 goto backToMainLoop;
+            case SDL_APP_LOWMEMORY:
+                clearCache_App_();
+                break;
+            case SDL_APP_TERMINATING:
+            case SDL_APP_WILLENTERBACKGROUND:
+                savePrefs_App_(d);
+                saveState_App_(d);
+                break;
             case SDL_DROPFILE: {
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (!wasUsed) {
@@ -963,6 +1007,7 @@ static iBool handlePrefsCommands_(iWidget *d, const char *cmd) {
         postCommandf_App("prefs.dialogtab arg:%u",
                          tabPageIndex_Widget(tabs, currentTabPage_Widget(tabs)));
         destroy_Widget(d);
+        postCommand_App("prefs.changed");
         return iTrue;
     }
     else if (equal_Command(cmd, "quoteicon.set")) {
@@ -1036,33 +1081,6 @@ iDocumentWidget *newTab_App(const iDocumentWidget *duplicateOf, iBool switchToNe
     return doc;
 }
 
-void trimCache_App(void) {
-    iApp *d = &app_;
-    size_t cacheSize = 0;
-    const size_t limit = d->prefs.maxCacheSize * 1000000;
-    iObjectList *docs = listDocuments_App();
-    iForEach(ObjectList, i, docs) {
-        cacheSize += cacheSize_History(history_DocumentWidget(i.object));
-    }
-    init_ObjectListIterator(&i, docs);
-    iBool wasPruned = iFalse;
-    while (cacheSize > limit) {
-        iDocumentWidget *doc = i.object;
-        const size_t pruned = pruneLeastImportant_History(history_DocumentWidget(doc));
-        if (pruned) {
-            cacheSize -= pruned;
-            wasPruned = iTrue;
-        }
-        next_ObjectListIterator(&i);
-        if (!i.value) {
-            if (!wasPruned) break;
-            wasPruned = iFalse;
-            init_ObjectListIterator(&i, docs);
-        }
-    }
-    iRelease(docs);
-}
-
 static iBool handleIdentityCreationCommands_(iWidget *dlg, const char *cmd) {
     iApp *d = &app_;
     if (equal_Command(cmd, "ident.temp.changed")) {
@@ -1153,6 +1171,10 @@ iBool handleCommand_App(const char *cmd) {
                                        suffixPtr_Command(cmd, "where")));
         return iTrue;
     }
+    else if (equal_Command(cmd, "prefs.changed")) {
+        savePrefs_App_(d);
+        return iTrue;
+    }
     else if (equal_Command(cmd, "prefs.dialogtab")) {
         d->prefs.dialogTab = arg_Command(cmd);
         return iTrue;
@@ -1410,7 +1432,13 @@ iBool handleCommand_App(const char *cmd) {
         return iTrue;
     }
     else if (equal_Command(cmd, "tabs.close")) {
-        iWidget *      tabs  = findWidget_App("doctabs");
+        iWidget *tabs = findWidget_App("doctabs");
+#if defined (iPlatformAppleMobile)
+        /* Can't close the last on mobile. */
+        if (tabCount_Widget(tabs) == 1) {
+            return iTrue;
+        }
+#endif
         const iRangecc tabId = range_Command(cmd, "id");
         iWidget *      doc   = !isEmpty_Range(&tabId) ? findWidget_App(cstr_Rangecc(tabId))
                                                       : document_App();
diff --git a/src/history.c b/src/history.c
index 59d515dc..6876d8e3 100644
--- a/src/history.c
+++ b/src/history.c
@@ -299,6 +299,18 @@ size_t cacheSize_History(const iHistory *d) {
     return cached;
 }
 
+void clearCache_History(iHistory *d) {
+    lock_Mutex(d->mtx);
+    iForEach(Array, i, &d->recent) {
+        iRecentUrl *url = i.value;
+        if (url->cachedResponse) {
+            delete_GmResponse(url->cachedResponse);
+            url->cachedResponse = NULL;
+        }
+    }
+    unlock_Mutex(d->mtx);
+}
+
 size_t pruneLeastImportant_History(iHistory *d) {
     size_t delta  = 0;
     size_t chosen = iInvalidPos;
diff --git a/src/history.h b/src/history.h
index 7c2684f1..ce3b8e47 100644
--- a/src/history.h
+++ b/src/history.h
@@ -56,6 +56,7 @@ iBool       goForward_History           (iHistory *);
 iRecentUrl *recentUrl_History           (iHistory *, size_t pos);
 iRecentUrl *mostRecentUrl_History       (iHistory *);
 iRecentUrl *findUrl_History             (iHistory *, const iString *url);
+void        clearCache_History          (iHistory *);
 size_t      pruneLeastImportant_History (iHistory *);
 
 const iStringArray *   searchContents_History   (const iHistory *, const iRegExp *pattern); /* chronologically ascending */
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index 34efba67..448103b5 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -137,7 +137,7 @@ static void draw_ScrollWidget_(const iScrollWidget *d) {
     if (bounds.size.x > 0) {
         iPaint p;
         init_Paint(&p);
-        drawVLine_Paint(&p, topLeft_Rect(bounds), height_Rect(bounds), uiSeparator_ColorId);
+        //drawVLine_Paint(&p, topLeft_Rect(bounds), height_Rect(bounds), uiSeparator_ColorId);
         const iRect thumbRect = shrunk_Rect(
             thumbRect_ScrollWidget_(d), init_I2(isPressed ? gap_UI : (gap_UI * 4 / 3), gap_UI / 2));
         fillRect_Paint(&p, thumbRect, isPressed ? uiBackgroundPressed_ColorId : tmQuote_ColorId);
diff --git a/src/ui/window.c b/src/ui/window.c
index 75dffb56..38df8682 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -136,6 +136,7 @@ static iBool handleRootCommands_(iWidget *root, const char *cmd) {
 #endif
 
 #if !defined (iHaveNativeMenus)
+#if !defined (iPlatformAppleMobile)
 /* TODO: Submenus wouldn't hurt here. */
 static const iMenuItem navMenuItems_[] = {
     { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
@@ -162,6 +163,31 @@ static const iMenuItem navMenuItems_[] = {
     { "---", 0, 0, NULL },
     { "Quit Lagrange", 'q', KMOD_PRIMARY, "quit" }
 };
+#else
+static const iMenuItem navMenuItems_[] = {
+    { "New Tab", 't', KMOD_PRIMARY, "tabs.new" },
+    { "Close Tab", 'w', KMOD_PRIMARY, "tabs.close" },
+    { "---", 0, 0, NULL },
+    { "Save to Downloads", SDLK_s, KMOD_PRIMARY, "document.save" },
+    { "Copy Source Text", SDLK_c, KMOD_PRIMARY, "copy" },
+    { "---", 0, 0, NULL },
+    { "Toggle Left Sidebar", SDLK_l, KMOD_PRIMARY | KMOD_SHIFT, "sidebar.toggle" },
+    { "Toggle Right Sidebar", SDLK_p, KMOD_PRIMARY | KMOD_SHIFT, "sidebar2.toggle" },
+    { "Zoom In", SDLK_EQUALS, KMOD_PRIMARY, "zoom.delta arg:10" },
+    { "Zoom Out", SDLK_MINUS, KMOD_PRIMARY, "zoom.delta arg:-10" },
+    { "Reset Zoom", SDLK_0, KMOD_PRIMARY, "zoom.set arg:100" },
+    { "---", 0, 0, NULL },
+    { "List All Bookmarks", 0, 0, "!open url:about:bookmarks" },
+    { "List Bookmarks by Tag", 0, 0, "!open url:about:bookmarks?tags" },
+    { "List Bookmarks by Creation Time", 0, 0, "!open url:about:bookmarks?created" },
+    { "---", 0, 0, NULL },
+    { "Show Feed Entries", 0, 0, "!open url:about:feeds" },
+    { "---", 0, 0, NULL },
+    { "Preferences...", SDLK_COMMA, KMOD_PRIMARY, "preferences" },
+    { "Help", SDLK_F1, 0, "!open url:about:help" },
+    { "Release Notes", 0, 0, "!open url:about:version" },
+};
+#endif /* AppleMobile */
 #endif
 
 #if defined (iHaveNativeMenus)