More haiku tests & changes (full mouse tracking, lock looper)

6 files changed, 158 insertions, 50 deletions

diff --git a/dgl/ImageWidgets.hpp b/dgl/ImageWidgets.hpp
index 0e1e1ddd..ac8a3abb 100644
--- a/dgl/ImageWidgets.hpp
+++ b/dgl/ImageWidgets.hpp
@@ -25,8 +25,13 @@ START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
 
+#ifndef DISTRHO_OS_HAIKU
 class ImageAboutWindow : public Window,
                          public Widget
+#else
+// crash when creating or opening 2nd window
+class ImageAboutWindow
+#endif
 {
 public:
     explicit ImageAboutWindow(Window& parent, const Image& image = Image());
@@ -34,11 +39,15 @@ public:
 
     void setImage(const Image& image);
 
+#ifndef DISTRHO_OS_HAIKU
 protected:
     void onDisplay() override;
     bool onKeyboard(const KeyboardEvent&) override;
     bool onMouse(const MouseEvent&) override;
     void onReshape(uint width, uint height) override;
+#else
+    void exec() {}
+#endif
 
 private:
     Image fImgBackground;
diff --git a/dgl/src/ImageWidgets.cpp b/dgl/src/ImageWidgets.cpp
index 71276e36..de94ca02 100644
--- a/dgl/src/ImageWidgets.cpp
+++ b/dgl/src/ImageWidgets.cpp
@@ -25,6 +25,7 @@ START_NAMESPACE_DGL
 
 // -----------------------------------------------------------------------
 
+#ifndef DISTRHO_OS_HAIKU
 ImageAboutWindow::ImageAboutWindow(Window& parent, const Image& image)
     : Window(parent.getApp(), parent),
       Widget((Window&)*this),
@@ -44,6 +45,10 @@ ImageAboutWindow::ImageAboutWindow(Widget* widget, const Image& image)
     Window::setSize(image.getSize());
     Window::setTitle("About");
 }
+#else
+ImageAboutWindow::ImageAboutWindow(Window& parent, const Image& image) : fImgBackground(image) {}
+ImageAboutWindow::ImageAboutWindow(Widget* widget, const Image& image) : fImgBackground(image) {}
+#endif
 
 void ImageAboutWindow::setImage(const Image& image)
 {
@@ -51,9 +56,12 @@ void ImageAboutWindow::setImage(const Image& image)
         return;
 
     fImgBackground = image;
+#ifndef DISTRHO_OS_HAIKU
     Window::setSize(image.getSize());
+#endif
 }
 
+#ifndef DISTRHO_OS_HAIKU
 void ImageAboutWindow::onDisplay()
 {
     fImgBackground.draw();
@@ -86,6 +94,7 @@ void ImageAboutWindow::onReshape(uint width, uint height)
     Widget::setSize(width, height);
     Window::onReshape(width, height);
 }
+#endif
 
 // -----------------------------------------------------------------------
 
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
index 0e2e5b46..61218b08 100644
--- a/dgl/src/Window.cpp
+++ b/dgl/src/Window.cpp
@@ -468,9 +468,17 @@ struct Window::PrivateData {
         DBG("Window focus\n");
 #if defined(DISTRHO_OS_HAIKU)
         if (bWindow != nullptr)
-            bWindow->Activate(true);
+        {
+            if (bWindow->LockLooper())
+            {
+                bWindow->Activate(true);
+                bWindow->UnlockLooper();
+            }
+        }
         else
+        {
             bView->MakeFocus(true);
+        }
 #elif defined(DISTRHO_OS_MAC)
         if (mWindow != nullptr)
             [mWindow makeKeyWindow];
@@ -510,17 +518,17 @@ struct Window::PrivateData {
 #if defined(DISTRHO_OS_HAIKU)
         if (bWindow != nullptr)
         {
-            if (yesNo)
+            if (bWindow->LockLooper())
             {
+                if (yesNo)
+                    bWindow->Show();
+                else
+                    bWindow->Hide();
 
-        bView->Show();
-                bWindow->Show();
+                // TODO use flush?
+                bWindow->Sync();
+                bWindow->UnlockLooper();
             }
-            else
-                bWindow->Hide();
-
-            // TODO use flush?
-            bWindow->Sync();
         }
         else
         {
@@ -685,12 +693,15 @@ struct Window::PrivateData {
 #if defined(DISTRHO_OS_HAIKU)
         bView->ResizeTo(width, height);
 
-        if (bWindow != nullptr)
+        if (bWindow != nullptr && bWindow->LockLooper())
         {
+            bWindow->MoveTo(50, 50);
             bWindow->ResizeTo(width, height);
 
             if (! forced)
                 bWindow->Flush();
+
+            bWindow->UnlockLooper();
         }
         // TODO resizable
 #elif defined(DISTRHO_OS_MAC)
@@ -770,8 +781,11 @@ struct Window::PrivateData {
         fTitle = strdup(title);
 
 #if defined(DISTRHO_OS_HAIKU)
-        if (bWindow != nullptr)
+        if (bWindow != nullptr&& bWindow->LockLooper())
+        {
             bWindow->SetTitle(title);
+            bWindow->UnlockLooper();
+        }
 #elif defined(DISTRHO_OS_MAC)
         if (mWindow != nullptr)
         {
@@ -857,9 +871,9 @@ struct Window::PrivateData {
 #ifdef DISTRHO_OS_HAIKU
         if (bApplication != nullptr)
         {
-            bApplication->Lock();
+            // bApplication->Lock();
             // bApplication->Loop();
-            bApplication->Unlock();
+            // bApplication->Unlock();
         }
 #endif
 
diff --git a/dgl/src/pugl/pugl_haiku.cpp b/dgl/src/pugl/pugl_haiku.cpp
index 7a241efa..d7f8dca3 100644
--- a/dgl/src/pugl/pugl_haiku.cpp
+++ b/dgl/src/pugl/pugl_haiku.cpp
@@ -71,18 +71,12 @@ puglDisplay(PuglView* view)
 	puglLeaveContext(view, true);
 }
 
-PuglInternals*
-puglInitInternals()
-{
-	return (PuglInternals*)calloc(1, sizeof(PuglInternals));
-}
-
 void
 puglEnterContext(PuglView* view)
 {
-#ifdef PUGL_OPENGL
 	PuglInternals* impl = view->impl;
 
+#ifdef PUGL_OPENGL
     // FIXME without the first unlock we freeze
     impl->view->UnlockGL();
     impl->view->LockGL();
@@ -92,16 +86,22 @@ puglEnterContext(PuglView* view)
 void
 puglLeaveContext(PuglView* view, bool flush)
 {
-#ifdef PUGL_OPENGL
 	PuglInternals* impl = view->impl;
 
+#ifdef PUGL_OPENGL
     if (flush)
-       impl->view->SwapBuffers(true);
+       impl->view->SwapBuffers();
 
     impl->view->UnlockGL();
 #endif
 }
 
+PuglInternals*
+puglInitInternals()
+{
+	return (PuglInternals*)calloc(1, sizeof(PuglInternals));
+}
+
 class DView : public BViewType
 {
 public:
@@ -114,41 +114,62 @@ public:
 
 #ifdef PUGL_OPENGL
     DView(PuglView* const v)
-        : BGLView(BRect(512.0f),
+        : BGLView(BRect(), // causes "bitmap bounds is much too large: BRect(0.0, 0.0, 4294967296.0, 4294967296.0)"
                   "DPF-GLView",
                   0x0, // resize mode
-                  B_FULL_UPDATE_ON_RESIZE|B_WILL_DRAW|B_FRAME_EVENTS|B_NAVIGABLE|B_INPUT_METHOD_AWARE,
-                  BGL_RGB /*|BGL_DOUBLE|BGL_ALPHA|BGL_DEPTH|BGL_STENCIL*/),
-          puglView(v) {}
+                  B_FULL_UPDATE_ON_RESIZE|B_WILL_DRAW|B_NAVIGABLE_JUMP|B_FRAME_EVENTS|B_NAVIGABLE|B_INPUT_METHOD_AWARE,
+                  BGL_RGB|BGL_DOUBLE|BGL_ALPHA|BGL_DEPTH|BGL_STENCIL),
+          puglView(v)
+    {
+    }
 #endif
 
 protected:
+    void GetPreferredSize(float* width, float* height) override
+    {
+        d_stdout("%s %i", __func__, __LINE__);
+        if (width != nullptr)
+            *width = puglView->width;
+        if (height != nullptr)
+            *height = puglView->height;
+        d_stdout("%s %i", __func__, __LINE__);
+    }
+    
     void Draw(BRect updateRect) override
     {
         d_stdout("%s %i", __func__, __LINE__);
         puglDisplay(puglView);
-        d_stdout("%s %i", __func__, __LINE__);
-        
 #ifdef PUGL_OPENGL
         BGLView::Draw(updateRect);
-#endif
         d_stdout("%s %i", __func__, __LINE__);
+#endif
+    }
+
+    void MessageReceived(BMessage* message)
+    {
+        d_stdout("MessageReceived %p", message);
+        BViewType::MessageReceived(message);
     }
 
     void MouseDown(BPoint where) override
     {
         if (puglView->mouseFunc) {
 			// puglView->event_timestamp_ms = GetMessageTime();
+            d_stdout("MouseDown mask %u", EventMask());
             puglView->mouseFunc(puglView, 1, true, where.x, where.y);
+            SetMouseEventMask(B_POINTER_EVENTS, B_LOCK_WINDOW_FOCUS);
         }
+        //BViewType::MouseDown(where);
     }
 
     void MouseUp(BPoint where) override
     {
         if (puglView->mouseFunc) {
+            d_stdout("MouseUp mask %u", EventMask());
 			// puglView->event_timestamp_ms = GetMessageTime();
             puglView->mouseFunc(puglView, 1, false, where.x, where.y);
         }
+        //BViewType::MouseUp(where);
     }
 
     void MouseMoved(BPoint where, uint32, const BMessage*) override
@@ -161,7 +182,7 @@ protected:
 
     void KeyDown(const char* bytes, int32 numBytes) override
     {
-        d_stdout("KeyDown %s %i", bytes, numBytes);
+        d_stdout("KeyDown %i", numBytes);
         if (numBytes != 1)
             return; // TODO
         
@@ -172,6 +193,7 @@ protected:
 
     void KeyUp(const char* bytes, int32 numBytes) override
     {
+        d_stdout("KeyUp %i", numBytes);
         if (numBytes != 1)
             return; // TODO
         
@@ -179,18 +201,17 @@ protected:
             puglView->keyboardFunc(puglView, false, bytes[0]);
         }
     }
+    
+    void ScrollTo(BPoint where) override
+    {
+            d_stdout("ScrollTo mask %u", EventMask());
+        BViewType::ScrollTo(where);
+    }
 
     void FrameResized(float newWidth, float newHeight) override
     {
         d_stdout("%s %i", __func__, __LINE__);
-        const int width  = static_cast<int>(newWidth);
-        const int height = static_cast<int>(newHeight);
-
-		puglReshape(puglView, width, height);
-        d_stdout("%s %i", __func__, __LINE__);
-		puglView->width = width;
-		puglView->height = height;
-        d_stdout("%s %i", __func__, __LINE__);
+		puglReshape(puglView, static_cast<int>(newWidth), static_cast<int>(newHeight));
 #ifdef PUGL_OPENGL
         BGLView::FrameResized(newWidth, newHeight);
 #endif
@@ -241,6 +262,7 @@ puglCreateWindow(PuglView* view, const char* title)
 
     if (be_app == nullptr)
     {
+        d_stdout("creating app");
         status_t status;
         BApplication* const app = new BApplication("application/x-vnd.dpf-application", &status);
 
@@ -253,6 +275,10 @@ puglCreateWindow(PuglView* view, const char* title)
 
         impl->app = app;
     }
+    else
+    {
+        d_stdout("using existing app");
+    }
     
 	if (view->parent == 0) {
         impl->window = new DWindow(view);
@@ -273,7 +299,8 @@ puglCreateWindow(PuglView* view, const char* title)
     }
     
     impl->window->AddChild(impl->view);
-    puglEnterContext(view);
+    impl->view->LockGL();
+    //puglEnterContext(view);
     impl->window->Unlock();
     return 0;
 }
@@ -284,9 +311,17 @@ puglShowWindow(PuglView* view)
 	PuglInternals* impl = view->impl;
 
     if (impl->window != nullptr)
-        impl->window->Show();
+    {
+        if (impl->window->LockLooper())
+        {
+            impl->window->Show();
+            impl->window->UnlockLooper();
+        }
+    }
     else
+    {
         impl->view->Show();
+    }
 }
 
 void
@@ -295,9 +330,17 @@ puglHideWindow(PuglView* view)
 	PuglInternals* impl = view->impl;
 
     if (impl->window != nullptr)
-        impl->window->Hide();
+    {
+        if (impl->window->LockLooper())
+        {
+            impl->window->Hide();
+            impl->window->UnlockLooper();
+        }
+    }
     else
+    {
         impl->view->Show();
+    }
 }
 
 void
@@ -338,8 +381,22 @@ puglProcessEvents(PuglView* view)
 void
 puglPostRedisplay(PuglView* view)
 {
+	PuglInternals* impl = view->impl;
+
 	view->redisplay = true;
-    view->impl->view->Invalidate();
+
+    if (impl->window != nullptr)
+    {
+        if (impl->window->LockLooper())
+        {
+            impl->view->Invalidate();
+            impl->window->UnlockLooper();
+        }
+    }
+    else
+    {
+        impl->view->Invalidate();
+    }
 }
 
 PuglNativeWindow
@@ -351,7 +408,7 @@ puglGetNativeWindow(PuglView* view)
     // return (PuglNativeWindow)impl->view->EmbeddedView();
 #endif
 
-	return (PuglNativeWindow)impl->view;
+	return (PuglNativeWindow)(BView*)impl->view;
 }
 
 void*
@@ -366,11 +423,18 @@ puglUpdateGeometryConstraints(PuglView* view, int min_width, int min_height, boo
 	PuglInternals* impl = view->impl;
 
     d_stdout("puglUpdateGeometryConstraints %i %i %i %i", min_width, min_height, view->width, view->height);
-    impl->window->SetSizeLimits(min_width,
-                                view->user_resizable ? 4096 : min_width,
-                                min_height,
-                                view->user_resizable ? 4096 : min_height);
-	return 0;
+    if (impl->window->LockLooper())
+    {
+        impl->window->SetSizeLimits(min_width,
+                                    view->user_resizable ? 4096 : min_width,
+                                    min_height,
+                                    view->user_resizable ? 4096 : min_height);
+
+        impl->window->UnlockLooper();
+        return 0;
+    }
+
+    return 1;
 
     // TODO
 	(void)aspect;
diff --git a/distrho/src/DistrhoUIDSSI.cpp b/distrho/src/DistrhoUIDSSI.cpp
index b11e1d0f..b259c6e0 100644
--- a/distrho/src/DistrhoUIDSSI.cpp
+++ b/distrho/src/DistrhoUIDSSI.cpp
@@ -149,9 +149,12 @@ public:
         fUI.setSampleRate(sampleRate, true);
     }
 
-    void dssiui_show()
+    void dssiui_show(const bool focus = false)
     {
         fUI.setWindowVisible(true);
+
+        if (focus)
+            fUI.focus();
     }
 
     void dssiui_hide()
@@ -389,7 +392,7 @@ int main(int argc, char* argv[])
         gUiTitle = "DSSI UI Test";
 
         initUiIfNeeded();
-        globalUI->dssiui_show();
+        globalUI->dssiui_show(true);
         globalUI->exec();
 
         delete globalUI;
diff --git a/distrho/src/DistrhoUIInternal.hpp b/distrho/src/DistrhoUIInternal.hpp
index f1ebb332..08fa089d 100644
--- a/distrho/src/DistrhoUIInternal.hpp
+++ b/distrho/src/DistrhoUIInternal.hpp
@@ -406,6 +406,10 @@ public:
         return true;
     }
 
+    void focus()
+    {
+    }
+
     void quit()
     {
         DISTRHO_SAFE_ASSERT_RETURN(fUI != nullptr,);
@@ -430,6 +434,11 @@ public:
             fUI->uiIdle();
     }
 
+    void focus()
+    {
+        glWindow.focus();
+    }
+
     bool idle()
     {
         DISTRHO_SAFE_ASSERT_RETURN(fUI != nullptr, false);