Changeset 540

Timestamp:

07/04/08 03:46:13 (2 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.

Location:

trunk/thune

Files:

• array.c (modified) (1 diff)
• boot.c (modified) (3 diffs)
• doc/GLManual (modified) (4 diffs)
• doc/UserManual (modified) (2 diffs)
• eval.c (modified) (3 diffs)
• gl/CMakeLists.txt (modified) (1 diff)
• gl/TexFont.c (modified) (3 diffs)
• gl/TexFont.h (modified) (1 diff)
• gl/boot.c (modified) (1 diff)
• gl/draw_list.c (modified) (6 diffs)
• gl/gui.c (modified) (20 diffs)
• gl/gui.h (modified) (5 diffs)
• gl/gx.c (modified) (2 diffs)
• gl/gx.h (modified) (2 diffs)
• gl/gx.t (modified) (2 diffs)
• gl/gx_dt.c (modified) (5 diffs)
• gl/project.r (modified) (1 diff)
• gl/rfont.c (modified) (3 diffs)
• gl/rfont.h (modified) (1 diff)
• gl/scripts/gui.t (modified) (5 diffs)
• gl/scripts/mandelbrot.t (added)
• gl/scripts/photobooth.t (added)
• gl/scripts/show-font.t (added)
• gl/test.t (modified) (1 diff)
• gl/testfw.t (modified) (1 diff, 1 prop)
• gl/widgets/buttonw.c (modified) (1 diff)
• gl/widgets/labelw.c (modified) (1 diff)
• gl/widgets/lineeditw.c (added)
• gl/widgets/twidget.c (modified) (1 diff)
• math.c (modified) (5 diffs)
• mkboot.t (modified) (3 diffs)
• print.c (modified) (3 diffs)
• series.c (modified) (10 diffs)
• tests/working/time.good (modified) (1 diff)
• tests/working/time.t (modified) (2 diffs)
• thune-gl.spec (modified) (1 diff)
• tokenize.c (modified) (5 diffs)
• urlan.h (modified) (1 diff)

trunk/thune/array.c

@@ -182 +182 @@
 
 
+/**
+  Create space in the array for count elements starting at index.
+  The memory in the new space is uninitialized.
+*/
+void ur_arrayExpand( UArray* arr, int elemSize, int index, int count )
+{
+    ur_arrayReserve( arr, elemSize, arr->used + count );
+
+    if( index < arr->used )
+    {
+        char* buf = arr->ptr.c + (elemSize * index);
+        memMove( buf + (elemSize * count), buf,
+                 elemSize * (arr->used - index) );
+    }
+
+    arr->used += count;
+}
+
+
 /*EOF*/

trunk/thune/boot.c

@@ -59 +59 @@
   "  to-block kernel-ops infuse\n"
   "] proc :load    ;(filename -- block)\n"
+  "[open swap string! to write close] proc :save    ;(value filename -- )\n"
   "[select if-some do] proc :case\n"
   "['break throw] proc :break\n"
@@ -75 +76 @@
   "[ser words block! body block!]\n"
   "[\n"
-  "    ser [words set body do] words length? iter\n"
+  "  ser [words set body do] words length? iter\n"
   "]\n"
   "'loop func :each.set    ;(ser words body -- )\n"
@@ -84 +85 @@
   "[[do dup iff return drop] each true] proc :all    ; (blk -- logic)\n"
   "[ser old new | len] [\n"
-  "    old length? :len\n"
-  "    ser old find if-some (new len change :ser recurse)\n"
-  "    ser\n"
+  "  old length? :len\n"
+  "  ser old find if-some (new len change :ser recurse)\n"
+  "  ser\n"
   "] func :replace.all     ;(ser old new -- ser)\n"
   "[reduce to-text console.out] proc :prin  ;(val -- )\n"

trunk/thune/doc/GLManual

@@ -64 +64 @@
 ::
 
-    (raster! w,h,b -- raster)
+    (raster! w,h,bpp -- raster)
 
 
@@ -78 +78 @@
 Font
 ----
-::
-
-    (font! ["font.name" 20 "chars abc" 256,128] -- font)
+
+Fonts can be created from a TrueType file or from a raster and binary::
+
+    (font! ["font-file.ttf" 20 char-set 256,128] -- font)
+    (font! [raster!/texture! binary!] -- font)
+
+Font components can be selected with::
+
+    font/raster
+    font/texture
+    font/binary     ; Glyph data
 
 
@@ -137 +145 @@
 gl-max-textures   ( -- count)             GL_MAX_TEXTURE_UNITS
 shadowmap         (size -- framebuffer)   Create shadowmap               
+blit              (dst src coord -- dst)  Copy from one raster to another
+move-glyphs       (font offset -- font)   Move texture position of glyphs
 ================  ======================  ======================
 
@@ -261 +271 @@
 scale             vec3!/number!           glScalef()
 font              font!                   Set font used by text instruction
+font/no-bind      font!                   Set font, but don't bind texture
 text              [coord!] text           Draw text in current font
 sphere            radius slices,stacks    Draw textured GLUT sphere

trunk/thune/doc/UserManual

@@ -569 +569 @@
 read         (file part -- data)     Read beginning of file.
 write        (port data -- port)     Write data to port.
-load         (file -- code)          Read script from file.
 delete       (file -- )              Remove file.
 rename       (file new -- )          Rename file.
@@ -599 +598 @@
 Word         Stack Usage             Function
 ==========   ======================  =================
+load         (file -- code)          Read script from file.
+save         (val file -- )          Save value to file.
 split-path   (full -- path file)     Split full path into path & file.
 dirize       (str -- str)            Ensure trailing slash is present.

trunk/thune/eval.c

@@ -764 +764 @@
                 return 1;
             break;
+
+        case UT_DATE:
+        case UT_TIME:
+            if( ur_is(b, UT_DATE) || ur_is(b, UT_TIME) )
+            {
+                if( ur_seconds(a) == ur_seconds(b) )
+                    return 1;
+            }
+            break;
     }
     return 0;
@@ -832 +841 @@
             if( (a->ctx.wordBlk == b->ctx.wordBlk) &&
                 (a->ctx.valBlk == b->ctx.valBlk) )
+                return 1;
+            break;
+
+        case UT_DATE:
+        case UT_TIME:
+            if( ur_seconds(a) == ur_seconds(b) )
                 return 1;
             break;
@@ -1357 +1372 @@
                 ur_initType(val, UT_VEC3);
             }
+            break;
+
+        case UT_DATE:
+            if( ur_is(val, UT_TIME) )
+                ur_type(val) = UT_DATE;
+            break;
+
+        case UT_TIME:
+            if( ur_is(val, UT_DATE) )
+                ur_type(val) = UT_TIME;
             break;
     }

trunk/thune/gl/CMakeLists.txt

@@ -70 +70 @@
     png_save.c
     TexFont.c
+    raster.c
     rfont.c
     shader.c

trunk/thune/gl/TexFont.c

@@ -132 +132 @@
         it = (uint16_t*) KERN(tf);
         swap16( it, it + tf->kern_size );
+    }
+}
+
+
+/**
+  Change the texture position of all glyphs.
+*/
+void txf_moveGlyphs( TexFont* tf, int dx, int dy )
+{
+    TexFontGlyph* tgi = GLYPHS(tf);
+    TexFontGlyph* end = tgi + tf->glyph_count;
+    while( tgi != end )
+    {
+        tgi->x += dx;
+        tgi->y += dy;
+        ++tgi;
     }
 }
@@ -352 +368 @@
     // Most glyphs have no kerning adjustment, and those with it have only
     // a handful (at least at small font sizes).
-    kern_space = count * 5;     // 5 = 2 glyphs + terminator
+    kern_space = count * 7;     // 7 = 3 glyphs + terminator
 
     txf = (TexFont*) malloc(  sizeof(TexFont) +
@@ -437 +453 @@
         tgi->advance = FT_PIXELS(glyph->metrics.horiAdvance);
         tgi->x       = x /*+ tgi->xoffset*/;
+#if 0
         tgi->y       = img->height - y + tgi->yoffset;
+#else
+        tgi->y       = y - tgi->yoffset;
+#endif
 
 #ifdef DUMP

trunk/thune/gl/TexFont.h

@@ -61 +61 @@
                          const TexFontGlyph* right );
 extern void txf_swap( TexFont* );
+extern void txf_moveGlyphs( TexFont*, int dx, int dy );
 extern int  txf_width( const TexFont*, const char* it, const char* end );
 extern int  txf_lineSpacing( const TexFont* );

trunk/thune/gl/boot.c

@@ -27 +27 @@
   "    none :control-font\n"
   "    none :title-font\n"
+  "    none :edit-font\n"
   "    none :label\n"
   "    none :area\n"
   "    none :window-margin\n"
   "    none :window\n"
-  "    none :button-size-limit\n"
+  "    none :button-size\n"
   "    none :button-up\n"
   "    none :button-down\n"
   "    none :button-hover\n"
   "    none :label-dl\n"
+  "    none :editor\n"
+  "    none :editor-active\n"
+  "    none :editor-cursor\n"
   "]\n"
   "context dup :gui-style-proto :gui-style\n"

trunk/thune/gl/draw_list.c

@@ -242 +242 @@
   Advances x.
 */
-static TexFontGlyph* renderGlyphXY( const TexFont* txf, int c,
-                                    GLfloat* xp, GLfloat y,
+static TexFontGlyph* renderGlyphXY( const TexFont* txf,
+                                    GLfloat texW, GLfloat texH,
+                                    int c, GLfloat* xp, GLfloat y,
                                     const TexFontGlyph* leftGI )
 {
-    GLfloat w, h;
-    GLfloat tw, th;
+    GLfloat gw, gh;
     GLfloat gx, gy;
     GLfloat min_s, max_s;
@@ -257 +257 @@
     if( tgi )
     {
-        w = (GLfloat) txf->tex_width;
-        h = (GLfloat) txf->tex_height;
-
-        tw = (GLfloat) tgi->width;
-        th = (GLfloat) tgi->height;
-
+        gw = (GLfloat) tgi->width;
+        gh = (GLfloat) tgi->height;
         gx = (GLfloat) tgi->x;
         gy = (GLfloat) tgi->y;
 
-        min_s = gx / w;
-        min_t = 1.0f - (gy / h);
-        max_s = (gx + tw) / w;
-        max_t = 1.0f - ((gy + th) / h);
+        min_s = gx / texW;
+        max_s = (gx + gw) / texW;
+#if 0
+        min_t = 1.0f - (gy / texH);
+        max_t = 1.0f - ((gy + gh) / texH);
+#else
+        min_t = gy / texH;
+        max_t = (gy - gh) / texH;
+#endif
 
         xkern = leftGI ? txf_kerning( txf, leftGI, tgi ) : 0;
@@ -278 +279 @@
 
         glTexCoord2f( min_s, min_t );  glVertex2f( gx, gy );
-        glTexCoord2f( max_s, min_t );  glVertex2f( gx + tw, gy );
-        glTexCoord2f( max_s, max_t );  glVertex2f( gx + tw, gy + th );
-        glTexCoord2f( min_s, max_t );  glVertex2f( gx, gy + th );
+        glTexCoord2f( max_s, min_t );  glVertex2f( gx + gw, gy );
+        glTexCoord2f( max_s, max_t );  glVertex2f( gx + gw, gy + gh );
+        glTexCoord2f( min_s, max_t );  glVertex2f( gx, gy + gh );
     }
     return tgi;
@@ -302 +303 @@
 {
     GLfloat x, y;
+    GLfloat tw, th;
     TexFontGlyph* prev = 0;
+
+    tw = (GLfloat) tf->tex_width;
+    th = (GLfloat) tf->tex_height;
 
     if( (it != end) )
@@ -317 +322 @@
             {
                 x = (GLfloat) tf->max_ascent;
-                y -= x * 1.5f;  // Estimate of line spacing.
+                y -= txf_lineSpacing( tf );
                 x = grState.penX;
                 prev = 0;
@@ -328 +333 @@
             else
             {
-                prev = renderGlyphXY( tf, *it, &x, y, prev );
+                prev = renderGlyphXY( tf, tw, th, *it, &x, y, prev );
             }
             ++it;

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 )