1 files changed, 56 insertions, 37 deletions

diff --git a/src/ui/widget.c b/src/ui/widget.c
index 2d9bf45d..5d924b57 100644
--- a/src/ui/widget.c
+++ b/src/ui/widget.c
@@ -50,6 +50,7 @@ iDefineObjectConstruction(Widget)
 
 void init_Widget(iWidget *d) {
     init_String(&d->id);
+    d->root           = get_Root(); /* never changes after this */
     d->flags          = 0;
     d->rect           = zero_Rect();
     d->minSize        = zero_I2();
@@ -81,7 +82,7 @@ void deinit_Widget(iWidget *d) {
 //#endif
     deinit_String(&d->id);
     if (d->flags & keepOnTop_WidgetFlag) {
-        removeAll_PtrArray(onTop_Root(get_Root()), d);
+        removeAll_PtrArray(onTop_Root(d->root), d);
     }
     if (d->flags & visualOffset_WidgetFlag) {
         removeTicker_App(visualOffsetAnimation_Widget_, d);
@@ -95,10 +96,10 @@ static void aboutToBeDestroyed_Widget_(iWidget *d) {
         return;
     }
     if (flags_Widget(d) & keepOnTop_WidgetFlag) {
-        removeOne_PtrArray(onTop_Root(get_Root()), d);
+        removeOne_PtrArray(onTop_Root(d->root), d);
     }
     if (isHover_Widget(d)) {
-        get_Root()->hover = NULL;
+        d->root->hover = NULL;
     }
     iForEach(ObjectList, i, d->children) {
         aboutToBeDestroyed_Widget_(as_Widget(i.object));
@@ -111,11 +112,10 @@ void destroy_Widget(iWidget *d) {
             postRefresh_App();
         }
         aboutToBeDestroyed_Widget_(d);
-        iRoot *root = get_Root();
-        if (!root->pendingDestruction) {
-            root->pendingDestruction = new_PtrSet();
+        if (!d->root->pendingDestruction) {
+            d->root->pendingDestruction = new_PtrSet();
         }
-        insert_PtrSet(root->pendingDestruction, d);
+        insert_PtrSet(d->root->pendingDestruction, d);
     }
 }
 
@@ -139,7 +139,7 @@ void setFlags_Widget(iWidget *d, int64_t flags, iBool set) {
         }
         iChangeFlags(d->flags, flags, set);
         if (flags & keepOnTop_WidgetFlag) {
-            iPtrArray *onTop = onTop_Root(get_Root());
+            iPtrArray *onTop = onTop_Root(d->root);
             if (set) {
                 iAssert(indexOf_PtrArray(onTop, d) == iInvalidPos);
                 pushBack_PtrArray(onTop, d);
@@ -182,12 +182,16 @@ void setPadding_Widget(iWidget *d, int left, int top, int right, int bottom) {
     d->padding[3] = bottom;
 }
 
+iWidget *root_Widget(const iWidget *d) {
+    return d ? d->root->widget : NULL;
+}
+
 void showCollapsed_Widget(iWidget *d, iBool show) {
     const iBool isVisible = !(d->flags & hidden_WidgetFlag);
     if ((isVisible && !show) || (!isVisible && show)) {
         setFlags_Widget(d, hidden_WidgetFlag, !show);
         /* The entire UI may be affected, if parents are resized due to the (un)collapsing. */
-        arrange_Widget(get_Window()->root.widget);
+        arrange_Widget(root_Widget(d));
         postRefresh_App();
     }
 }
@@ -352,7 +356,7 @@ static size_t numArrangedChildren_Widget_(const iWidget *d) {
 
 static void centerHorizontal_Widget_(iWidget *d) {
     d->rect.pos.x = ((d->parent ? width_Rect(innerRect_Widget_(d->parent))
-                                : size_Root(get_Root()).x) -
+                                : size_Root(d->root).x) -
                      width_Rect(d->rect)) /
                     2;
     TRACE(d, "center horizontally: %d", d->rect.pos.x);
@@ -706,7 +710,7 @@ iBool containsExpanded_Widget(const iWidget *d, iInt2 coord, int expand) {
     const iRect bounds = {
         zero_I2(),
         addY_I2(d->rect.size,
-                d->flags & drawBackgroundToBottom_WidgetFlag ? size_Root(get_Root()).y : 0)
+                d->flags & drawBackgroundToBottom_WidgetFlag ? size_Root(d->root).y : 0)
     };
     return contains_Rect(expand ? expanded_Rect(bounds, init1_I2(expand)) : bounds,
                          localCoord_Widget(d, coord));
@@ -734,24 +738,25 @@ static iBool filterEvent_Widget_(const iWidget *d, const SDL_Event *ev) {
 }
 
 void unhover_Widget(void) {
+    /* TODO: Which root? */
     get_Root()->hover = NULL;
 }
 
 iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
+    iAssert(d->root == get_Root());
     if (!d->parent) {
-        //setCurrent_Root(d);
         if (ev->type == SDL_MOUSEMOTION) {
             /* Hover widget may change. */
             setHover_Widget(NULL);
         }
-        if (get_Root()->focus && isKeyboardEvent_(ev)) {
+        if (d->root->focus && isKeyboardEvent_(ev)) {
             /* Root dispatches keyboard events directly to the focused widget. */
-            if (dispatchEvent_Widget(get_Root()->focus, ev)) {
+            if (dispatchEvent_Widget(d->root->focus, ev)) {
                 return iTrue;
             }
         }
         /* Root offers events first to widgets on top. */
-        iReverseForEach(PtrArray, i, get_Root()->onTop) {
+        iReverseForEach(PtrArray, i, d->root->onTop) {
             iWidget *widget = *i.value;
             if (isVisible_Widget(widget) && dispatchEvent_Widget(widget, ev)) {
 #if 0
@@ -775,7 +780,7 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
         }
     }
     else if (ev->type == SDL_MOUSEMOTION &&
-             (!get_Root()->hover || hasParent_Widget(d, get_Root()->hover)) &&
+             (!d->root->hover || hasParent_Widget(d, d->root->hover)) &&
              flags_Widget(d) & hover_WidgetFlag && ~flags_Widget(d) & hidden_WidgetFlag &&
              ~flags_Widget(d) & disabled_WidgetFlag) {
         if (contains_Widget(d, init_I2(ev->motion.x, ev->motion.y))) {
@@ -793,7 +798,7 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
            handle the events first. */
         iReverseForEach(ObjectList, i, d->children) {
             iWidget *child = as_Widget(i.object);
-            if (child == get_Root()->focus && isKeyboardEvent_(ev)) {
+            if (child == d->root->focus && isKeyboardEvent_(ev)) {
                 continue; /* Already dispatched. */
             }
             if (isVisible_Widget(child) && child->flags & keepOnTop_WidgetFlag) {
@@ -845,8 +850,8 @@ iBool dispatchEvent_Widget(iWidget *d, const SDL_Event *ev) {
 
 static iBool scrollOverflow_Widget_(iWidget *d, int delta) {
     iRect bounds = bounds_Widget(d);
-    const iInt2 rootSize = size_Root(get_Root());
-    const iRect winRect = safeRect_Root(get_Root());
+    const iInt2 rootSize = size_Root(d->root);
+    const iRect winRect = safeRect_Root(d->root);
     const int yTop = top_Rect(winRect);
     const int yBottom = bottom_Rect(winRect);
     //const int safeBottom = rootSize.y - yBottom;
@@ -979,14 +984,14 @@ void drawBackground_Widget(const iWidget *d) {
                 break;
         }
         fillRect_Paint(&p,
-                       rect_Root(get_Root()),
+                       rect_Root(d->root),
                        fadeColor);
         SDL_SetRenderDrawBlendMode(renderer_Window(get_Window()), SDL_BLENDMODE_NONE);
     }
     if (d->bgColor >= 0 || d->frameColor >= 0) {
         iRect rect = bounds_Widget(d);
         if (d->flags & drawBackgroundToBottom_WidgetFlag) {
-            rect.size.y = size_Root(get_Root()).y - top_Rect(rect);
+            rect.size.y = size_Root(d->root).y - top_Rect(rect);
         }
         iPaint p;
         init_Paint(&p);
@@ -994,7 +999,7 @@ void drawBackground_Widget(const iWidget *d) {
 #if defined (iPlatformAppleMobile)
             if (d->flags & (drawBackgroundToHorizontalSafeArea_WidgetFlag |
                             drawBackgroundToVerticalSafeArea_WidgetFlag)) {
-                const iInt2 rootSize = size_Root(get_Root());
+                const iInt2 rootSize = size_Root(d->root);
                 const iInt2 center = divi_I2(rootSize, 2);
                 int top = 0, right = 0, bottom = 0, left = 0;
                 if (d->flags & drawBackgroundToHorizontalSafeArea_WidgetFlag) {
@@ -1058,7 +1063,7 @@ void drawChildren_Widget(const iWidget *d) {
     }
     /* Root draws the on-top widgets on top of everything else. */
     if (!d->parent) {
-        iConstForEach(PtrArray, i, onTop_Root(get_Root())) {
+        iConstForEach(PtrArray, i, onTop_Root(d->root)) {
             const iWidget *top = *i.value;
             draw_Widget(top);
         }
@@ -1175,7 +1180,7 @@ iAny *hitChild_Widget(const iWidget *d, iInt2 coord) {
     }
     /* Check for on-top widgets first. */
     if (!d->parent) {
-        iReverseForEach(PtrArray, i, onTop_Root(get_Root())) {
+        iReverseForEach(PtrArray, i, onTop_Root(d->root)) {
             iWidget *child = i.ptr;
 //            printf("ontop: %s (%s) hidden:%d hittable:%d\n", cstr_String(id_Widget(child)),
 //                   class_Widget(child)->name,
@@ -1263,12 +1268,12 @@ iBool isDisabled_Widget(const iAnyObject *d) {
 
 iBool isFocused_Widget(const iAnyObject *d) {
     iAssert(isInstance_Object(d, &Class_Widget));
-    return get_Root()->focus == d;
+    return ((const iWidget *) d)->root->focus == d;
 }
 
 iBool isHover_Widget(const iAnyObject *d) {
     iAssert(isInstance_Object(d, &Class_Widget));
-    return get_Root()->hover == d;
+    return ((const iWidget *) d)->root->hover == d;
 }
 
 iBool isSelected_Widget(const iAnyObject *d) {
@@ -1314,13 +1319,15 @@ iBool isAffectedByVisualOffset_Widget(const iWidget *d) {
 }
 
 void setFocus_Widget(iWidget *d) {
-    if (get_Root()->focus != d) {
-        if (get_Root()->focus) {
-            iAssert(!contains_PtrSet(get_Root()->pendingDestruction, get_Root()->focus));
-            postCommand_Widget(get_Root()->focus, "focus.lost");
+    iRoot *root = d ? d->root : get_Root();
+    if (root->focus != d) {
+        if (root->focus) {
+            iAssert(!contains_PtrSet(root->pendingDestruction, root->focus));
+            postCommand_Widget(root->focus, "focus.lost");
         }
-        get_Root()->focus = d;
+        root->focus = d;
         if (d) {
+            iAssert(root == d->root);
             iAssert(flags_Widget(d) & focusable_WidgetFlag);
             postCommand_Widget(d, "focus.gained");
         }
@@ -1332,7 +1339,12 @@ iWidget *focus_Widget(void) {
 }
 
 void setHover_Widget(iWidget *d) {
-    get_Root()->hover = d;
+    if (d) {
+        d->root->hover = d;
+    }
+    else {
+        get_Root()->hover = NULL;
+    }
 }
 
 iWidget *hover_Widget(void) {
@@ -1380,7 +1392,7 @@ static const iWidget *findFocusRoot_Widget_(const iWidget *d) {
 }
 
 iAny *findFocusable_Widget(const iWidget *startFrom, enum iWidgetFocusDir focusDir) {
-    const iWidget *root = findFocusRoot_Widget_(get_Window()->root.widget);
+    const iWidget *root = findFocusRoot_Widget_(get_Root()->widget);
     iAssert(root != NULL);
     iBool getNext = (startFrom ? iFalse : iTrue);
     const iWidget *found = findFocusable_Widget_(root, startFrom, &getNext, focusDir);
@@ -1392,14 +1404,21 @@ iAny *findFocusable_Widget(const iWidget *startFrom, enum iWidgetFocusDir focusD
 }
 
 void setMouseGrab_Widget(iWidget *d) {
-    if (get_Root()->mouseGrab != d) {
-        get_Root()->mouseGrab = d;
+    iRoot *root = d ? d->root : get_Root();
+    if (root->mouseGrab != d) {
+        root->mouseGrab = d;
         SDL_CaptureMouse(d != NULL);
     }
 }
 
 iWidget *mouseGrab_Widget(void) {
-    return get_Root()->mouseGrab;
+    iWindow *win = get_Window();    
+    iForIndices(i, win->roots) {
+        if (win->roots[i] && win->roots[i]->mouseGrab) {
+            return win->roots[i]->mouseGrab;            
+        }
+    }
+    return NULL;
 }
 
 void postCommand_Widget(const iAnyObject *d, const char *cmd, ...) {
@@ -1433,7 +1452,7 @@ void refresh_Widget(const iAnyObject *d) {
 }
 
 void raise_Widget(iWidget *d) {
-    iPtrArray *onTop = onTop_Root(get_Root());
+    iPtrArray *onTop = onTop_Root(d->root);
     if (d->flags & keepOnTop_WidgetFlag) {
         iAssert(indexOf_PtrArray(onTop, d) != iInvalidPos);
         removeOne_PtrArray(onTop, d);