5 files changed, 22 insertions, 14 deletions

diff --git a/src/ui/documentwidget.c b/src/ui/documentwidget.c
index 449f2f4e..020d624f 100644
--- a/src/ui/documentwidget.c
+++ b/src/ui/documentwidget.c
@@ -173,9 +173,6 @@ struct Impl_DocumentWidget {
     int            scrollY;
     iScrollWidget *scroll;
     iWidget *      menu;
-    SDL_Cursor *   arrowCursor; /* TODO: cursors belong in Window */
-    SDL_Cursor *   beamCursor;
-    SDL_Cursor *   handCursor;
     iVisBuffer *   visBuffer;
 };
 
@@ -207,9 +204,6 @@ void init_DocumentWidget(iDocumentWidget *d) {
     d->noHoverWhileScrolling = iFalse;
     d->showLinkNumbers  = iFalse;
     d->visBuffer        = new_VisBuffer();
-    d->arrowCursor    = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_ARROW);
-    d->beamCursor     = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_IBEAM);
-    d->handCursor     = SDL_CreateSystemCursor(SDL_SYSTEM_CURSOR_HAND);
     init_PtrArray(&d->visibleLinks);
     init_Click(&d->click, d, SDL_BUTTON_LEFT);
     addChild_Widget(w, iClob(d->scroll = new_ScrollWidget()));
@@ -235,9 +229,6 @@ void deinit_DocumentWidget(iDocumentWidget *d) {
     deinit_PtrArray(&d->visibleLinks);
     delete_String(d->certSubject);
     delete_String(d->titleUser);
-    SDL_FreeCursor(d->arrowCursor);
-    SDL_FreeCursor(d->beamCursor);
-    SDL_FreeCursor(d->handCursor);
     deinit_Model(&d->mod);
 }
 
@@ -346,10 +337,11 @@ static void updateHover_DocumentWidget_(iDocumentWidget *d, iInt2 mouse) {
     }
     if (!contains_Widget(constAs_Widget(d), mouse) ||
         contains_Widget(constAs_Widget(d->scroll), mouse)) {
-        SDL_SetCursor(d->arrowCursor);
+//        setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
     }
     else {
-        SDL_SetCursor(d->hoverLink ? d->handCursor : d->beamCursor);
+        setCursor_Window(get_Window(),
+                         d->hoverLink ? SDL_SYSTEM_CURSOR_HAND : SDL_SYSTEM_CURSOR_IBEAM);
     }
 }
 
@@ -1294,7 +1286,7 @@ static iBool processEvent_DocumentWidget_(iDocumentWidget *d, const SDL_Event *e
     else if (ev->type == SDL_MOUSEMOTION) {
         d->noHoverWhileScrolling = iFalse;
         if (isVisible_Widget(d->menu)) {
-            SDL_SetCursor(d->arrowCursor);
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
         }
         else {
             updateHover_DocumentWidget_(d, init_I2(ev->motion.x, ev->motion.y));
diff --git a/src/ui/sidebarwidget.c b/src/ui/sidebarwidget.c
index 98570471..04023ebc 100644
--- a/src/ui/sidebarwidget.c
+++ b/src/ui/sidebarwidget.c
@@ -465,11 +465,11 @@ static iBool processEvent_SidebarWidget_(iSidebarWidget *d, const SDL_Event *ev)
         const iInt2 mouse = init_I2(ev->motion.x, ev->motion.y);
         size_t hover = iInvalidPos;
         if (contains_Widget(d->resizer, mouse)) {
-            SDL_SetCursor(d->resizeCursor);
+            setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_SIZEWE);
         }
         else {
-            SDL_SetCursor(NULL);
             if (contains_Widget(w, mouse)) {
+                setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
                 hover = itemIndex_SidebarWidget_(d, mouse);
             }
         }
diff --git a/src/ui/widget.c b/src/ui/widget.c
index 1c19b70f..135eb267 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -454,6 +454,7 @@ iBool processEvent_Widget(iWidget *d, const SDL_Event *ev) {
         }
     }
     if (d->flags & mouseModal_WidgetFlag && isMouseEvent_(ev)) {
+        setCursor_Window(get_Window(), SDL_SYSTEM_CURSOR_ARROW);
         return iTrue;
     }
     return iFalse;
diff --git a/src/ui/window.c b/src/ui/window.c
index 3d9d98d1..a687350c 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -380,6 +380,7 @@ static void drawBlank_Window_(iWindow *d) {
 
 void init_Window(iWindow *d, iRect rect) {
     theWindow_ = d;
+    iZap(d->cursors);
     d->isDrawFrozen = iTrue;
     uint32_t flags = SDL_WINDOW_RESIZABLE | SDL_WINDOW_ALLOW_HIGHDPI;
 #if defined (iPlatformApple)
@@ -442,6 +443,11 @@ void deinit_Window(iWindow *d) {
     if (theWindow_ == d) {
         theWindow_ = NULL;
     }
+    iForIndices(i, d->cursors) {
+        if (d->cursors[i]) {
+            SDL_FreeCursor(d->cursors[i]);
+        }
+    }
     iReleasePtr(&d->root);
     deinit_Text();
     SDL_DestroyRenderer(d->render);
@@ -564,6 +570,13 @@ void setFreezeDraw_Window(iWindow *d, iBool freezeDraw) {
     d->isDrawFrozen = freezeDraw;
 }
 
+void setCursor_Window(iWindow *d, int cursor) {
+    if (!d->cursors[cursor]) {
+        d->cursors[cursor] = SDL_CreateSystemCursor(cursor);
+    }
+    SDL_SetCursor(d->cursors[cursor]);
+}
+
 iInt2 rootSize_Window(const iWindow *d) {
     return d->root->rect.size;
 }
diff --git a/src/ui/window.h b/src/ui/window.h
index d6eed841..98c8b590 100644
--- a/src/ui/window.h
+++ b/src/ui/window.h
@@ -19,6 +19,7 @@ struct Impl_Window {
     float         uiScale;
     uint32_t      frameTime;
     double        presentTime;
+    SDL_Cursor *  cursors[SDL_NUM_SYSTEM_CURSORS];
 };
 
 iBool       processEvent_Window     (iWindow *, const SDL_Event *);
@@ -27,6 +28,7 @@ void        resize_Window           (iWindow *, int w, int h);
 void        setTitle_Window         (iWindow *, const iString *title);
 void        setUiScale_Window       (iWindow *, float uiScale);
 void        setFreezeDraw_Window    (iWindow *, iBool freezeDraw);
+void        setCursor_Window        (iWindow *, int cursor);
 
 iInt2       rootSize_Window         (const iWindow *);
 float       uiScale_Window          (const iWindow *);