Changeset 86 for trunk/orca

Timestamp:

03/11/06 17:42:43 (3 years ago)

Author:

krobillard

Message:

Added OR_NATIVE macros. The Qt and GL code now uses this macro.

Location:

trunk/orca

Files:

• gl/dlist.c (modified) (1 diff)
• gl/gx.c (modified) (28 diffs)
• gl/ttf_load.c (modified) (1 diff)
• ovalue.h (modified) (1 diff)
• qt/qorca.cpp (modified) (15 diffs)

trunk/orca/gl/dlist.c

@@ -490 +490 @@
    Compile render program.
 */
-void renderProgramNative( OValue* a1 )
+OR_NATIVE_PUB( renderProgramNative )
 {
     OValue* error;

trunk/orca/gl/gx.c

@@ -664 +664 @@
 
 
-void compileNative( OValue* a1 )
+OR_NATIVE( compileNative )
 {
     OBlock* blk;
@@ -700 +700 @@
 
 
-void callNative( OValue* a1 )
+OR_NATIVE( callNative )
 {
     if( a1->type == OT_INTEGER )
@@ -715 +715 @@
 
 
-void displayNative( OValue* a1 )
+OR_NATIVE( displayNative )
 {
     GLViewMode mode;
@@ -762 +762 @@
 
 
-void displayModesNative( OValue* a1 )
+OR_NATIVE( displayModesNative )
 {
     OBlock* blk;
@@ -1007 +1007 @@
 #define colorU8ToF(n)    (((GLfloat) n) / 255.0f)
 
-void clearColorNative( OValue* a1 )
+OR_NATIVE( clearColorNative )
 {
     switch( a1->type )
@@ -1035 +1035 @@
 #define RELEASE(h)  if( orHoldIsValid(h) ) orRelease(h)
 
-void execNative( OValue* a1 )
+OR_NATIVE( execNative )
 {
 #ifdef PERF_CLOCK
@@ -1090 +1090 @@
 
 
-void playNative( OValue* a1 )
+OR_NATIVE( playNative )
 {
     if( a1->type == OT_FILE )
@@ -1160 +1160 @@
   center [none! matrix! vec3!]
 */
-void orthoViewNative( OValue* a1 )
+OR_NATIVE( orthoViewNative )
 {
     OBlock* vblk;
@@ -1222 +1222 @@
 
 
-void viewportNative( OValue* a1 )
+OR_NATIVE( viewportNative )
 {
     OBlock* vblk;
@@ -1264 +1264 @@
 
 
-void renderStateNative( OValue* a1 )
+OR_NATIVE( renderStateNative )
 {
     if( a1->type == OT_WORD )
@@ -1294 +1294 @@
 
 
-void renderTextNative( OValue* a1 )
+OR_NATIVE( renderTextNative )
 {
     FontResource* fnt;
@@ -1321 +1321 @@
 
 
-void pushNative( OValue* a1 )
+OR_NATIVE( pushNative )
 {
     (void) a1;
@@ -1328 +1328 @@
 
 
-void popNative( OValue* a1 )
+OR_NATIVE( popNative )
 {
     (void) a1;
@@ -1335 +1335 @@
 
 
-void translateNative( OValue* a1 )
+OR_NATIVE( translateNative )
 {
     GLdouble n[3];
@@ -1345 +1345 @@
 
 #if 0
-void rotateNative( OValue* a1 )
+OR_NATIVE( rotateNative )
 {
     GLdouble n[4];
@@ -1354 +1354 @@
 
 
-void scaleNative( OValue* a1 )
+OR_NATIVE( scaleNative )
 {
     GLdouble n[3];
@@ -1362 +1362 @@
 
 
-void pushMatrixNative( OValue* a1 )
+OR_NATIVE( pushMatrixNative )
 {
     OString* arr = orSTRING(a1);
@@ -1371 +1371 @@
 
 
-void moveNative( OValue* a1 )
+OR_NATIVE( moveNative )
 {
     if( a1->type == OT_MATRIX )
@@ -1400 +1400 @@
 
 
-void rotateNative( OValue* a1 )
+OR_NATIVE( rotateNative )
 {
     double angle;
@@ -1427 +1427 @@
 
 
-void keyRepeatNative( OValue* a1 )
+OR_NATIVE( keyRepeatNative )
 {
     glv_filterRepeatKeys( gView, orInt(a1) );
@@ -1464 +1464 @@
 
 
-void screengrabNative( OValue* a1 )
+OR_NATIVE( screengrabNative )
 {
     OBinary* bin;
@@ -1492 +1492 @@
 
 
-void mouseHandlerNative( OValue* a1 )
+OR_NATIVE( mouseHandlerNative )
 {
     orBind( orBLOCK(a1), &gEnv.input_ctx );
@@ -1498 +1498 @@
 
 
-void keyHandlerNative( OValue* a1 )
+OR_NATIVE( keyHandlerNative )
 {
     if( validKeyHandlerBlock( a1->index, a1->series.it ) )
@@ -1541 +1541 @@
 
 
-void hashNative( OValue* a1 )
+OR_NATIVE( hashNative )
 {
     uint32_t key = gxHashString(a1);
@@ -1548 +1548 @@
 
 
-void resourceNative( OValue* a1 )
+OR_NATIVE( resourceNative )
 {
     uint32_t key;
@@ -1574 +1574 @@
 #define REF_RG_FREE     a1+1
 
-void resourceGroupNative( OValue* a1 )
+OR_NATIVE( resourceGroupNative )
 {
     uint16_t id;
@@ -1591 +1591 @@
 
 // This must go when 'save is added to the core library.
-void saveNative( OValue* a1 )
+OR_NATIVE( saveNative )
 {
     FILE* fp;
@@ -1619 +1619 @@
 
 
-void toImageNative( OValue* a1 )
+OR_NATIVE( toImageNative )
 {
     if( a1->RESTYPE == RES_TYPE_FONT )

trunk/orca/gl/ttf_load.c

@@ -621 +621 @@
   ]
 */
-void makeTexfontNative( OValue* a1 )
+OR_NATIVE_PUB( makeTexfontNative )
 {
     OValue* arg;

trunk/orca/ovalue.h

@@ -596 +596 @@
     _or_result->num.decimal = v;}
 
+#define OR_NATIVE(func)     static void func( OValue* a1 )
+#define OR_NATIVE_PUB(func) void func( OValue* a1 )
+
 #define OR_CTERM_LEN        1
 

trunk/orca/qt/qorca.cpp

@@ -691 +691 @@
 
 
-static void execNative( OValue* a1 )
+OR_NATIVE( execNative )
 {
     if( a1->type == OT_INTEGER )
@@ -760 +760 @@
 
 
-static void execExitNative( OValue* a1 )
+OR_NATIVE( execExitNative )
 {
     execExit( qEnv.atom_exec_exit, a1 );
@@ -766 +766 @@
 
 
-static void closeNative( OValue* a1 )
+OR_NATIVE( closeNative )
 {
     execExit( qEnv.atom_close, a1 );
@@ -772 +772 @@
 
 
-static void showNative( OValue* a1 )
+OR_NATIVE( showNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -823 +823 @@
 
 
-static void dialogNative( OValue* a1 )
+OR_NATIVE( dialogNative )
 {
     SDialog* dlg = new SDialog;
@@ -834 +834 @@
 
 
-static void widgetNative( OValue* a1 )
+OR_NATIVE( widgetNative )
 {
     SWidget* wid = new SWidget;
@@ -844 +844 @@
 
 
-static void destroyNative( OValue* a1 )
+OR_NATIVE( destroyNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -860 +860 @@
 #define REF_RF_PATH    a1+4
 
-static void requestFileNative( OValue* a1 )
+OR_NATIVE( requestFileNative )
 {
     QString fn;
@@ -909 +909 @@
 
 
-static void enableNative( OValue* a1 )
+OR_NATIVE( enableNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -917 +917 @@
 
 
-static void disableNative( OValue* a1 )
+OR_NATIVE( disableNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -925 +925 @@
 
 
-static void widgetValueNative( OValue* a1 )
+OR_NATIVE( widgetValueNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -991 +991 @@
 
 
-static void setWidgetValueNative( OValue* a1 )
+OR_NATIVE( setWidgetValueNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -1067 +1067 @@
 
 
-static void appendTextNative( OValue* a1 )
+OR_NATIVE( appendTextNative )
 {
     WIDPool::REC* rec = qEnv.pool.record( a1->integer );
@@ -1112 +1112 @@
 
 
-static void messageNative( OValue* a1 )
+OR_NATIVE( messageNative )
 {
 #define REF_MSG_WARN    a1+2
@@ -1241 +1241 @@
 #ifdef DIR_WATCHER
     extern void watchDirNative( OValue* );
+    extern void spawnNative( OValue* );
     orNative( (void*) watchDirNative,       "watch-dir" );
+    orNative( (void*) spawnNative,          "spawn" );
 #endif