[Cgui-develop] cgui/src font.c, 1.1.2.1.2.3, 1.1.2.1.2.4 graphini.c, 1.3.2.2.2.8, 1.3.2.2.2.9

[Christer S. <ch...@us...>]

Update of /cvsroot/cgui/cgui/src
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv28920/src

Modified Files:
      Tag: Branch_CGUI_1-6-7
	font.c graphini.c 
Log Message:
changed compiled datafile initialization to conform to the canonical method

Index: graphini.c
===================================================================
RCS file: /cvsroot/cgui/cgui/src/graphini.c,v
retrieving revision 1.3.2.2.2.8
retrieving revision 1.3.2.2.2.9
diff -C2 -d -r1.3.2.2.2.8 -r1.3.2.2.2.9
*** graphini.c	16 Jul 2008 09:50:04 -0000	1.3.2.2.2.8
--- graphini.c	13 Feb 2009 19:26:42 -0000	1.3.2.2.2.9
***************
*** 756,770 ****
  }
  
- #include <allegro/internal/aintern.h>
- static void init_compiled_bitmap(BITMAP *bmp)
- {
-    if ((unsigned)bmp->vtable >= 32)
-       return;
-    bmp->vtable = _get_vtable((int)bmp->vtable);
-    bmp->write_bank = _stub_bank_switch;
-    bmp->read_bank = _stub_bank_switch;
-    bmp->seg = _default_ds();
- }
- 
  /* - No graphics mode detected: Default behaving.
     - Cgui is alreaday running. The call is assumed to be a request to
--- 756,759 ----
***************
*** 804,824 ****
     GFX_MODE_LIST *glist=NULL;
  
-    if (virgin) {
-       set_color_conversion(COLORCONV_KEEP_TRANS|COLORCONV_TOTAL);
-       init_compiled_bitmap(&__cgui_mkdatadir);
-       init_compiled_bitmap(&__cgui_datadir);
-       init_compiled_bitmap(&__cgui_isdirectory);
-       init_compiled_bitmap(&__cgui_makedir);
-       init_compiled_bitmap(&__cgui_updir);
-       init_compiled_bitmap(&__cgui_uparrow);
-       init_compiled_bitmap(&__cgui_drive);
-       init_compiled_bitmap(&curs_default);
-       init_compiled_bitmap(&curs_busy);
-       init_compiled_bitmap(&curs_cross);
-       init_compiled_bitmap(&curs_drag_h);
-       init_compiled_bitmap(&curs_drag_v);
-       init_compiled_bitmap(&curs_draggable);
-       init_compiled_bitmap(&curs_illegal);
-    }
     if (bpp == CGUI_INIT_CODE && h != CGUI_INIT_LOAD && (screen == NULL || cgui_started)) {
        dt_bpp = desktop_color_depth();
--- 793,796 ----
***************
*** 893,896 ****
--- 865,869 ----
     if (virgin) {
        virgin = 0;
+       fixup_datafile(__cgui_icons);
     }
  }

Index: font.c
===================================================================
RCS file: /cvsroot/cgui/cgui/src/font.c,v
retrieving revision 1.1.2.1.2.3
retrieving revision 1.1.2.1.2.4
diff -C2 -d -r1.1.2.1.2.3 -r1.1.2.1.2.4
*** font.c	28 Jul 2007 21:01:39 -0000	1.1.2.1.2.3
--- font.c	13 Feb 2009 19:26:42 -0000	1.1.2.1.2.4
***************
*** 55,64 ****
  extern void InitFont(void)
  {
     if (cgui_started)
        return;
     _cgui_prop_font = _cgui_fonts_datafile[_CGUI_FONT].dat;
     cgui_fix_font = _cgui_fonts_datafile[_CGUI_FIX_FONT].dat;
-    _cgui_prop_font->vtable = &_font_vtable_mono;
-    cgui_fix_font->vtable = &_font_vtable_mono;
     orgfont = _cgui_prop_font;
     SetCguiFont(_cgui_prop_font);
--- 55,67 ----
  extern void InitFont(void)
  {
+    int virgin = 1;
     if (cgui_started)
        return;
+    if (virgin) {
+       virgin = 0;
+       fixup_datafile(_cgui_fonts_datafile);
+    }
     _cgui_prop_font = _cgui_fonts_datafile[_CGUI_FONT].dat;
     cgui_fix_font = _cgui_fonts_datafile[_CGUI_FIX_FONT].dat;
     orgfont = _cgui_prop_font;
     SetCguiFont(_cgui_prop_font);