kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/openfl/lime into tvos

Browse Source
This commit is contained in:
Valerio Santinelli
2015-10-02 23:48:02 +02:00
parent c624bb4935 80e0347210
commit 1295c33dea
18 changed files with 317 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

197
project/include/hx/CFFIPrimePatch.h
View File

@@ -309,7 +309,7 @@ struct AutoValue
#define DEFINE_PRIME12v(func) EMSCRIPTEN_BINDINGS(func) { function(#func, &func); }
#else
#elif STATIC_LINK
#define DEFINE_PRIME0(func) extern "C" { \
@@ -555,7 +555,202 @@ struct AutoValue
int __reg_##func##__prime = hx_register_prim(#func "__prime",(void *)(&func##__prime)); \
int __reg_##func = hx_register_prim(#func "__MULT",(void *)(&func##__wrap)); \
}
#else
#define DEFINE_PRIME0(func) extern "C" { \
EXPORT value func##__prime(const char *inSig) { \
if (!cffi::CheckSig0(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap() { return cffi::ToValue( func() ); } \
EXPORT void *func##__0() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME0v(func) extern "C" { \
EXPORT value func##__prime(const char *inSig) { \
if (!cffi::CheckSig0(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap() { func(); return alloc_null(); } \
EXPORT void *func##__0() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME1(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig1(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL1) { return cffi::ToValue( func(PRIME_ARG_LIST1) ); } \
EXPORT void *func##__1() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME1v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig1(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL1) { func(PRIME_ARG_LIST1); return alloc_null(); } \
EXPORT void *func##__1() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME2(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig2(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL2) { return cffi::ToValue( func(PRIME_ARG_LIST2) ); } \
EXPORT void *func##__2() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME2v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig2(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL2) { func(PRIME_ARG_LIST2); return alloc_null(); } \
EXPORT void *func##__2() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME3(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig3(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL3) { return cffi::ToValue( func(PRIME_ARG_LIST3) ); } \
EXPORT void *func##__3() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME3v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig3(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL3) { func(PRIME_ARG_LIST3); return alloc_null(); } \
EXPORT void *func##__3() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME4(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig4(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL4) { return cffi::ToValue( func(PRIME_ARG_LIST4) ); } \
EXPORT void *func##__4() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME4v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig4(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL4) { func(PRIME_ARG_LIST4); return alloc_null(); } \
EXPORT void *func##__4() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME5(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig5(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL5) { return cffi::ToValue( func(PRIME_ARG_LIST5) ); } \
EXPORT void *func##__5() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME5v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig5(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(PRIME_ARG_DECL5) { func(PRIME_ARG_LIST5); return alloc_null(); } \
EXPORT void *func##__5() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME6(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig6(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST6) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME6v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig6(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST6); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME7(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig7(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST7) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME7v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig7(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST7); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME8(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig8(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST8) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME8v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig8(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST8); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME9(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig9(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST9) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME9v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig9(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST9); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME10(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig10(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
}
#define DEFINE_PRIME10v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig10(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST10); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME11(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig11(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST11) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME11v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig11(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST11); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME12(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig12(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg,int) { return cffi::ToValue( func(PRIME_ARG_LIST12) ); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#define DEFINE_PRIME12v(func) extern "C" { \
EXPORT void *func##__prime(const char *inSig) { \
if (!cffi::CheckSig12(func,inSig)) return 0; return cffi::alloc_pointer((void*)&func); } \
value func##__wrap(cffi::AutoValue *arg, int) { func(PRIME_ARG_LIST12); return alloc_null(); } \
EXPORT void *func##__MULT() { return (void*)(&func##__wrap); } \
}
#endif
#endif

2
project/include/system/System.h
View File

@@ -25,10 +25,12 @@ namespace lime {
public:
static bool GetAllowScreenTimeout ();
static const char* GetDirectory (SystemDirectory type, const char* company, const char* title);
static value GetDisplay (int id);
static int GetNumDisplays ();
static double GetTimer ();
static bool SetAllowScreenTimeout (bool allow);
};

2
project/lib/cairo

Submodule project/lib/cairo updated: 2fd93965af...c60810bb17

2
project/lib/openal

Submodule project/lib/openal updated: af000b4b1f...77986fa62e

2
project/lib/pixman

Submodule project/lib/pixman updated: d42fc0b903...e9f96d9847

2
project/lib/png

Submodule project/lib/png updated: 601ea3ce9b...31ee91f734

16
project/src/ExternalInterface.cpp
View File

@@ -1029,6 +1029,13 @@ namespace lime {
}
bool lime_system_get_allow_screen_timeout () {
return System::GetAllowScreenTimeout ();
}
value lime_system_get_directory (int type, HxString company, HxString title) {
const char* path = System::GetDirectory ((SystemDirectory)type, company.__s, title.__s);
@@ -1058,6 +1065,13 @@ namespace lime {
}
bool lime_system_set_allow_screen_timeout (bool allow) {
return System::SetAllowScreenTimeout (allow);
}
void lime_text_event_manager_register (value callback, value eventObject) {
TextEvent::callback = new AutoGCRoot (callback);
@@ -1359,10 +1373,12 @@ namespace lime {
DEFINE_PRIME1v (lime_renderer_unlock);
DEFINE_PRIME2v (lime_render_event_manager_register);
DEFINE_PRIME2v (lime_sensor_event_manager_register);
DEFINE_PRIME0 (lime_system_get_allow_screen_timeout);
DEFINE_PRIME3 (lime_system_get_directory);
DEFINE_PRIME1 (lime_system_get_display);
DEFINE_PRIME0 (lime_system_get_num_displays);
DEFINE_PRIME0 (lime_system_get_timer);
DEFINE_PRIME1 (lime_system_set_allow_screen_timeout);
DEFINE_PRIME2v (lime_text_event_manager_register);
DEFINE_PRIME3 (lime_text_layout_create);
DEFINE_PRIME5 (lime_text_layout_position);

24
project/src/backend/sdl/SDLSystem.cpp
View File

@@ -80,6 +80,13 @@ namespace lime {
}
bool System::GetAllowScreenTimeout () {
return SDL_IsScreenSaverEnabled ();
}
const char* System::GetDirectory (SystemDirectory type, const char* company, const char* title) {
switch (type) {
@@ -312,6 +319,23 @@ namespace lime {
}
bool System::SetAllowScreenTimeout (bool allow) {
if (allow) {
SDL_EnableScreenSaver ();
} else {
SDL_DisableScreenSaver ();
}
return allow;
}
FILE* FILE_HANDLE::getFile () {
#ifndef HX_WINDOWS