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

Timestamp:

07/04/08 03:46:13 (5 months ago)

Author:

krobillard

Message:

Thune

• Implemented date!. Added ur_arrayExpand(), save.

ThuneGL

• Added line-edit widget, blit, move-glyphs.
• Can now make font from texture & binary.
• Optimized renderGlyphXY() a bit.
• twidget close event handler works again.
• Updated thune-gl.spec for renamed glv RPM.

Files:

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

trunk/thune/gl/gui.c

@@ -59 +59 @@
 #define WID(wp)         (wp - ((GWidget*) ui->widgets.ptr.v))
 #define CLASS(wp)       wclass[wp->classId]
+#define IS_ENABLED(wp)  (! (wp->flags & GW_DISABLED))
 
 #define EACH_CHILD(parent,it) \
@@ -103 +104 @@
 
 
-// Order must match gui-style-proto in gx.t.
-enum ContextIndexStyle
-{
-    CI_STYLE_TEXTURE,       // texture!
-    CI_STYLE_TEX_SIZE,      // coord!
-    CI_STYLE_CONTROL_FONT,  // font!
-    CI_STYLE_TITLE_FONT,    // font!
-    CI_STYLE_LABEL,         // Variable for use by draw lists.
-    CI_STYLE_AREA,          // Variable for use by draw lists.
-    CI_STYLE_WINDOW_MARGIN, // coord!
-    CI_STYLE_WINDOW,        // Draw list
-    CI_STYLE_BUTTON_SIZE,   // coord!
-    CI_STYLE_BUTTON_UP,     // Draw list
-    CI_STYLE_BUTTON_DOWN,   // Draw list
-    CI_STYLE_BUTTON_HOVER,  // Draw list
-    CI_STYLE_LABEL_DL       // Draw list
-};
-
-
 #define WCLASS_MAX      24
 static GWidgetClass wclass[ WCLASS_MAX ];
@@ -256 +238 @@
 
 
-static GWidget* base_parse( GUI* ui, GMakeState* ms, int classId )
+static GWidget* base_parse( GUI* ui, GMakeState* ms )
 {
     GWidget* wp;
@@ -309 +291 @@
 
     // Future...
+    UIndex   eventN;
     uint8_t  layoutType;
     uint8_t  rows;
     uint8_t  cols;
-    uint8_t _pad[5];
+    uint8_t  _pad;
 }
 BoxData;
@@ -344 +327 @@
 
 
-static GWidget* box_parse( GUI* ui, GMakeState* ms, int classId )
+static GWidget* box_parse( GUI* ui, GMakeState* ms )
 {
     GWidget* wp;
@@ -721 +704 @@
 
 
-static GWidget* window_parse( GUI* ui, GMakeState* ms, int classId )
+static GWidget* window_parse( GUI* ui, GMakeState* ms )
 {
     GWidget* wp;
     UAtom sel = ur_sel(ms->it);
-    wp = box_parse( ui, ms, classId );
+    wp = box_parse( ui, ms );
     if( wp )
     {
@@ -740 +723 @@
     BoxData* wd = BOX_DATA(wp);
     (void) ui;
-
-    wp->flags |= GW_DISABLED;   // Does not handle input. 
 
     wd->marginL = 8;
@@ -769 +750 @@
 
 
+static void window_event( GUI* ui, GWidget* wp, const GLViewEvent* ev )
+{
+    BoxData* wd = BOX_DATA(wp);
+
+    (void) ui;
+
+    if( wd->eventN )
+    {
+        if( ev->type == GLV_EVENT_CLOSE )
+        {
+        }
+    }
+}
+
+
 static void window_sizeHint( GUI* ui, GWidget* wp, GSizeHint* size )
 {
@@ -825 +821 @@
 #include "widgets/labelw.c"
 #include "widgets/twidget.c"
+#include "widgets/lineeditw.c"
 //#include "widgets/listw.c"
 
@@ -838 +835 @@
 */
 
-static int wclassCount = 7;
+static int wclassCount = 8;
 
 static GWidgetClass wclass[ WCLASS_MAX ] =
@@ -858 +855 @@
 
   { "window",
-    window_parse,     window_init,    window_mark,    no_event,
+    window_parse,     window_init,    window_mark,    window_event,
     window_sizeHint,  window_layout,  window_render,  base_select,
     0, 0, 0 },
@@ -875 +872 @@
     twidget_parse,    twidget_init,   twidget_mark,   twidget_event,
     expand_sizeHint,  twidget_layout, twidget_render, base_select,
+    0, 0, 0 },
+
+  { "line-edit",
+    ledit_parse,      ledit_init,     ledit_mark,     ledit_event,
+    ledit_sizeHint,   ledit_layout,   ledit_render,   ledit_select,
     0, 0, 0 },
 
@@ -972 +974 @@
 
 
+static void gui_callFocus( GUI* ui, GWidgetId id, int eventType )
+{
+    if( IS_VALID(id) )
+    {
+        GWidget* w = WPTR(id);
+        if( IS_ENABLED(w) )
+        {
+            GLViewEvent me;
+            INIT_EVENT( me, eventType, 0, 0, 0, 0 );
+            CLASS( w ).dispatch( ui, w, &me );
+        }
+    }
+}
+
+
 void gui_setMouseFocus( GUI* ui, GWidgetId id )
 {
-    ui->mouseFocus = id;
+    if( ui->mouseFocus != id )
+    {
+        gui_callFocus( ui, ui->mouseFocus, GLV_EVENT_FOCUS_OUT );
+        ui->mouseFocus = id;
+        gui_callFocus( ui, id, GLV_EVENT_FOCUS_IN );
+    }
 }
 
@@ -994 +1016 @@
 
 
+/*
+  Returns child of wp under event x,y, or wp if no child contains the point.
+*/
 static GWidget* childAt( GUI* ui, GWidget* wp, const GLViewEvent* ev )
 {
@@ -1030 +1055 @@
     switch( ev->type )
     {
+        case GLV_EVENT_CLOSE:
+        {
+            GWidgetIt it;
+            EACH_SHOWN_ROOT( it )
+                w = it.w;
+                goto dispatch;
+            EACH_END
+        }
+            return;
+
         case GLV_EVENT_BUTTON_DOWN:
         case GLV_EVENT_BUTTON_UP:
@@ -1051 +1086 @@
             {
                 w = WPTR(ui->mouseFocus);
-                if( ui->mouseGrabbed ||
-                    gui_widgetContains( w, ev->x, ev->y ) )
+                if( ui->mouseGrabbed )
                 {
                     goto dispatch;
                 }
-                else
+                else if( gui_widgetContains( w, ev->x, ev->y ) )
                 {
-                    GLViewEvent me;
-                    INIT_EVENT( me, GLV_EVENT_FOCUS_OUT, 0,
-                                ev->state, ev->x, ev->y );
-                    CLASS( w ).dispatch( ui, w, &me );
+                    GWidget* cw = childAt( ui, w, ev );
+                    if( cw != w )
+                    {
+                        gui_setMouseFocus( ui, WID(cw) );
+                        w = cw;
+                    }
+                    goto dispatch;
                 }
             }
 
-            ui->mouseFocus = widgetAt( ui, ev );
+            gui_setMouseFocus( ui, widgetAt( ui, ev ) );
             if( IS_VALID(ui->mouseFocus) )
             {
                 w = WPTR(ui->mouseFocus);
-                if( ! (w->flags & GW_DISABLED) )
-                {
-                    GLViewEvent me;
-                    INIT_EVENT( me, GLV_EVENT_FOCUS_IN, 0,
-                                ev->state, ev->x, ev->y );
-                    CLASS( w ).dispatch( ui, w, &me );
-                    goto dispatch;
-                }
+                goto dispatch;
             }
             break;
@@ -1363 +1393 @@
                 if( cl->nameAtom == atom )
                 {
-                    wp = cl->parse( ui, ms, cl->id );
+                    ms->classId = cl->id;
+                    wp = cl->parse( ui, ms );
                     if( wp )
                     {
@@ -1412 +1443 @@
 /*
   Returns pointer to first arg if all types match, or zero.
+  Unlike gui_matchArg(), this function does not throw an error if it fails.
 */
 const UCell* gui_matchArgs( GMakeState* ms, int argc, ... )
@@ -1437 +1469 @@
     if( argc )
         return 0;
+
     ms->it = it;
     return first;
+}
+
+
+/*
+  Get and verify next argument.
+  Returns pointer to arg cell if type matches, or zero.
+  Throws an error if fails.
+*/
+const UCell* gui_matchArg( UThread* ut, GMakeState* ms, int type )
+{
+    const UCell* it = ms->it;
+    if( it != ms->end )
+    {
+        if( ur_is(it, type) )
+        {
+valid:
+            ++ms->it;
+            return it;
+        }
+        if( ur_isAWord(it) )
+        {
+            it = ur_wordCell(ut, it);
+            if( it && ur_is(it, type) )
+                goto valid;
+            return 0;   // ur_wordCell() throws error.
+        }
+    }
+    ur_throwErr( UR_ERR_SCRIPT, "%s expected %s argument",
+                 wclass[ ms->classId ].name, ur_typeName(type) );
+    return 0;
 }
 
@@ -1495 +1558 @@
 
 
+#ifdef DEBUG
+static void dumpIndent( int indent )
+{
+    while( indent-- )
+        printf( "    " );
+}
+
+
+void gui_dumpWidget( const GUI* ui, const GWidget* wp, int indent )
+{
+    dumpIndent( indent );
+    printf( "%ld %s %d,%d,%d,%d $%02X", WID(wp), CLASS( wp ).name,
+            wp->x, wp->y, wp->w, wp->h, wp->flags );
+    if( IS_VALID(wp->child) )
+    {
+        GWidgetIt it;
+        printf( " [\n" );
+        ++indent;
+        EACH_CHILD( wp, it )
+            gui_dumpWidget( ui, it.w, indent );
+        EACH_END
+        --indent;
+        dumpIndent( indent );
+        printf( "]\n" );
+    }
+    else
+    {
+        printf( "\n" );
+    }
+}
+
+
+void gui_dump( const GUI* ui )
+{
+    GWidgetIt it;
+
+    printf( "gui [\n" );
+    EACH_ROOT( it )
+        gui_dumpWidget( ui, it.w, 1 );
+    EACH_END
+    printf( "]\n" );
+}
+#endif
+
+
 // EOF