Changeset 536

Timestamp:

06/06/08 18:55:03 (4 months ago)

Author:

krobillard

Message:

Public headers now live in thune/ subdirectory.

Location:

trunk/thune

Files:

• gl/draw_list.c (modified) (7 diffs)
• gl/gui.c (modified) (2 diffs)
• gl/gx.c (modified) (2 diffs)
• gl/gx.h (modified) (2 diffs)
• gl/widgets/buttonw.c (modified) (2 diffs)
• gl/widgets/labelw.c (modified) (2 diffs)
• gl/widgets/twidget.c (modified) (1 diff)
• thune-gl.spec (modified) (2 diffs)
• thune.spec (modified) (2 diffs)

trunk/thune/gl/draw_list.c

@@ -1263 +1263 @@
    Returns zero if an error occurred.
 */
-int ug_runDrawList( UThread* ut, UCell* val )
+int ur_runDrawList( UThread* ut, UCell* val )
 {
     UBlock* blk = ur_blockPtr( val->series.n );
@@ -1312 +1312 @@
                         glCallList( ur_dlGL(val) );
                     }
-                    else if( ! ug_runDrawList( ut, val ) )
+                    else if( ! ur_runDrawList( ut, val ) )
                         return 0;
                 }
@@ -1727 +1727 @@
                 if( ur_is(pc, UT_BLOCK) )
                 {
-                    if( ! ug_runDrawList( ut, pc ) )
+                    if( ! ur_runDrawList( ut, pc ) )
                         return 0;
                 }
@@ -1795 +1795 @@
 
 
-int ug_compileDrawList( UThread* ut, UCell* blkCell, GLuint dl )
+int ur_compileDrawList( UThread* ut, UCell* blkCell, GLuint dl )
 {
     int ok;
@@ -1805 +1805 @@
 
     glNewList( dl, GL_COMPILE );
-    ok = ug_runDrawList( ut, blkCell );
+    ok = ur_runDrawList( ut, blkCell );
     glEndList();
 
@@ -1848 +1848 @@
 
         gr_clearState();
-        if( ! ug_compileDrawList( ut, tos, ur_dlGL(res) ) )
+        if( ! ur_compileDrawList( ut, tos, ur_dlGL(res) ) )
             return;
     }
@@ -1876 +1876 @@
         {
             gr_clearState();
-            ug_runDrawList( ut, tos );
+            ur_runDrawList( ut, tos );
         }
     }

trunk/thune/gl/gui.c

@@ -794 +794 @@
         rc = gui_styleCell( CI_STYLE_WINDOW );
         if( ur_is(rc, UT_DRAWLIST) )
-            ug_compileDrawList( ui->ut, rc, wd->dl[ 0 ] );
+            ur_compileDrawList( ui->ut, rc, wd->dl[ 0 ] );
     }
 }
@@ -1251 +1251 @@
         {
             GRect rect;
-            // Save grState so widgets can call ug_compileDrawList().
+            // Save grState so widgets can call ur_compileDrawList().
             GrRenderState save = grState;
 

trunk/thune/gl/gx.c

@@ -54 +54 @@
 
 
-TexFont* ug_texFontV( UThread* ut, const UCell* cell )
+TexFont* ur_texFontV( UThread* ut, const UCell* cell )
 {
     if( ur_is(cell, UT_FONT) )
@@ -273 +273 @@
     if( ur_stringSlice( ut, tos, &cpA, &cpB ) )
     {
-        tf = ug_texFontV( ut, res );
+        tf = ur_texFontV( ut, res );
         if( tf )
         {

trunk/thune/gl/gx.h

@@ -22 +22 @@
 
 #include <GL/glv.h>
-#include "urlan.h"
 #include "gui.h"
 #include "TexFont.h"
@@ -185 +184 @@
 
 UIndex ur_makeRaster( UThread*, UCell*, int format, int w, int h, UBinary** );
-int    ug_runDrawList( UThread*, UCell* blkCell );
-int    ug_compileDrawList( UThread*, UCell* blkCell, GLuint dl );
-
-TexFont* ug_texFontV( UThread*, const UCell* );
+int    ur_runDrawList( UThread*, UCell* blkCell );
+int    ur_compileDrawList( UThread*, UCell* blkCell, GLuint dl );
+
+TexFont* ur_texFontV( UThread*, const UCell* );
 
 

trunk/thune/gl/widgets/buttonw.c

@@ -204 +204 @@
     {
         str = ur_binPtr( wd->labelN );
-        tf = ug_texFontV( ut, gui_styleCell( CI_STYLE_CONTROL_FONT ) );
+        tf = ur_texFontV( ut, gui_styleCell( CI_STYLE_CONTROL_FONT ) );
         if( tf )
         {
@@ -236 +236 @@
     rc = gui_styleCell( CI_STYLE_BUTTON_UP );
     if( ur_is(rc, UT_DRAWLIST) )
-        ug_compileDrawList( ui->ut, rc, wd->dl[ BTN_STATE_UP ] );
+        ur_compileDrawList( ui->ut, rc, wd->dl[ BTN_STATE_UP ] );
 
     rc = gui_styleCell( CI_STYLE_BUTTON_DOWN );
     if( ur_is(rc, UT_DRAWLIST) )
-        ug_compileDrawList( ui->ut, rc, wd->dl[ BTN_STATE_DOWN ] );
+        ur_compileDrawList( ui->ut, rc, wd->dl[ BTN_STATE_DOWN ] );
 }
 

trunk/thune/gl/widgets/labelw.c

@@ -85 +85 @@
     size->policyY = GW_FIXED;
 
-    tf = ug_texFontV( ut, gui_styleCell( CI_STYLE_CONTROL_FONT ) );
+    tf = ur_texFontV( ut, gui_styleCell( CI_STYLE_CONTROL_FONT ) );
     if( tf )
     {
@@ -128 +128 @@
     {
         grState.fontN = ur_fontTF(fc);
-        ug_compileDrawList( ui->ut, rc, wd->dl[ 0 ] );
+        ur_compileDrawList( ui->ut, rc, wd->dl[ 0 ] );
     }
 }

trunk/thune/gl/widgets/twidget.c

@@ -303 +303 @@
         {
             //gr_clearState();
-            ug_runDrawList( ut, cell );
+            ur_runDrawList( ut, cell );
             // TODO: Handle errors.
         }

trunk/thune/thune-gl.spec

@@ -35 +35 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/thune
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -s -m 755 thune-gl $RPM_BUILD_ROOT/%{_bindir}
-install -m 644 gl/gx.h $RPM_BUILD_ROOT%{_includedir}/thune-gl.h
+mkdir include
+sed -e "s~\"urlan.h\"~<thune/urlan.h>~" gl/gui.h >include/gui.h
+sed -e "s~\"gui.h\"~<thune/gui.h>~" -e "s~\"TexFont.h\"~<thune/TexFontgui.h>~" gl/gx.h >include/gx.h
+install -m 644 include/gx.h  $RPM_BUILD_ROOT%{_includedir}/thune
+install -m 644 include/gui.h $RPM_BUILD_ROOT%{_includedir}/thune
+install -m 644 gl/gx_atoms.h $RPM_BUILD_ROOT%{_includedir}/thune
+install -m 644 gl/TexFont.h  $RPM_BUILD_ROOT%{_includedir}/thune
 install -m 644 libthune-gl.so $RPM_BUILD_ROOT%{_libdir}/libthune-gl.so.0
 ln -s libthune-gl.so.0 $RPM_BUILD_ROOT%{_libdir}/libthune-gl.so
@@ -50 +56 @@
 %{_libdir}/libthune-gl.so
 %{_libdir}/libthune-gl.so.0
-%{_includedir}/thune-gl.h
+%{_includedir}/thune/gx.h
+%{_includedir}/thune/gx_atoms.h
+%{_includedir}/thune/gui.h
+%{_includedir}/thune/TexFont.h
 
 %changelog

trunk/thune/thune.spec

@@ -30 +30 @@
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-mkdir -p $RPM_BUILD_ROOT%{_includedir}
+mkdir -p $RPM_BUILD_ROOT%{_includedir}/thune
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 install -s -m 755 thune $RPM_BUILD_ROOT%{_bindir}
-install -m 644 urlan.h $RPM_BUILD_ROOT%{_includedir}
+install -m 644 urlan.h $RPM_BUILD_ROOT%{_includedir}/thune
+install -m 644 urlan_atoms.h $RPM_BUILD_ROOT%{_includedir}/thune
 install -m 644 libthune.so $RPM_BUILD_ROOT%{_libdir}/libthune.so.0
 ln -s libthune.so.0 $RPM_BUILD_ROOT%{_libdir}/libthune.so
@@ -45 +46 @@
 %{_libdir}/libthune.so
 %{_libdir}/libthune.so.0
-%{_includedir}/urlan.h
+%{_includedir}/thune/urlan.h
+%{_includedir}/thune/urlan_atoms.h
 
 %changelog