Changeset 528 for trunk/thune/gl/gui.c

Timestamp:

05/30/08 18:36:20 (6 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.

Files:

• trunk/thune/gl/gui.c (modified) (11 diffs)

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.
 */