interesting
/
libui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started writing the controls Darwin-specific code and all-platforms tests for real.

This commit is contained in:
Pietro Gagliardi 2019-06-10 23:09:35 -04:00
parent 89f64eb067
commit 6903bebe7d
6 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
darwin/control.m
View File

@ -3,12 +3,18 @@
bool uiprivOSVtableValid(uiControlOSVtable *osVtable, const char *func)
{
// TODO
if (vtable->Size != sizeof (uiControlOSVtable)) {
uiprivProgrammerErrorWrongStructSize(vtable->Size, "uiControlOSVtable", func);
return false;
}
return true;
}
uiControlOSVtable *uiprivCloneOSVtable(uiControlOSVtable *osVtable)
{
// TODO
return NULL;
uiControlOSVtable *v2;
v2 = uiprivNew(uiControlOSVtable);
*v2 = *osVtable;
return v2;
}

6
test/controls.c
View File

@ -3,10 +3,6 @@
#if 0
struct testOSVtable {
void (*TestMethod)(uiControl *c, void *implData);
};
struct testOSImplData {
bool initCalled;
bool *freeCalled;
@ -28,7 +24,7 @@ static void testVtableTestMethod(uiControl *c, void *implData)
// do nothing
}
static void createTestVtables(uiControlVtable *vtable, struct testOSVtable *osVtable)
static void createTestVtables(uiControlVtable *vtable, uiControlOSVtable **osVtable)
{
memset(&vtable, 0, sizeof (uiControlVtable));
vtable.Size = sizeof (uiControlVtable);

14
test/controls_darwin.m Normal file
View File

@ -0,0 +1,14 @@
// 10 june 2019
#import "test_darwin.h"
uiControlOSVtable *allocOSVtableFull(testingT *t, const char *file, long line)
{
uiControlOSVtable *v;
v = (uiControlOSVtable *) malloc(sizeof (uiControlOSVtable));
if (v == NULL)
testingTFatalfFull(t, file, line, "memory exhausted allocating uiControlOSVtable");
memset(v, 0, sizeof (uiControlOSVtable));
v->Size = sizeof (uiControlOSVtable);
return v;
}

14
test/meson.build
View File

@ -9,6 +9,20 @@ libui_test_sources = [
'noinitwrongthread.c',
]
if libui_OS == 'windows'
libui_test_sources += [
'controls_windows.c',
]
else if libui_OS == 'darwin'
libui_test_sources += [
'controls_darwin.m',
]
else
libui_test_sources += [
'controls_unix.c',
]
endif
if libui_OS == 'windows'
libui_test_sources += [
windows.compile_resources('resources_' + libui_mode + '.rc',

7
test/test.h
View File

@ -5,6 +5,9 @@
#include <stdlib.h>
#include <string.h>
#include "../ui.h"
#ifdef libuiOSHeader
#include libuiOSHeader
#endif
#include "../common/testhooks.h"
#include "lib/testing.h"
#include "lib/thread.h"
@ -34,3 +37,7 @@ extern testingSet *beforeTests;
extern void checkProgrammerErrorFull(testingT *t, const char *file, long line, const char *name, void (*f)(void *data), void *data, const char *msgWant, bool inThread);
#define checkProgrammerError(t, name, f, data, msgWant) checkProgrammerErrorFull(t, __FILE__, __LINE__, name, f, data, msgWant, false)
#define checkProgrammerErrorInThread(t, name, f, data, msgWant) checkProgrammerErrorFull(t, __FILE__, __LINE__, name, f, data, msgWant, true)
// controls.c
extern uiControlOSVtable *allocOSVtableFull(testingT *t, const char *file, long line);
#define allocOSVtable(t) allocOSVtableFull(t, __FILE__, __LINE__)

3
test/test_darwin.h Normal file
View File

@ -0,0 +1,3 @@
// 10 june 2019
#define libuiOSHeader "../ui_darwin.h"
#include "test.h"