From a739e6116f026e2fe334f447082616712a1cfd78 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Tue, 13 May 2014 15:30:36 +0000
Subject: Fix non-extensible puglInit API. Fix memory leak.

---
 pugl/pugl_x11.c | 72 +++++++++++++++++++++++++++++++--------------------------
 1 file changed, 39 insertions(+), 33 deletions(-)

(limited to 'pugl/pugl_x11.c')

diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c
index 8e1de69..ce3547f 100644
--- a/pugl/pugl_x11.c
+++ b/pugl/pugl_x11.c
@@ -65,23 +65,16 @@ static int attrListDbl[] = {
 	None
 };
 
-PuglView*
-puglCreate(PuglNativeWindow parent,
-           const char*      title,
-           int              width,
-           int              height,
-           bool             resizable,
-           bool             visible)
+PuglInternals*
+puglInitInternals()
 {
-	PuglView*      view = (PuglView*)calloc(1, sizeof(PuglView));
-	PuglInternals* impl = (PuglInternals*)calloc(1, sizeof(PuglInternals));
-	if (!view || !impl) {
-		return NULL;
-	}
+	return (PuglInternals*)calloc(1, sizeof(PuglInternals));
+}
 
-	view->impl   = impl;
-	view->width  = width;
-	view->height = height;
+int
+puglCreateWindow(PuglView* view, const char* title)
+{
+	PuglInternals* impl = view->impl;
 
 	impl->display = XOpenDisplay(0);
 	impl->screen  = DefaultScreen(impl->display);
@@ -102,8 +95,8 @@ puglCreate(PuglNativeWindow parent,
 
 	impl->ctx = glXCreateContext(impl->display, vi, 0, GL_TRUE);
 
-	Window xParent = parent
-		? (Window)parent
+	Window xParent = view->parent
+		? (Window)view->parent
 		: RootWindow(impl->display, impl->screen);
 
 	Colormap cmap = XCreateColormap(
@@ -128,12 +121,12 @@ puglCreate(PuglNativeWindow parent,
 
 	XSizeHints sizeHints;
 	memset(&sizeHints, 0, sizeof(sizeHints));
-	if (!resizable) {
+	if (!view->resizable) {
 		sizeHints.flags      = PMinSize|PMaxSize;
-		sizeHints.min_width  = width;
-		sizeHints.min_height = height;
-		sizeHints.max_width  = width;
-		sizeHints.max_height = height;
+		sizeHints.min_width  = view->width;
+		sizeHints.min_height = view->height;
+		sizeHints.max_width  = view->width;
+		sizeHints.max_height = view->height;
 		XSetNormalHints(impl->display, impl->win, &sizeHints);
 	}
 
@@ -141,15 +134,11 @@ puglCreate(PuglNativeWindow parent,
 		XStoreName(impl->display, impl->win, title);
 	}
 
-	if (!parent) {
+	if (!view->parent) {
 		Atom wmDelete = XInternAtom(impl->display, "WM_DELETE_WINDOW", True);
 		XSetWMProtocols(impl->display, impl->win, &wmDelete, 1);
 	}
 
-	if (visible) {
-		XMapRaised(impl->display, impl->win);
-	}
-
 	if (glXIsDirect(impl->display, impl->ctx)) {
 		PUGL_LOG("DRI enabled (to disable, set LIBGL_ALWAYS_INDIRECT=1\n");
 	} else {
@@ -158,7 +147,23 @@ puglCreate(PuglNativeWindow parent,
 
 	XFree(vi);
 
-	return view;
+	return 0;
+}
+
+PUGL_API void
+puglShowWindow(PuglView* view)
+{
+	PuglInternals* impl = view->impl;
+
+	XMapRaised(impl->display, impl->win);
+}
+
+void
+puglHideWindow(PuglView* view)
+{
+	PuglInternals* impl = view->impl;
+
+	XUnmapWindow(impl->display, impl->win);
 }
 
 void
@@ -355,15 +360,16 @@ puglProcessEvents(PuglView* view)
 			}
 			dispatchKey(view, &event, false);
 			break;
-		case ClientMessage:
-			if (!strcmp(XGetAtomName(view->impl->display,
-			                         event.xclient.message_type),
-			            "WM_PROTOCOLS")) {
+		case ClientMessage: {
+			char* type = XGetAtomName(view->impl->display,
+			                          event.xclient.message_type);
+			if (!strcmp(type, "WM_PROTOCOLS")) {
 				if (view->closeFunc) {
 					view->closeFunc(view);
 				}
 			}
-			break;
+			XFree(type);
+		} break;
 #ifdef PUGL_GRAB_FOCUS
 		case EnterNotify:
 			XSetInputFocus(view->impl->display,
-- 
cgit v1.2.3