commit 67637ca084c37948ec2961a792b299d89f7b8463
parent ebb4c82c90390add807f19d05689ddd9543a8df9
Author: falkTX <falktx@gmail.com>
Date: Mon, 1 Aug 2016 12:28:52 +0200
Merge branch 'master' of github.com:DISTRHO/DPF into HEAD
Diffstat:
4 files changed, 37 insertions(+), 46 deletions(-)
diff --git a/dgl/src/Window.cpp b/dgl/src/Window.cpp
@@ -29,14 +29,12 @@
# include "pugl/pugl_win.cpp"
#elif defined(DISTRHO_OS_MAC)
# include "pugl/pugl_osx.m"
-#elif defined(DISTRHO_OS_LINUX)
+#else
# include <sys/types.h>
# include <unistd.h>
extern "C" {
# include "pugl/pugl_x11.c"
}
-#else
-# error Unsupported platform
#endif
#include "ApplicationPrivateData.hpp"
@@ -81,13 +79,13 @@ struct Window::PrivateData {
fModal(),
#if defined(DISTRHO_OS_WINDOWS)
hwnd(0)
-#elif defined(DISTRHO_OS_LINUX)
- xDisplay(nullptr),
- xWindow(0)
#elif defined(DISTRHO_OS_MAC)
fNeedsIdle(true),
mView(nullptr),
mWindow(nullptr)
+#else
+ xDisplay(nullptr),
+ xWindow(0)
#endif
{
DBG("Creating window without parent..."); DBGF;
@@ -109,26 +107,26 @@ struct Window::PrivateData {
fModal(parent.pData),
#if defined(DISTRHO_OS_WINDOWS)
hwnd(0)
-#elif defined(DISTRHO_OS_LINUX)
- xDisplay(nullptr),
- xWindow(0)
#elif defined(DISTRHO_OS_MAC)
fNeedsIdle(false),
mView(nullptr),
mWindow(nullptr)
+#else
+ xDisplay(nullptr),
+ xWindow(0)
#endif
{
DBG("Creating window with parent..."); DBGF;
init();
const PuglInternals* const parentImpl(parent.pData->fView->impl);
-#if defined(DISTRHO_OS_LINUX)
- XSetTransientForHint(xDisplay, xWindow, parentImpl->win);
-//#elif defined(DISTRHO_OS_MAC)
-// [parentImpl->window orderWindow:NSWindowBelow relativeTo:[[mView window] windowNumber]];
+#if defined(DISTRHO_OS_WINDOWS)
+ // TODO
+#elif defined(DISTRHO_OS_MAC)
+ // TODO
+ //[parentImpl->window orderWindow:NSWindowBelow relativeTo:[[mView window] windowNumber]];
#else
- // unused
- return; (void)parentImpl;
+ XSetTransientForHint(xDisplay, xWindow, parentImpl->win);
#endif
}
@@ -147,13 +145,13 @@ struct Window::PrivateData {
fModal(),
#if defined(DISTRHO_OS_WINDOWS)
hwnd(0)
-#elif defined(DISTRHO_OS_LINUX)
- xDisplay(nullptr),
- xWindow(0)
#elif defined(DISTRHO_OS_MAC)
fNeedsIdle(parentId == 0),
mView(nullptr),
mWindow(nullptr)
+#else
+ xDisplay(nullptr),
+ xWindow(0)
#endif
{
if (fUsingEmbed)
@@ -215,7 +213,7 @@ struct Window::PrivateData {
} else {
DISTRHO_SAFE_ASSERT(mWindow != nullptr);
}
-#elif defined(DISTRHO_OS_LINUX)
+#else
xDisplay = impl->display;
xWindow = impl->win;
DISTRHO_SAFE_ASSERT(xWindow != 0);
@@ -275,7 +273,7 @@ struct Window::PrivateData {
#elif defined(DISTRHO_OS_MAC)
mView = nullptr;
mWindow = nullptr;
-#elif defined(DISTRHO_OS_LINUX)
+#else
xDisplay = nullptr;
xWindow = 0;
#endif
@@ -369,7 +367,7 @@ struct Window::PrivateData {
// TODO
#elif defined(DISTRHO_OS_MAC)
// TODO
-#elif defined(DISTRHO_OS_LINUX)
+#else
int i, wx, wy;
uint u;
::Window w;
@@ -397,7 +395,7 @@ struct Window::PrivateData {
//[NSApp activateIgnoringOtherApps:YES];
//[mWindow makeKeyAndOrderFront:mWindow];
}
-#elif defined(DISTRHO_OS_LINUX)
+#else
XRaiseWindow(xDisplay, xWindow);
XSetInputFocus(xDisplay, xWindow, RevertToPointerRoot, CurrentTime);
XFlush(xDisplay);
@@ -448,7 +446,7 @@ struct Window::PrivateData {
else
[mView setHidden:YES];
}
-#elif defined(DISTRHO_OS_LINUX)
+#else
if (yesNo)
XMapRaised(xDisplay, xWindow);
else
@@ -552,7 +550,7 @@ struct Window::PrivateData {
[[mWindow standardWindowButton:NSWindowZoomButton] setHidden:YES];
}
}
-#elif defined(DISTRHO_OS_LINUX)
+#else
XResizeWindow(xDisplay, xWindow, width, height);
if (! fResizable)
@@ -608,19 +606,19 @@ struct Window::PrivateData {
[mWindow setTitle:titleString];
}
-#elif defined(DISTRHO_OS_LINUX)
+#else
XStoreName(xDisplay, xWindow, title);
#endif
}
void setTransientWinId(const uintptr_t winId)
{
-#if defined(DISTRHO_OS_LINUX)
- XSetTransientForHint(xDisplay, xWindow, static_cast< ::Window>(winId));
+#if defined(DISTRHO_OS_WINDOWS)
+ // TODO
+#elif defined(DISTRHO_OS_MAC)
+ // TODO
#else
- return;
- // unused
- (void)winId;
+ XSetTransientForHint(xDisplay, xWindow, static_cast< ::Window>(winId));
#endif
}
@@ -886,13 +884,13 @@ struct Window::PrivateData {
#if defined(DISTRHO_OS_WINDOWS)
HWND hwnd;
-#elif defined(DISTRHO_OS_LINUX)
- Display* xDisplay;
- ::Window xWindow;
#elif defined(DISTRHO_OS_MAC)
bool fNeedsIdle;
PuglOpenGLView* mView;
id mWindow;
+#else
+ Display* xDisplay;
+ ::Window xWindow;
#endif
// -------------------------------------------------------------------
diff --git a/distrho/extra/ExternalWindow.hpp b/distrho/extra/ExternalWindow.hpp
@@ -19,13 +19,13 @@
#include "String.hpp"
-#ifdef DISTRHO_OS_UNIX
+#ifdef DISTRHO_OS_WINDOWS
+# error Unsupported platform!
+#else
# include <cerrno>
# include <signal.h>
# include <sys/wait.h>
# include <unistd.h>
-#else
-# error Unsupported platform!
#endif
START_NAMESPACE_DISTRHO
diff --git a/distrho/extra/Thread.hpp b/distrho/extra/Thread.hpp
@@ -21,7 +21,7 @@
#include "Sleep.hpp"
#include "String.hpp"
-#ifdef DISTRHO_OS_LINUX_FULL
+#ifdef DISTRHO_OS_LINUX
# include <sys/prctl.h>
#endif
@@ -198,7 +198,7 @@ public:
{
DISTRHO_SAFE_ASSERT_RETURN(name != nullptr && name[0] != '\0',);
-#ifdef DISTRHO_OS_LINUX_FULL
+#ifdef DISTRHO_OS_LINUX
prctl(PR_SET_NAME, name, 0, 0, 0);
#endif
#if defined(__GLIBC__) && (__GLIBC__ * 1000 + __GLIBC_MINOR__) >= 2012
diff --git a/distrho/src/DistrhoDefines.h b/distrho/src/DistrhoDefines.h
@@ -38,17 +38,10 @@
# elif defined(__HAIKU__)
# define DISTRHO_OS_HAIKU 1
# elif defined(__linux__) || defined(__linux)
-# define DISTRHO_OS_LINUX 1
-# define DISTRHO_OS_LINUX_FULL 1
-# elif defined(__FreeBSD__) || defined(__GNU__)
-# define DISTRHO_OS_LINUX 1
+# define DISTRHO_OS_LINUX 1
# endif
#endif
-#if defined(DISTRHO_OS_LINUX) || defined(DISTRHO_OS_MAC)
-# define DISTRHO_OS_UNIX
-#endif
-
#ifndef DISTRHO_DLL_EXTENSION
# define DISTRHO_DLL_EXTENSION "so"
#endif
