Changeset 528

Timestamp:

05/30/08 18:36:20 (4 months ago)

Author:

krobillard

Message:

GL testfw reload works again.
Added UG_GUI_THROW macro to be used by widget event handlers.
Added gui_matchArgs() and GUI_PARSE macros.

Location:

trunk/thune

Files:

• gl/gui.c (modified) (11 diffs)
• gl/gui.h (modified) (4 diffs)
• gl/gx.c (modified) (2 diffs)
• gl/gx.h (modified) (1 diff)
• gl/widgets/twidget.c (modified) (2 diffs)
• thune.c (modified) (1 diff)

trunk/thune/gl/gui.c

@@ -29 +29 @@
   [x] Layout
   [/] Input
-  [ ] Replace old widget code (gx.t) with widget class for all-Thune code.
-     [ ] Convert all demos.
 */
 
@@ -90 +88 @@
     ms.x     = ex; \
     ms.y     = ey
+
 
 #define SET_AREA(wp,rect) \
@@ -201 +200 @@
 static GWidget* base_parse( GUI* ui, GMakeState* ms, int classId )
 {
-    GWidget* wp = gui_allocWidget( ui, classId );
-    if( wp )
-        ++ms->it;
-    else
-        ms->error = "allocWidget failed";
+    GWidget* wp;
+    GUI_PARSE_ALLOC( wp )
+    ++ms->it;
     return wp;
 }
@@ -331 +328 @@
     {
 no_block:
-        ms->error = "box requires block!";
-        return 0;
+        GUI_PARSE_ERR( "box requires block!" );
     }
     if( ur_is(bc, UT_COORD) )
@@ -343 +339 @@
         goto no_block;
 
-    wp = gui_allocWidget( ui, classId );
-    if( wp )
+    GUI_PARSE_ALLOC( wp )
+
     {
         GMakeState cms;
@@ -364 +360 @@
         }
         ms->it = bc + 1;
-    }
-    else
-    {
-        ms->error = "allocWidget failed";
     }
     return wp;
@@ -829 +821 @@
     GWidget* wp;
     ButtonData* wd;
-    //UThread* ut = ui->ut;
-    const UCell* sc = ms->it + 1;
-    const UCell* bc = ms->it + 2;
-
-    if( ((ms->end - ms->it) < 3) ||
-        (! ur_is(sc, UT_STRING)) ||
-        (! ur_is(bc, UT_BLOCK)) )
-    {
-        ms->error = "button requires string! and block!";
-        return 0;
-    }
-
-    wp = gui_allocWidget( ui, classId );
-    if( ! wp )
-    {
-        ms->error = "allocWidget failed";
-        return 0;
-    }
-
-    wd = BUTTON_DATA(wp);
-    wd->labelN = sc->series.n;
-    wd->codeN  = bc->series.n;
-
-    ms->it += 3;
-    return wp;
+    const UCell* arg0;
+
+    arg0 = gui_matchArgs( ms, 2, UT_STRING, UT_BLOCK );
+    if( arg0 )
+    {
+        GUI_PARSE_ALLOC( wp )
+
+        wd = BUTTON_DATA(wp);
+        wd->labelN = arg0->series.n;
+        wd->codeN  = (arg0 + 1)->series.n;
+        return wp;
+    }
+
+    GUI_PARSE_ERR( "button requires string! and block!" );
 }
 
@@ -958 +939 @@
     if( wd->codeN )
     {
-        if( UR_EVAL_ERROR == ur_eval( ui->ut, wd->codeN, 0 ) )
+        if( UR_EVAL_OK != ur_eval( ui->ut, wd->codeN, 0 ) )
         {
-            // TODO: Throw or catch error.
+            UG_GUI_THROW;
         }
     }
@@ -1062 +1043 @@
 
 #include "widgets/twidget.c"
-
-
-static int wclassCount = 6;
+#include "widgets/listw.c"
+
+/*
+   :tok
+   'expand                   (tok make-widget)
+ | 'hbox      block!         (tok make-widget)
+ | 'vbox      block!         (tok make-widget)
+ | 'window    block!         (tok make-widget)
+ | 'button    string! block! (tok make-widget)
+ | 't-widget  block!         (tok make-widget)
+ | 'list      block!  block! (tok make-widget)
+*/
+
+static int wclassCount = 7;
 
 static GWidgetClass wclass[ WCLASS_MAX ] =
@@ -1098 +1090 @@
     0, 0, 0 },
 
+  { "list", // "block! block!"
+    listw_parse,      listw_init,     listw_mark,     listw_event,
+    expand_sizeHint,  listw_layout,   listw_render,
+    0, 0, 0 },
+
   /*
   { "option",
   { "choice",
-  { "list",
   { "menu",
   { "data",         // label
@@ -1588 +1584 @@
 
 /*
+  Returns pointer to first arg if all types match, or zero.
+*/
+const UCell* gui_matchArgs( GMakeState* ms, int argc, ... )
+{
+    va_list args;
+    int type;
+    const UCell* it;
+    const UCell* first = ms->it + 1;
+
+    if( (ms->end - first) < argc )
+        return 0;
+    it = first;
+
+    va_start( args, argc );
+    while( argc )
+    {
+        type = va_arg( args, int );
+        if( ur_type(it) != type )
+            break;
+        ++it;
+        --argc;
+    }
+    va_end( args );
+
+    if( argc )
+        return 0;
+    ms->it = it;
+    return first;
+}
+
+
+/*
   Only mark and sweep on top-level (parent-less) widgets.
 */

trunk/thune/gl/gui.h

@@ -67 +67 @@
     int16_t maxW;
     int16_t maxH;
-    int8_t  weightX;
-    int8_t  weightY;
-    int8_t  policyX;
-    int8_t  policyY;
+    uint8_t weightX;
+    uint8_t weightY;
+    uint8_t policyX;
+    uint8_t policyY;
 }
 GSizeHint;
@@ -149 +149 @@
 
 GWidget* gui_allocWidget( GUI*, int classId );
-//void     gui_freeWidget( GUI*, GWidgetId );
 GWidget* gui_widgetPtr( GUI*, GWidgetId );
 void     gui_link( GUI*, GWidget* parent, GWidgetId child );
-//void     gui_unlink( GUI*, GWidgetId );
 void     gui_enable( GUI*, GWidget*, int active );
 void     gui_show( GUI*, GWidget*, int show );
@@ -158 +156 @@
 void     gui_render( GUI*, GWidgetId );
 GWidget* gui_parseLayout( GUI*, GWidget* parent, GMakeState* );
+const UCell* gui_matchArgs( GMakeState* ms, int argc, ... );
 GWidget* gui_root( const GUI* ui, GWidgetId id );
 void     gui_initRectCoord( UCell*, GWidget*, int len );
@@ -165 +164 @@
 
 
+#define GUI_PARSE_ERR(msg) \
+    ms->error = msg; \
+    return 0
+
+#define GUI_PARSE_ALLOC(wp) \
+    wp = gui_allocWidget(ui, classId); \
+    if(! wp) { GUI_PARSE_ERR( "allocWidget failed" ); }
+
+
 #endif /*GUI_H*/

trunk/thune/gl/gx.c

@@ -209 +209 @@
         {
 #if 1
-            // Set mouse deltas here so no one else need to calculate them.
+            // Set mouse deltas here so no one else needs to calculate them.
             if( env->prevMouseX == MOUSE_UNSET )
             {
@@ -500 +500 @@
 
     UR_CALL_UNUSED_TOS
+
+    // Set handler in case UG_GUI_THROW has removed it.
+    glv_setEventHandler( gView, eventHandler );
 
     if( inv && (ur_sel(inv) == UR_ATOM_WAIT) )

trunk/thune/gl/gx.h

@@ -208 +208 @@
 #define ur_fboTexPool(c)    ((UCellFramebuffer*) (c))->glTexPool
 
+#define UG_GUI_THROW        glv_setEventHandler(gxEnv.view, 0)
+
 
 #endif /*GX_H*/

trunk/thune/gl/widgets/twidget.c

@@ -49 +49 @@
 {
     GWidget* wp;
+    int ok;
+    const UCell* arg0;
     UThread* ut = ui->ut;
-    int ok;
-    const UCell* bc = ms->it + 1;
-
-    if( ((ms->end - ms->it) < 2) || (! ur_is(bc, UT_BLOCK)) )
-    {
-        ms->error = "t-widget requires block!";
-        return 0;
-    }
-
-    wp = gui_allocWidget( ui, classId );
-    if( ! wp )
-    {
-        ms->error = "allocWidget failed";
-        return 0;
-    }
-
-    UR_S_PUSH( *bc );
-    ok = ur_evalCStr( ut, "t-widget-context", 16 );
-    if( ok != UR_EVAL_OK )
-        return 0;
-
-    assert( ur_is(UR_TOS, UT_CONTEXT) );
-    ur_copyCell( wp->cell, *UR_TOS );
-    UR_S_DROP;
-
-    ms->it += 2;
-    return wp;
+
+    arg0 = gui_matchArgs( ms, 1, UT_BLOCK );
+    if( arg0 )
+    {
+        GUI_PARSE_ALLOC( wp )
+
+        UR_S_PUSH( *arg0 );
+        ok = ur_evalCStr( ut, "t-widget-context", 16 );
+        if( ok != UR_EVAL_OK )
+            return 0;
+
+        assert( ur_is(UR_TOS, UT_CONTEXT) );
+        ur_copyCell( wp->cell, *UR_TOS );
+        UR_S_DROP;
+
+        return wp;
+    }
+    GUI_PARSE_ERR( "t-widget requires block!" );
 }
 
@@ -233 +226 @@
             UR_S_DROP;
         }
+        else
+        {
+            UG_GUI_THROW;
+        }
     }
 }

trunk/thune/thune.c

@@ -668 +668 @@
 
                 case OP_THROW:          // (val -- val)
+                    UR_CALL_OP = OP_THROW;
                     goto op_throw;