3 files changed, 32 insertions, 7 deletions

diff --git a/src/app.c b/src/app.c
index 20c9a399..2192e9ae 100644
--- a/src/app.c
+++ b/src/app.c
@@ -156,18 +156,21 @@ const iString *execPath_App(void) {
 void processEvents_App(void) {
     iApp *d = &app_;
     SDL_Event ev;
-    while (SDL_PollEvent(&ev)) {
+    while (SDL_WaitEvent(&ev)) {
         switch (ev.type) {
             case SDL_QUIT:
                 // if (isModified_Song(d->song)) {
                 //     save_App_(d, autosavePath_App_(d));
                 // }
                 d->running = iFalse;
-                break;
+                goto backToMainLoop;
             case SDL_DROPFILE:
                 postCommandf_App("open url:file://%s", ev.drop.file);
                 break;
             default: {
+                if (ev.type == SDL_USEREVENT && ev.user.code == refresh_UserEventCode) {
+                    goto backToMainLoop;
+                }
                 iBool wasUsed = processEvent_Window(d->window, &ev);
                 if (ev.type == SDL_USEREVENT && ev.user.code == command_UserEventCode) {
 #if defined (iPlatformApple) && !defined (iPlatformIOS)
@@ -180,19 +183,23 @@ void processEvents_App(void) {
                         /* No widget handled the command, so we'll do it. */
                         handleCommand_App(ev.user.data1);
                     }
-                    /* Allocated by postCommand_App(). */
+                    /* Allocated by postCommand_Apps(). */
                     free(ev.user.data1);
                 }
                 break;
             }
         }
     }
+backToMainLoop:;
 }
 
 static void runTickers_App_(iApp *d) {
     /* Tickers may add themselves again, so we'll run off a copy. */
     iSortedArray *pending = copy_SortedArray(&d->tickers);
     clear_SortedArray(&d->tickers);
+    if (!isEmpty_SortedArray(pending)) {
+        postRefresh_App();
+    }
     iConstForEach(Array, i, &pending->values) {
         const iTicker *ticker = i.value;
         if (ticker->callback) {
@@ -208,8 +215,7 @@ static int run_App_(iApp *d) {
     SDL_EventState(SDL_DROPFILE, SDL_ENABLE); /* open files via drag'n'drop */
     while (d->running) {
         runTickers_App_(d);
-        processEvents_App();
-        destroyPending_Widget();
+        processEvents_App(); /* may wait here for a while */
         refresh_App();
     }
     return 0;
@@ -217,6 +223,7 @@ static int run_App_(iApp *d) {
 
 void refresh_App(void) {
     iApp *d = &app_;
+    destroyPending_Widget();
     draw_Window(d->window);
     recycle_Garbage();
 }
@@ -228,6 +235,16 @@ int run_App(int argc, char **argv) {
     return rc;
 }
 
+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);
+}
+
 void postCommand_App(const char *command) {
     SDL_Event ev;
     ev.user.type     = SDL_USEREVENT;
diff --git a/src/app.h b/src/app.h
index 2c877d00..f4a2e18d 100644
--- a/src/app.h
+++ b/src/app.h
@@ -8,6 +8,7 @@ iDeclareType(Window)
 
 enum iUserEventCode {
     command_UserEventCode = 1,
+    refresh_UserEventCode  = 2,
 };
 
 const iString *execPath_App     (void);
@@ -19,6 +20,7 @@ void        refresh_App         (void);
 iAny *      findWidget_App      (const char *id);
 void        addTicker_App       (void (*ticker)(iAny *), iAny *context);
 
+void        postRefresh_App     (void);
 void        postCommand_App     (const char *command);
 void        postCommandf_App    (const char *command, ...);
 
diff --git a/src/ui/window.c b/src/ui/window.c
index 8236bf69..c7ccdeb6 100644
--- a/src/ui/window.c
+++ b/src/ui/window.c
@@ -236,6 +236,7 @@ static void updateRootSize_Window_(iWindow *d) {
     SDL_GetRendererOutputSize(d->render, &size->x, &size->y);
     arrange_Widget(d->root);
     postCommandf_App("window.resized width:%d height:%d", size->x, size->y);
+    postRefresh_App();
 }
 
 static float pixelRatio_Window_(const iWindow *d) {
@@ -260,7 +261,6 @@ void init_Window(iWindow *d) {
     } 
     SDL_SetWindowMinimumSize(d->win, 640, 480);
     SDL_SetWindowTitle(d->win, "Lagrange");
-    SDL_ShowWindow(d->win);
     /* Some info. */ {
         SDL_RendererInfo info;
         SDL_GetRendererInfo(d->render, &info);
@@ -316,7 +316,11 @@ SDL_Renderer *renderer_Window(const iWindow *d) {
 
 static iBool handleWindowEvent_Window_(iWindow *d, const SDL_WindowEvent *ev) {
     switch (ev->event) {
+        case SDL_WINDOWEVENT_MOVED:
+            /* No need to do anything. */
+            return iTrue;
         case SDL_WINDOWEVENT_RESIZED:
+        case SDL_WINDOWEVENT_SIZE_CHANGED:
             updateRootSize_Window_(d);
             return iTrue;
         case SDL_WINDOWEVENT_LEAVE:
@@ -359,6 +363,7 @@ iBool processEvent_Window(iWindow *d, const SDL_Event *ev) {
     return iFalse;
 }
 
+#if 0
 static void waitPresent_Window_(iWindow *d) {
     const double ticksPerFrame = 1000.0 / 60.0;
     uint32_t nowTime = SDL_GetTicks();
@@ -375,6 +380,7 @@ static void waitPresent_Window_(iWindow *d) {
         d->presentTime = nowTime;
     }
 }
+#endif
 
 void draw_Window(iWindow *d) {
     /* Clear the window. */
@@ -392,7 +398,7 @@ void draw_Window(iWindow *d) {
         SDL_RenderCopy(d->render, glyphCache_Text(), NULL, &rect);
     }
 #endif
-    waitPresent_Window_(d);
+//    waitPresent_Window_(d);
     SDL_RenderPresent(d->render);
 }