DocumentWidget: Scrolling via scrollbar and keys

5 files changed, 129 insertions, 38 deletions

diff --git a/src/app.c b/src/app.c
index 16354baf..05038a4b 100644
--- a/src/app.c
+++ b/src/app.c
@@ -45,6 +45,7 @@ struct Impl_App {
     iBool        running;
     iWindow *    window;
     iSortedArray tickers;
+    iBool        pendingRefresh;
     /* Preferences: */
     iBool        retainWindowSize;
     float        uiScale;
@@ -136,6 +137,7 @@ static void init_App_(iApp *d, int argc, char **argv) {
     d->running          = iFalse;
     d->window           = NULL;
     d->retainWindowSize = iTrue;
+    d->pendingRefresh   = iFalse;
     loadPrefs_App_(d);
     d->window = new_Window();
     /* Widget state init. */ {
@@ -233,6 +235,7 @@ void refresh_App(void) {
     destroyPending_Widget();
     draw_Window(d->window);
     recycle_Garbage();
+    d->pendingRefresh = iFalse;
 }
 
 int run_App(int argc, char **argv) {
@@ -243,13 +246,17 @@ int run_App(int argc, char **argv) {
 }
 
 void postRefresh_App(void) {
-    SDL_Event ev;
-    ev.user.type     = SDL_USEREVENT;
-    ev.user.code     = refresh_UserEventCode;
-    ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
-    ev.user.data1    = NULL;
-    ev.user.data2    = NULL;
-    SDL_PushEvent(&ev);
+    iApp *d = &app_;
+    if (!d->pendingRefresh) {
+        d->pendingRefresh = iTrue;
+        SDL_Event ev;
+        ev.user.type     = SDL_USEREVENT;
+        ev.user.code     = refresh_UserEventCode;
+        ev.user.windowID = get_Window() ? SDL_GetWindowID(get_Window()->win) : 0;
+        ev.user.data1    = NULL;
+        ev.user.data2    = NULL;
+        SDL_PushEvent(&ev);
+    }
 }
 
 void postCommand_App(const char *command) {
@@ -260,7 +267,9 @@ void postCommand_App(const char *command) {
     ev.user.data1    = strdup(command);
     ev.user.data2    = NULL;
     SDL_PushEvent(&ev);
+#if !defined (NDEBUG)
     printf("[command] %s\n", command); fflush(stdout);
+#endif
 }
 
 void postCommandf_App(const char *command, ...) {
diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 8c707206..38c19fdd 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -1,6 +1,7 @@
 #include "documentwidget.h"
 #include "scrollwidget.h"
 #include "paint.h"
+#include "command.h"
 #include "util.h"
 #include "app.h"
 #include "../gemini.h"
@@ -19,8 +20,6 @@ enum iDocumentState {
     ready_DocumentState,
 };
 
-
-
 struct Impl_DocumentWidget {
     iWidget widget;
     enum iDocumentState state;
@@ -74,16 +73,16 @@ void init_DocumentWidget(iDocumentWidget *d) {
     iWidget *w = as_Widget(d);
     init_Widget(w);
     setId_Widget(w, "document");
-    d->state = blank_DocumentState;
-    d->url = new_String();
+    d->state      = blank_DocumentState;
+    d->url        = new_String();
     d->statusCode = 0;
-    d->request = NULL;
-    d->newSource = new_String();
-    d->doc = new_GmDocument();
+    d->request    = NULL;
+    d->newSource  = new_String();
+    d->doc        = new_GmDocument();
     d->pageMargin = 5;
-    d->scrollY = 0;
+    d->scrollY    = 0;
+    d->hoverLink  = NULL;
     init_PtrArray(&d->visibleLinks);
-    d->hoverLink = NULL;
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
 }
@@ -151,7 +150,7 @@ static void requestFinished_DocumentWidget_(iAnyObject *obj) {
     iReleaseLater(d->request);
     d->request = NULL;
     fflush(stdout);
-    postRefresh_App();
+    refresh_Widget(constAs_Widget(d));
 }
 
 static void fetch_DocumentWidget_(iDocumentWidget *d) {
@@ -164,7 +163,7 @@ static void fetch_DocumentWidget_(iDocumentWidget *d) {
         iFile *f = new_File(collect_String(newRange_String(url.path)));
         if (open_File(f, readOnly_FileMode)) {
             setBlock_String(d->newSource, collect_Block(readAll_File(f)));
-            postRefresh_App();
+            refresh_Widget(constAs_Widget(d));
         }
         iRelease(f);
         return;
@@ -228,6 +227,22 @@ static void updateVisible_DocumentWidget_(iDocumentWidget *d) {
     render_GmDocument(d->doc, visRange, addVisibleLink_DocumentWidget_, d);
 }
 
+static void scroll_DocumentWidget_(iDocumentWidget *d, int offset) {
+    d->scrollY += offset;
+    if (d->scrollY < 0) {
+        d->scrollY = 0;
+    }
+    const int scrollMax = scrollMax_DocumentWidget_(d);
+    if (scrollMax > 0) {
+        d->scrollY = iMin(d->scrollY, scrollMax);
+    }
+    else {
+        d->scrollY = 0;
+    }
+    updateVisible_DocumentWidget_(d);
+    refresh_Widget(as_Widget(d));
+}
+
 static iRangecc dirPath_(iRangecc path) {
     const size_t pos = lastIndexOfCStr_Rangecc(&path, "/");
     if (pos == iInvalidPos) return path;
@@ -287,10 +302,35 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         setWidth_GmDocument(d->doc, documentWidth_DocumentWidget_(d));
         updateVisible_DocumentWidget_(d);
     }
+    else if (isCommand_Widget(w, ev, "scroll.moved")) {
+        d->scrollY = arg_Command(command_UserEvent(ev));
+        updateVisible_DocumentWidget_(d);
+        return iTrue;
+    }
+    else if (isCommand_Widget(w, ev, "scroll.page")) {
+        scroll_DocumentWidget_(
+            d, arg_Command(command_UserEvent(ev)) * height_Rect(documentBounds_DocumentWidget_(d)));
+        return iTrue;
+    }
     if (ev->type == SDL_KEYDOWN) {
         const int mods = keyMods_Sym(ev->key.keysym.mod);
         const int key = ev->key.keysym.sym;
         switch (key) {
+            case SDLK_HOME:
+                d->scrollY = 0;
+                updateVisible_DocumentWidget_(d);
+                refresh_Widget(w);
+                return iTrue;
+            case SDLK_END:
+                d->scrollY = scrollMax_DocumentWidget_(d);
+                updateVisible_DocumentWidget_(d);
+                refresh_Widget(w);
+                return iTrue;
+            case SDLK_PAGEUP:
+            case SDLK_PAGEDOWN:
+            case ' ':
+                postCommand_Widget(w, "scroll.page arg:%d", key == SDLK_PAGEUP ? -1 : +1);
+                return iTrue;
             case 'r':
                 if (mods == KMOD_PRIMARY) {
                     fetch_DocumentWidget_(d);
@@ -300,7 +340,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             case '0': {
                 extern int enableHalfPixelGlyphs_Text;
                 enableHalfPixelGlyphs_Text = !enableHalfPixelGlyphs_Text;
-                postRefresh_App();
+                refresh_Widget(w);
                 printf("halfpixel: %d\n", enableHalfPixelGlyphs_Text);
                 fflush(stdout);
                 break;
@@ -308,19 +348,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
         }
     }
     else if (ev->type == SDL_MOUSEWHEEL) {
-        d->scrollY -= 3 * ev->wheel.y * lineHeight_Text(default_FontId);
-        if (d->scrollY < 0) {
-            d->scrollY = 0;
-        }
-        const int scrollMax = scrollMax_DocumentWidget_(d);
-        if (scrollMax > 0) {
-            d->scrollY = iMin(d->scrollY, scrollMax);
-        }
-        else {
-            d->scrollY = 0;
-        }
-        updateVisible_DocumentWidget_(d);
-        postRefresh_App();
+        scroll_DocumentWidget_(d, -3 * ev->wheel.y * lineHeight_Text(default_FontId));
         return iTrue;
     }
     else if (ev->type == SDL_MOUSEMOTION) {
@@ -339,7 +367,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
             }
         }
         if (d->hoverLink != oldHoverLink) {
-            postRefresh_App();
+            refresh_Widget(w);
         }
     }
     switch (processEvent_Click(&d->click, ev)) {
diff --git a/src/ui/scrollwidget.c b/src/ui/scrollwidget.c
index cbfd2e70..1be62bb8 100644
--- a/src/ui/scrollwidget.c
+++ b/src/ui/scrollwidget.c
@@ -1,5 +1,6 @@
 #include "scrollwidget.h"
 #include "paint.h"
+#include "util.h"
 
 iDefineObjectConstruction(ScrollWidget)
 
@@ -8,6 +9,8 @@ struct Impl_ScrollWidget {
     iRangei range;
     int thumb;
     int thumbSize;
+    iClick click;
+    int startThumb;
 };
 
 void init_ScrollWidget(iScrollWidget *d) {
@@ -19,19 +22,23 @@ void init_ScrollWidget(iScrollWidget *d) {
                         moveToParentRightEdge_WidgetFlag,
                     iTrue);
     w->rect.size.x = gap_UI * 3;
+    init_Click(&d->click, d, SDL_BUTTON_LEFT);
 }
 
 void deinit_ScrollWidget(iScrollWidget *d) {
     iUnused(d);
 }
 
+static int thumbSize_ScrollWidget_(const iScrollWidget *d) {
+    return iMax(gap_UI * 6, d->thumbSize);
+}
+
 static iRect thumbRect_ScrollWidget_(const iScrollWidget *d) {
     const iRect bounds = bounds_Widget(constAs_Widget(d));
     iRect rect = init_Rect(bounds.pos.x, bounds.pos.y, bounds.size.x, 0);
     const int total = size_Range(&d->range);
-//    printf("total: %d  thumb: %d  thsize: %d\n", total, d->thumb, d->thumbSize); fflush(stdout);
     if (total > 0) {
-        const int tsize = iMax(gap_UI * 6, d->thumbSize);
+        const int tsize = thumbSize_ScrollWidget_(d);
         const int tpos =
             iClamp((float) d->thumb / (float) total, 0, 1) * (height_Rect(bounds) - tsize);
         rect.pos.y  = tpos;
@@ -46,7 +53,7 @@ static void checkVisible_ScrollWidget_(iScrollWidget *d) {
 
 void setRange_ScrollWidget(iScrollWidget *d, iRangei range) {
     range.end = iMax(range.start, range.end);
-    d->range = range;
+    d->range  = range;
     checkVisible_ScrollWidget_(d);
 }
 
@@ -58,18 +65,58 @@ void setThumb_ScrollWidget(iScrollWidget *d, int thumb, int thumbSize) {
 
 static iBool processEvent_ScrollWidget_(iScrollWidget *d, const SDL_Event *ev) {
     iWidget *w = as_Widget(d);
+    switch (processEvent_Click(&d->click, ev)) {
+        case started_ClickResult:
+            setFlags_Widget(w, pressed_WidgetFlag, iTrue);
+            d->startThumb = d->thumb;
+            refresh_Widget(w);
+            return iTrue;
+        case drag_ClickResult: {
+            const iRect bounds = bounds_Widget(w);
+            const int offset = delta_Click(&d->click).y;
+            const int total = size_Range(&d->range);
+            int dpos = (float) offset / (float) (height_Rect(bounds) - thumbSize_ScrollWidget_(d)) * total;
+            d->thumb = iClamp(d->startThumb + dpos, d->range.start, d->range.end);
+            postCommand_Widget(w, "scroll.moved arg:%d", d->thumb);
+            refresh_Widget(w);
+            return iTrue;
+        }
+        case finished_ClickResult:
+        case aborted_ClickResult:
+            if (!isMoved_Click(&d->click)) {
+                /* Page up/down. */
+                const iRect tr = thumbRect_ScrollWidget_(d);
+                const int y = pos_Click(&d->click).y;
+                int pgDir = 0;
+                if (y < top_Rect(tr)) {
+                    pgDir = -1;
+                }
+                else if (y > bottom_Rect(tr)) {
+                    pgDir = +1;
+                }
+                if (pgDir) {
+                    postCommand_Widget(w, "scroll.page arg:%d", pgDir);
+                }
+            }
+            setFlags_Widget(w, pressed_WidgetFlag, iFalse);
+            refresh_Widget(w);
+            return iTrue;
+        default:
+            break;
+    }
     return processEvent_Widget(w, ev);
 }
 
 static void draw_ScrollWidget_(const iScrollWidget *d) {
     const iWidget *w = constAs_Widget(d);
     const iRect bounds = bounds_Widget(w);
+    const iBool isPressed = (flags_Widget(w) & pressed_WidgetFlag) != 0;
     if (bounds.size.x > 0) {
         iPaint p;
         init_Paint(&p);
         drawRect_Paint(&p, bounds, black_ColorId);
-        iRect tr = thumbRect_ScrollWidget_(d);
-        fillRect_Paint(&p, thumbRect_ScrollWidget_(d), gray50_ColorId);
+        fillRect_Paint(&p, shrunk_Rect(thumbRect_ScrollWidget_(d), one_I2()),
+                       isPressed ? orange_ColorId : gray50_ColorId);
     }
 }
 
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 5c23860f..86d2e195 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -616,6 +616,12 @@ void postCommand_Widget(const iWidget *d, const char *cmd, ...) {
     deinit_String(&str);
 }
 
+void refresh_Widget(const iWidget *d) {
+    /* TODO: Could be widget specific, if parts of the tree are cached. */
+    iUnused(d);
+    postRefresh_App();
+}
+
 iBeginDefineClass(Widget)
     .processEvent = processEvent_Widget,
     .draw         = draw_Widget,
diff --git a/src/ui/widget.h b/src/ui/widget.h
index 2d13fe78..af3934e6 100644
--- a/src/ui/widget.h
+++ b/src/ui/widget.h
@@ -123,6 +123,7 @@ void    arrange_Widget      (iWidget *);
 iBool   dispatchEvent_Widget(iWidget *, const SDL_Event *);
 iBool   processEvent_Widget (iWidget *, const SDL_Event *);
 void    postCommand_Widget  (const iWidget *, const char *cmd, ...);
+void    refresh_Widget      (const iWidget *);
 
 void    setFocus_Widget     (iWidget *);
 iWidget *focus_Widget       (void);