uiOpenGLArea

.travis.yml

@@ -8,6 +8,7 @@ include: &toolchain_linux_amd64
       update: true
       packages:
         - libgtk-3-dev
+        - libgl1-mesa-dev
 
 include: &toolchain_linux_386
   os: linux
@@ -18,6 +19,7 @@ include: &toolchain_linux_386
         - gcc-multilib
         - g++-multilib
         - libgtk-3-dev:i386
+        - libgl1-mesa-dev:i386
         # the rest fixes broken dependencies of libgtk:i386
         - libgirepository-1.0-1:i386
         - libglib2.0-dev:i386

common/CMakeLists.txt

@@ -3,11 +3,12 @@
 list(APPEND _LIBUI_SOURCES
 	common/attribute.c
 	common/attrlist.c
-	common/attrstr.c
 	common/areaevents.c
+	common/attrstr.c
 	common/control.c
 	common/debug.c
 	common/matrix.c
+	common/opengl.c
 	common/opentype.c
 	common/shouldquit.c
 	common/tablemodel.c

common/controlsigs.h

@@ -17,6 +17,7 @@
 #define uiGroupSignature 0x47727062
 #define uiLabelSignature 0x4C61626C
 #define uiMultilineEntrySignature 0x4D6C6E45
+#define uiOpenGLAreaSignature 0x4F474C41
 #define uiProgressBarSignature 0x50426172
 #define uiRadioButtonsSignature 0x5264696F
 #define uiSeparatorSignature 0x53657061

common/opengl.c

@@ -0,0 +1,95 @@
+// 28 may 2016
+
+#include <stdlib.h>
+#include "../ui.h"
+#include "uipriv.h"
+
+uiOpenGLAttributes *uiNewOpenGLAttributes() {
+    uiOpenGLAttributes *a = uiprivAlloc(sizeof(uiOpenGLAttributes), "uiOpenGLAttributes");
+    if (a == NULL)
+        return NULL;
+
+    //TODO document availability on different platforms
+    // compare with wxWidgets/glcanvas
+
+    a->RedBits = a->GreenBits = a->BlueBits = a->AlphaBits = 8;
+    a->DepthBits = 24;
+    a->StencilBits = 8;
+    a->Stereo = 0;
+    a->Samples = 0;
+    a->SRGBCapable = 0;
+    a->DoubleBuffer = 1;
+    a->UseOpenGLES = 0;
+    a->MajorVersion = 1;
+    a->MinorVersion = 0;
+    a->ForwardCompat = 0;
+    a->DebugContext = 0;
+    a->CompatProfile = 0;
+    a->Robustness = 0;
+
+    return a;
+}
+
+void uiFreeOpenGLAttributes(uiOpenGLAttributes *attribs) {
+    uiprivFree(attribs);
+}
+
+void uiOpenGLAttributesSetAttribute(uiOpenGLAttributes *attribs, uiOpenGLAttribute attribute, int value) {
+    //TODO validate bool params
+    switch (attribute) {
+    case uiOpenGLAttributeRedBits:
+        attribs->RedBits = value;
+        break;
+    case uiOpenGLAttributeGreenBits:
+        attribs->GreenBits = value;
+        break;
+    case uiOpenGLAttributeBlueBits:
+        attribs->BlueBits = value;
+        break;
+    case uiOpenGLAttributeAlphaBits:
+        attribs->AlphaBits = value;
+        break;
+    case uiOpenGLAttributeDepthBits:
+        attribs->DepthBits = value;
+        break;
+    case uiOpenGLAttributeStencilBits:
+        attribs->StencilBits = value;
+        break;
+    case uiOpenGLAttributeStereo:
+        attribs->Stereo = value;
+        break;
+    case uiOpenGLAttributeSamples:
+        attribs->Samples = value;
+        break;
+    case uiOpenGLAttributeSRGBCapable:
+        attribs->SRGBCapable = value;
+        break;
+    case uiOpenGLAttributeDoubleBuffer:
+        attribs->DoubleBuffer = value;
+        break;
+    case uiOpenGLAttributeUseOpenGLES:
+        attribs->UseOpenGLES = value;
+        break;
+    case uiOpenGLAttributeMajorVersion:
+        attribs->MajorVersion = value;
+        break;
+    case uiOpenGLAttributeMinorVersion:
+        attribs->MinorVersion = value;
+        break;
+    case uiOpenGLAttributeForwardCompat:
+        attribs->ForwardCompat = value;
+        break;
+    case uiOpenGLAttributeDebugContext:
+        attribs->DebugContext = value;
+        break;
+    case uiOpenGLAttributeCompatProfile:
+        attribs->CompatProfile = value;
+        break;
+    case uiOpenGLAttributeRobustness:
+        attribs->Robustness = value;
+        break;
+    default:
+        uiprivUserBug("Invalid OpenGL attribute");
+    }
+}
+

common/uipriv.h

@@ -62,6 +62,27 @@ extern void uiprivFallbackTransformSize(uiDrawMatrix *, double *, double *);
 // OS-specific text.* files
 extern int uiprivStricmp(const char *a, const char *b);
 
+// opengl.c
+struct uiOpenGLAttributes {
+	unsigned char RedBits;
+	unsigned char GreenBits;
+	unsigned char BlueBits;
+	unsigned char AlphaBits;
+	unsigned char DepthBits;
+	unsigned char StencilBits;
+	unsigned char Stereo;
+	unsigned char Samples;
+	unsigned char SRGBCapable;
+	unsigned char DoubleBuffer;
+	unsigned char UseOpenGLES;
+	unsigned char MajorVersion;
+	unsigned char MinorVersion;
+	unsigned char ForwardCompat;
+	unsigned char DebugContext;
+	char CompatProfile;
+	unsigned char Robustness;
+};
+
 #ifdef __cplusplus
 }
 #endif

darwin/CMakeLists.txt

@@ -4,6 +4,7 @@ list(APPEND _LIBUI_SOURCES
 	darwin/aat.m
 	darwin/alloc.m
 	darwin/area.m
+	darwin/areacommon.m
 	darwin/areaevents.m
 	darwin/attrstr.m
 	darwin/autolayout.m
@@ -34,6 +35,7 @@ list(APPEND _LIBUI_SOURCES
 	darwin/map.m
 	darwin/menu.m
 	darwin/multilineentry.m
+	darwin/openglarea.m
 	darwin/opentype.m
 	darwin/progressbar.m
 	darwin/radiobuttons.m
@@ -60,5 +62,5 @@ list(APPEND _LIBUI_INCLUDEDIRS
 set(_LIBUI_INCLUDEDIRS _LIBUI_INCLUDEDIRS PARENT_SCOPE)
 
 set(_LIBUI_LIBS
-	objc "-framework Foundation" "-framework AppKit"
+	objc "-framework Foundation" "-framework AppKit" "-framework OpenGL"
 PARENT_SCOPE)