Changeset 527

Timestamp:

05/26/08 17:22:18 (5 months ago)

Author:

krobillard

Message:

Added thune-gl widget! datatype.

Location:

trunk/thune

Files:

• CMakeLists.txt (modified) (3 diffs)
• boot.c (modified) (1 diff)
• eval.c (modified) (4 diffs)
• gc.c (modified) (5 diffs)
• gl/CMakeLists.txt (modified) (4 diffs)
• gl/TexFont.c (modified) (1 diff)
• gl/TexFont.h (modified) (1 diff)
• gl/boot.c (modified) (6 diffs)
• gl/draw_list.c (modified) (17 diffs)
• gl/gui.c (added)
• gl/gui.h (added)
• gl/gx.c (modified) (11 diffs)
• gl/gx.h (modified) (5 diffs)
• gl/gx.t (modified) (8 diffs)
• gl/gx_atoms.h (modified) (1 diff)
• gl/gx_dt.c (modified) (5 diffs)
• gl/project.r (modified) (2 diffs)
• gl/scripts/cloud.t (modified) (1 diff)
• gl/scripts/gui.t (added)
• gl/scripts/view.t (modified) (1 diff)
• gl/shader.c (modified) (6 diffs)
• gl/shader.h (modified) (1 diff)
• gl/test.t (modified) (12 diffs)
• gl/testfw.t (modified) (2 diffs)
• gl/widgets (added)
• gl/widgets/twidget.c (added)
• mkboot.t (modified) (2 diffs)
• parse.c (modified) (11 diffs)
• scripts/ctx-hdr.t (added)
• series.c (modified) (4 diffs)
• thune-gl.spec (modified) (1 diff)
• thune.c (modified) (13 diffs)
• thune.spec (modified) (1 diff)
• urlan.h (modified) (3 diffs)

trunk/thune/CMakeLists.txt

@@ -1 +1 @@
 project(Thune C)
 
-# set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_BUILD_TYPE Release)
-
-# Config defines
-add_definitions(
-        -DLANG_THUNE
-        -DUR_CONFIG_BZIP2
-        -DUR_CONFIG_TRIG
-        -DUR_CONFIG_MATH3D
-        -DUR_CONFIG_DATAFLOW
-        -DUR_CONFIG_NET
-        -DUR_CONFIG_MACROS
-)
+#set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_BUILD_TYPE Release)
 
 
@@ -22 +11 @@
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake_modules/")
 
+
+# Config defines
+add_definitions(
+    -DLANG_THUNE
+    -DUR_CONFIG_BZIP2
+    -DUR_CONFIG_TRIG
+    -DUR_CONFIG_MATH3D
+    -DUR_CONFIG_DATAFLOW
+    -DUR_CONFIG_FCALC
+    -DUR_CONFIG_NET
+    -DUR_CONFIG_MACROS
+)
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_definitions(-DDEBUG)
+endif ()
+
+
 if (UNIX)
-        include_directories(. unix)
-        add_definitions(-std=c99 -pedantic -D_GNU_SOURCE)
+    include_directories(. unix)
+    add_definitions(-std=c99 -pedantic -D_GNU_SOURCE)
     set(OS_FILE unix/os.c)
 endif ()
 
 if (WIN32)
-        include_directories(. win32)
+    include_directories(. win32)
     set(OS_FILE win32/os.c)
 endif ()
@@ -35 +42 @@
 
 add_library(thune-lib SHARED
-        urlan.c
-        array.c
-        list.c
-        make.c
-        eval.c
-        thread.c
-        gc.c
-        tokenize.c
-        charset.c
-        context.c
-        print.c
-        series.c
-        parse.c
-        stdio.c
-        files.c
-        math.c
-        bignum.c
-        support/mt19937ar.c
+    urlan.c
+    array.c
+    list.c
+    make.c
+    eval.c
+    thread.c
+    gc.c
+    tokenize.c
+    charset.c
+    context.c
+    print.c
+    series.c
+    parse.c
+    stdio.c
+    files.c
+    math.c
+    bignum.c
+    support/mt19937ar.c
     ${OS_FILE}
 )

trunk/thune/boot.c

@@ -128 +128 @@
   "]\n"
   "func :replace   ; (ser pat rep -- ser)\n"
+  "[bind [dup second swap first set] iter/2] proc :set-key-values ; (blk ctx -- )\n"
   "[now swap do now swap sub] proc :time-blk\n"
   "[\n"

trunk/thune/eval.c

@@ -352 +352 @@
 
 
-static void _appendTraceBlk( UThread* ut, UCellError* err, int n, int it )
+void ur_appendTraceT( UThread* ut, UCellError* err, UIndex blkN, UIndex it )
 {
     if( err->traceBlk )
@@ -361 +361 @@
         blk = ur_blockPtr( err->traceBlk );
         cell = ur_appendCell( blk, UT_BLOCK );
-        ur_setSeries( cell, n, it );
+        ur_setSeries( cell, blkN, it );
     }
 }
@@ -504 +504 @@
 
 
+/**
+  Evaluate C string.
+
+  \param cmd  String to evaluate.
+  \param len  Length of cmd string.  May be -1 if cmd is null terminated.
+
+  \return UR_EVAL_ code.
+*/
 int ur_evalCStr( UThread* ut, const char* cmd, int len )
 {
@@ -1617 +1625 @@
         res->func.closureN  = 0;
         res->func.sigN      = sigN;
-    }
-    UR_S_DROP;
+
+        UR_S_DROP;
+    }
+    else
+    {
+        ur_throwErr( UR_ERR_DATATYPE, "func expected two block! values" );
+    }
 }
 

trunk/thune/gc.c

@@ -231 +231 @@
 
 
-static void _checkCells( UThread* ut, UCollector* gc, UCell* it, UCell* end );
-
 static void _checkBlock( UThread* ut, UCollector* gc, UBlock* blk )
 {
@@ -242 +240 @@
 
     if( it )
-        _checkCells( ut, gc, it, it + blk->used );
-}
-
-
-static void _checkCells( UThread* ut, UCollector* gc, UCell* it, UCell* end )
+        ur_gcMarkCells( ut, gc, it, it + blk->used );
+}
+
+
+void ur_gcMarkCells( UThread* ut, UCollector* gc, UCell* it, const UCell* end )
 {
     int idx;
@@ -410 +408 @@
                 UCell* cell = ((UCell*) it) - 1;
                 SET_BIT_BLOCK_L( it->cp.n )
-                _checkCells( ut, gc, cell, cell + 1 );
+                ur_gcMarkCells( ut, gc, cell, cell + 1 );
                 it -= CC_LEN_ITER;
             }
@@ -439 +437 @@
     assert( UR_TOC >= UR_BOC );
 
-    _checkCells( ut, gc, UR_BOC, UR_TOC );
+    ur_gcMarkCells( ut, gc, UR_BOC, UR_TOC );
 }
 #endif
@@ -451 +449 @@
     assert( UR_TOS >= UR_BOS );
 
-    _checkCells( ut, gc, UR_BOS + 1, UR_TOS + 1 );
+    ur_gcMarkCells( ut, gc, UR_BOS + 1, UR_TOS + 1 );
 }
 

trunk/thune/gl/CMakeLists.txt

@@ -1 +1 @@
 project(ThuneGL C)
 
-# set(CMAKE_BUILD_TYPE Debug)
-set(CMAKE_BUILD_TYPE Release)
+#set(CMAKE_BUILD_TYPE Debug)
+ set(CMAKE_BUILD_TYPE Release)
 
 
@@ -27 +27 @@
 
 if (UNIX AND NOT APPLE)
-        find_package( X11 REQUIRED )
+    find_package( X11 REQUIRED )
     include_directories(../unix)
     include_directories(/usr/include/freetype2)
@@ -45 +45 @@
     -DTHUNE_GL
 )
+
+if(CMAKE_BUILD_TYPE STREQUAL "Debug")
+    add_definitions(-DDEBUG)
+endif ()
 
 include_directories(
@@ -68 +72 @@
     rfont.c
     shader.c
-#    gui.c
+#   gui.c
     ${GLV_FILE}
     ${JOYSTICK_FILE}

trunk/thune/gl/TexFont.c

@@ -481 +481 @@
 
 
+int txf_width( const TexFont* tf, const char* it, const char* end )
+{
+    TexGlyphInfo* prev = 0;
+    TexGlyphInfo* tgi;
+    int width = 0;
+
+    while( it != end )
+    {
+        if( *it == '\n' )
+            break;
+        if( *it == ' ' )
+        {
+            tgi = txf_glyph( tf, ' ' );
+            if( tgi )
+                width += tgi->advance;
+            prev = 0;
+        }
+        else
+        {
+            tgi = txf_glyph( tf, *it );
+            if( tgi )
+            {
+                width += tgi->advance;
+                if( prev )
+                    width += txf_kerning( tf, prev, tgi );
+                prev = tgi;
+            }
+        }
+        ++it;
+    }
+
+    return width;
+}
+
+
+int txf_linespacing( const TexFont* tf )
+{
+    return tf->max_ascent + (tf->max_ascent / 2);
+}
+
+
 /*EOF*/

trunk/thune/gl/TexFont.h

@@ -52 +52 @@
                          const TexGlyphInfo* right );
 extern void txf_swap( TexFont* );
+extern int  txf_width( const TexFont*, const char* it, const char* end );
+extern int  txf_linespacing( const TexFont* );
 
 #ifdef __cplusplus

trunk/thune/gl/boot.c

@@ -1 @@
-  "[file string!] [\n"
-  "    file 16 read\n"
-  "    dup \"RIFF\" match ift (file load-wav return)\n"
-  "    file read\n"
-  "    dup \"#!\" match ift (eol find)\n"
-  "    to-block kernel-ops infuse\n"
-  "] func :load\n"
   "[\n"
   "    none :orient\n"
@@ -16 +9 @@
   "context :camera\n"
   "[\n"
-  "    none :parent\n"
-  "    none :children\n"
   "    0,0 :area\n"
   "    none :key-down\n"
@@ -30 +21 @@
   "    none :draw\n"
   "]\n"
-  "context :widget-proto\n"
+  "context :t-widget-proto\n"
+  "[\n"
+  "    none :texture\n"
+  "    none :tex-size\n"
+  "    none :control-font\n"
+  "    none :title-font\n"
+  "    none :label\n"
+  "    none :area\n"
+  "    none :window-margin\n"
+  "    none :window\n"
+  "    none :button-size-limit\n"
+  "    none :button-up\n"
+  "    none :button-down\n"
+  "    none :button-hover\n"
+  "]\n"
+  "context dup :gui-style-proto :gui-style\n"
   "[\n"
   "    none :value\n"
@@ -47 +53 @@
   "        3 :mouse-mb]\n"
   "] case\n"
-  "[\n"
-  "    copy\n"
-  "    dup [dup first key-code 1 poke drop] iter/2\n"
-  "    [dup none select do] copy swap 2 poke\n"
-  "]\n"
-  "proc :key-handler\n"
-  "[wid | handler]\n"
-  "[\n"
-  "    [] display.events [\n"
-  "        dup first wid get dup :handler\n"
-  "        ift (second handler do) drop\n"
-  "    ] iter/2\n"
-  "]\n"
-  "func :handle.events\n"
-  "[wid | handler]\n"
-  "[\n"
-  "    [] 'wait display.events [\n"
-  "        dup first wid get dup :handler\n"
-  "        ift (second handler do) drop\n"
-  "    ] iter/2\n"
-  "]\n"
-  "func :wait-events\n"
+  "[drop display.events] proc :handle-events\n"
+  "[drop display.events/wait] proc :wait-events\n"
   "[list block! | ctx wrd n]\n"
   "[\n"
@@ -128 +114 @@
   "]\n"
   "make-opcodes :draw-list-opcodes\n"
+  "[draw-list! swap make] proc :draw-list\n"
+  "[draw-list! swap paren! as make] proc :draw-list.compile\n"
   "[\n"
-  "    draw-list! swap make\n"
+  "    copy\n"
+  "    dup [dup first key-code 1 poke drop] iter/2\n"
   "]\n"
-  "proc :draw-list\n"
+  "proc :key-handler\n"
+  "[desc | wid]\n"
   "[\n"
-  "    draw-list! swap paren! as make\n"
-  "]\n"
-  "proc :draw-list.compile\n"
-  "[desc | tok wid]\n"
-  "[\n"
-  "    widget-proto [] make :wid\n"
-  "    desc wid bind [\n"
-  "        :tok\n"
-  "        'key-down block! (tok/2 key-handler :wid/key-down)\n"
-  "        | 'key-up block! (tok/2 key-handler :wid/key-up)\n"
-  "        | 'mouse-move block! (tok/2 :wid/mouse-move)\n"
-  "        | 'mouse-down block! (tok/2 :wid/mouse-down)\n"
-  "        | 'mouse-up block! (tok/2 :wid/mouse-up)\n"
-  "        | 'mouse-wheel block! (tok/2 :wid/mouse-wheel)\n"
-  "        | 'close block! (tok/2 :wid/close)\n"
-  "        | 'resize block! (tok/2 :wid/resize)\n"
-  "        | 'joystick block! (tok/2 :wid/joystick)\n"
-  "        | 'draw block! (tok/2 :wid/draw)\n"
-  "        | 'draw-list block! (tok/2 draw-list :wid/draw)\n"
-  "        | 'parent word! (tok/2 get :wid/parent)\n"
-  "    ] parse.some\n"
-  "    wid/parent\n"
-  "    ['area wid/parent get :wid/area]\n"
-  "    [display.area :wid/area]\n"
-  "    either\n"
-  "    wid/resize ift (wid/area wid/resize do drop)\n"
+  "    desc t-widget-proto copy dup :wid set-key-values\n"
+  "    wid/key-down if-some (key-handler :wid/key-down)\n"
+  "    wid/key-up if-some (key-handler :wid/key-up)\n"
+  "    wid/draw if-some (draw-list :wid/draw)\n"
   "    wid\n"
   "]\n"
-  "func :make-widget\n"
+  "func :t-widget-context\n"
+  "[widget! [t-widget none] rot 2 poke make] proc :make-widget\n"
+  "[file string!] [\n"
+  "    file 16 read\n"
+  "    dup \"RIFF\" match ift (file load-wav return)\n"
+  "    file read\n"
+  "    dup \"#!\" match ift (eol find)\n"
+  "    to-block kernel-ops infuse\n"
+  "] func :load\n"
   "[load shader! swap make] proc :load.shader\n"
   "[load.png texture! swap make] proc :load.tex\n"
@@ -180 +156 @@
   "    0.0 0.0 0.0 1.0 \n"
   "] :unit-matrix\n"
-  "[\n"
-  "    unit-matrix copy swap 13 poke\n"
-  "]\n"
-  "proc :make-matrix\n"
+  "[unit-matrix copy swap 13 poke] proc :make-matrix\n"

trunk/thune/gl/draw_list.c

@@ -72 +72 @@
 
 
-struct GrRenderState grState;
-
-
-#if 0
+GrRenderState grState;
+
+
+#if 1
 void gr_disableTexture()
 {
@@ -132 +132 @@
         case GRS_SOLID:
             glDepthMask( GL_FALSE );
+#if 0
             gr_disable( "lbct" );
-            /*
+#else
             glDisable( GL_LIGHTING );
             glDisable( GL_BLEND );
             glDisable( GL_CULL_FACE );
             gr_disableTexture();
-            */
+
+            grState.enableMask &=
+                ~(EN_LIGHTING | EN_BLEND | EN_CULL_FACE | EN_TEXTURE_2D);
+#endif
             break;
 
@@ -163 +167 @@
 
             // NOTE: Must disable all texture units but GL_TEXTURE0 if not
-            // using a shader or text may not render properly.
+            //       using a shader or text may not render properly.
             gr_enableTexture0();
 
@@ -235 +239 @@
 
 
-int gr_textWidth( const TexFont* tf, const char* it, const char* end )
-{
-    TexGlyphInfo* prev = 0;
-    TexGlyphInfo* tgi;
-    int width = 0;
-
-    while( it != end )
-    {
-        if( *it == '\n' )
-            break;
-        if( *it == ' ' )
-        {
-            tgi = txf_glyph( tf, ' ' );
-            if( tgi )
-                width += tgi->advance;
-            prev = 0;
-        }
-        else
-        {
-            tgi = txf_glyph( tf, *it );
-            if( tgi )
-            {
-                width += tgi->advance;
-                if( prev )
-                    width += txf_kerning( tf, prev, tgi );
-                prev = tgi;
-            }
-        }
-        ++it;
-    }
-
-    return width;
-}
-
-
 /*
   Returns TexGlyphInfo of rendered glyph.
@@ -395 +364 @@
     {
         int16_t* rect = area->coord.elem;
-        int w = gr_textWidth( tf, cpA, cpB );
+        int w = txf_width( tf, cpA, cpB );
         int h = tf->max_ascent - (tf->max_ascent >> 1);
 
@@ -646 +615 @@
 
         blk = ur_block(val);
-        UR_ITER_BLOCK( it, end, blk, val );
+        UR_ITER_BLOCK( it, end, blk, val )
         while( it != end )
         {
@@ -826 +795 @@
     COW_VALUE(pc, ts);
     if( ! ur_is(ts, UT_COORD) )
+    {
+bad_dt:
+        ur_throwErr( UR_ERR_DATATYPE, "qaud-skin expected coord!" );
         return 0;
+    }
     ++pc;
     COW_VALUE(pc, tc);
     if( ! ur_is(tc, UT_COORD) )
-        return 0;
+        goto bad_dt;
     ++pc;
     COW_VALUE(pc, vc);
     if( ! ur_is(vc, UT_COORD) )
-        return 0;
+        goto bad_dt;
 
     {
@@ -1163 +1136 @@
         glEnable( e ); }
 
+#if 1
 #define DISABLE(f,e) \
     if( grState.enableMask & f ) { \
         grState.enableMask &= ~f; \
         glDisable( e ); }
+#else
+#define DISABLE(f,e)    glDisable( e );
+#endif
+
 
 static void gr_enable( const char* cp )
@@ -1288 +1266 @@
    Returns zero if an error occurred.
 */
-static int _runDrawList( UThread* ut, UCell* val )
+int ug_runDrawList( UThread* ut, UCell* val )
 {
     UBlock* blk = ur_blockPtr( val->series.n );
@@ -1337 +1315 @@
                         glCallList( ur_dlGL(val) );
                     }
-                    else if( ! _runDrawList( ut, val ) )
+                    else if( ! ug_runDrawList( ut, val ) )
                         return 0;
+                }
+                else if( ur_is(val, UT_WIDGET) )
+                {
+                    // NOTE: Compiliation of widget draw lists will happen
+                    //       inside gui_render().
+                    gui_render( &gxEnv.gui, ur_int(val) );
                 }
                 break;
@@ -1654 +1638 @@
                 {
                     if( ! ur_is(val, UT_COORD) || (val->coord.len < 4) )
+                    {
+                        ur_throwErr( UR_ERR_DATATYPE,
+                                     "text expected area coord!" );
                         return 0;
+                    }
                     area = val;
                     ++pc;
@@ -1689 +1677 @@
                 loadShader( ut, val );
                 break;
-#if 0
+#if 1
             case DOP_UNIFORM:
             {
@@ -1737 +1725 @@
                 if( ur_is(pc, UT_BLOCK) )
                 {
-                    if( ! _runDrawList( ut, pc ) )
+                    if( ! ug_runDrawList( ut, pc ) )
                         return 0;
                 }
@@ -1805 +1793 @@
 
 
+int ug_compileDrawList( UThread* ut, UCell* blkCell, GLuint dl )
+{
+    int ok;
+
+    //printf( "KR compile DL %d\n", dl );
+
+    // Need to keep grState.shaderProg for uniform to work in compiled list.
+    //gr_clearState();
+
+    glNewList( dl, GL_COMPILE );
+    ok = ug_runDrawList( ut, blkCell );
+    glEndList();
+
+    return ok;
+}
+
+