Grx June 2002

grx@gnu.de

3 participants
13 discussions

readme.bgi
by Dimitar Zhekov 28 Jun '02

28 Jun '02

BCC2GRX - Interfacing Borland based graphics programs to LIBGRX Copyright (C) 1993-97 by Hartmut Schirmer This library is now part of the GRX graphics library. Contact : Hartmut Schirmer Feldstrasse 118 D-24105 Kiel Germany e-mail : hsc(a)techfak.uni-kiel.de 1. Introduction and overview ----------------------------------------------------------------------------- The BCC2GRX was created to allow users of LIBGRX to compile graphics programs written … [View More]for Borland-C++ and Turbo-C graphics interface. C code can be directly compiled and linked with BCC2GRX. Using LIBGRX based graphics gives you some advantages : - 32 bit linear memory model (except for Turbo-C and BCC / DOS) - high resolution and high color graphics modes supported - easy way to support new graphics adapters - LIBGRX and BCC2GRX are free software - most ported applications run faster The current BCC2GRX (v2.3) does only a few error checks since it is assumed the program was extensively tested before porting it to GRX. BCC2GRX is not a convenient platform to develop new BGI programs. Of course you should use native LIBGRX in such cases! 2. Differences between BGI and BCC2GRX ----------------------------------------------------------------------------- BCC2GRX is based on LIBGRX instead of using an .bgi driver. This introduces some differences compared with the Borland GI. The (known) differences are listed below. - Most LIBGRX platforms are 32 bit. An int will take 4 bytes instead of 2 with Turbo-C and BCC for DOS. If you need a 16 bit integer, change the definition from int to short which is 16 bit on all systems. - WHITE is a function not constant with BCC2GRX. This may cause problems in switch () statements. (You may use #define WHITE 15 #include <libbcc.h> to improve compatibility.) - BCC2GRX can not use .bgi drivers. Installing an user driver and the register(far)bgidriver will always cause an error. - registerfarbgifont() and registerbgifont() are the same. Both take a void* to the character font (whole file with header !) - initgraph()/detectgraph() work slightly different. See below for details. - getmodenames() and other functions may be called before initgraph() - character files won't be flushed at closegraph() - NOT_PUT isn't supported. - some constants may differ in value - BCC2GRX's outtext() and outtextxy() do correct clipping - some graphics primitives slightly differ in behaviour between BGI and LIBGRX. Eg. the "saucer" in bccbgi.c putimage()/getimage() demo looks a little different. - the BCC2GRX header file is <libbcc.h>. You must change the #include statements since BCC2GRX is incompatible with <graphics.h>. For programs compatible with both Borland GI and BCC2GRX, conditional compilation may be used: #if defined(__MSDOS__) && defined(__TURBOC__) # include <graphics.h> #else # include <libbcc.h> #endif and such programs should be linked with the respective library, either Borland or GRX (but not both). - the color constants like REG, GREEN, etc. won't work in graphics modes with more than 256 colors. Use _ega_color(RED), _ega_color(GREEN), etc to get the right colors 3. Some useful internals of BCC2GRX ----------------------------------------------------------------------------- Since LIBGRX provides a flexible and powerful set of graphics primitives, some of the basic routines are defined within bccgrx.h using "__inline__ static" functions when using a GNU-C compiler. It compiles these functions like macros, but you can refer to their addresses. There is one exeption to this rule: When compiling code based on a pascal program, a macro is used for getaspectratio since the pascal and C graphics interfaces use different calling types. BGI has something called a 'viewport'. There are two very different behaviors depending on the clipping flag: If clipping is on, one introduces something like a subscreen where (nearly) all drawing operations are done. Otherwise the origin of the drawing coordinate system is shifted from the top left corner to some other point on screen. BCC2GRX always adds the origin shift to all operations. If clipping is requested, GrSetClipBox() is called and LIBGRX restricts drawing to the selected subscreen. One may wonder why BCC2GRX has it's own drawpoly() function instead of using the LIBGRX function. In BGI a polygon isn't really a polygon but may be a union of several unconnected closed polygons. In more detail: If the start point of a polygon is reached again, the next point is the start point of a new polygon. No connection line is drawn. So one may draw several closed polygons at once. I don't know whether this behavior of the BGI is a bug or a feature, but BCC2GRX is at least compatible ... 4. initgraph()/detectgraph()/closegraph() ----------------------------------------------------------------------------- It's recommended to use something like the following code to initialize the graphics interface : int gd, gm, err; gd = DETECT; /* or detectgraph(&gd,&gm); */ initgraph(&gd,&gm,PATH_TO_CHR_FILES); err = graphresult(); if (err != grOk) ... This code sets up the default graphics mode defined in the GO32 or GRX20DRV environment variable. This code will work with Borland and GRX based BGI code without change. BCC2GRX will treat all gd values as 'DETECT' and set up the GRX default graphics mode. BCC2GRX provides two new functions to select the graphics mode: void set_BGI_mode(int *graphdriver, int *graphmode); and void set_BGI_mode_whc(int *graphdriver, int *graphmode, int width, int height, int colors); If your code requires one of the standard BGI modes, use set_BGI_mode() with BCC2GRX: gd = VGA; gm = VGAHI; #ifdef __GNUC__ set_BGI_mode( &gd, &gm); #endif initgraph( &gd, &gm, ""); All resolutions including the SVGA modes may be set up by calling the set_BGI_mode_whc() function: #ifdef __GNUC__ set_BGI_mode_whc( &gd, &gm, 640, 480, 1<<24); #else /* BCC stuff invoking a SVGA mode, needs nonstd BGI driver */ #endif initgraph( &gd, &gm, ""); The BCC2GRX requests the desired resolution from LIBGRX by calling GrSetMode( GR_width_height_color_graphics, ...) If there is no such mode in the current driver, a related one may be set up by LIBGRX. If you program needs a special resolution (say eg. Hercules 720x348) you should check getmaxx() and getmaxy() after initgraph(). Please note that - set_BGI_mode(HERCMONO, HERCMONOHI) uses 720x350x16 on VGA cards, - all drivers != NATIVE_GRX behave like DETECT with BCC2GRX, - set_BGI_mode[_whc]() sets up local variables used by initgraph() and setgraphmode(). You may change the resolution after initgraph() done by gd = DETECT; initgraph(&gd, &gm, ""); /* Default graphics mode */ .... #if defined(__TURBOC__) && defined(__MSDOS__) /* Borland GI stuff to set up 1024x768x256 mode */ gm = ... ; #else set_BGI_mode_whc(&gd, &gm, 1024, 768, 256); #endif setgraphmode( gm); /* Now in 1024x768x256 mode */ Starting with BCC2GRX v2.0 there are new functions: getmodemaxcolor(int mode), getmodemaxx(int mode), getmodemaxy(int mode) which may be called at any time, even before initgraph(). A program may require true rgb support (32k colors or more) and at least 800x600 pixels. The new getmodemax*() functions may be used for flexible setup: int gd=DETECT, gm; #if defined(__BCC2GRX__) && (__BCC2GRX__>=0x200) #define XR 800 #define YR 600 #define CR (1<<15) int lo,hi,x=0,y=0,c=0,i; detectgraph(&gd,&gm); getmoderange(gd, &lo, &hi); gm=-1; for (i=hi;i>=lo;--i) if (getmodemaxcolor(i)>=CR) { if (getmodemaxx(i)==XR && getmodemaxy(i)==YR) { gm = i; /* enough colors and exact geometry */ break; /* ==> done */ } if (getmodemaxx(i)>=XR && getmodemaxy(i)>=YR) gm = i; } else break; /* no success */ if (gm<0) { puts("Sorry, no sufficient video mode available\n"); exit(1); } #undef XR #undef YR #undef CR #endif initgraph(&gd,&gm,""); The above example exploits the BCC2GRX ordering of modes: less colors first, less total pixel count earlier, or decide by horizontal width Eg.: 640x480x16 // 16 < 256 available colors 320x200x256 // 64000 < 128000 total pixel 640x200x256 // 128000 < 172800 total pixel 360x480x256 // 360 < 480 horizontal pixel 480x360x256 // 172800 < 480000 total pixel 800x600x256 // 256 < 16M available colors 640x480x16M closegraph() doesn't free any allocated memory (eg. vector fonts). The paging routines setactivepage() and setvisualpage() are functional for GRX v2 base BCC2GRX. Just call set_BGI_mode_pages() before calling initgraph(): set_BGI_mode_pages(2); /* 1 or 2 valid ! */ initgraph(...); if (graphresult() == grOk && get_BGI_mode_pages() > 1) { /* Do cool paging stuff */ } You can't check paging without switching into graphics mode! Translating BCC modes by set_BGI_mode() will disable paging! 5. Using fonts ------------------------------------------------------------------------------ The BCC2GRX v1.2 or newer can link vector fonts into the .exe file. The standard fonts are in the libbcc*.a: _bold_font, _euro_font, _goth_font, _lcom_font _litt_font, _sans_font, _scri_font, _simp_font _trip_font, _tscr_font Call registerbgifont() to enable font usage: registerbgifont( &_bold_font); registerbgifont( &_euro_font); registerbgifont( &_goth_font); registerbgifont( &_lcom_font); registerbgifont( &_litt_font); registerbgifont( &_sans_font); registerbgifont( &_scri_font); registerbgifont( &_simp_font); registerbgifont( &_trip_font); registerbgifont( &_tscr_font); Of course you can also link non standard fonts: - copy the .chr file(s) to bcc2grx/src - goto bcc2grx and type 'make' - add extern int _<font_name>_font; registerbgifont( &_<font_name>_font); to your source The actual BCC2GRX handels the 11 standard and up to 10 user fonts. If you need more user fonts, you should change the definition of LastUserFont in text.c! Starting with BCC2GRX v1.2 you can also use the LIBGRX bitmapped fonts. Just get a font handle and set the new text style. Eg. you may want to use the 8x16 VGA font in high resolution graphics: font_handle = installuserfont( "pc8x16.fnt"); settextstyle( font_handle, HORIZ_DIR, 1); See test/ttext.c for more examples. Please note that GRX 2.x can't scale bitmap fonts at drawing level any longer. Before drawing a magnified DEFAULT_FONT, BCC2GRX will first set up the required new font and keeps a pointer for later use. Due to this, you might notice a slight delay the first time you request a magnified font. The new GRX 2.x may use Borland vector fonts as native fonts. Managing the resulting bitmap fonts would use much more memory than linking the font rendering code twice, so I decided not to use the GRX font API. Every font will be loaded only once and stay in (virtual) memory until the program terminates. If this behaviour doesn't work with your program (eg. something like a font editor) or you get short of memory loading hundreds of fonts, please tell me about. 8. What's new in this release? ----------------------------------------------------------------------------- New copyright terms: same license as the rest of GRX. Updated for GRX 1.03 / .vdr drivers / 64K && 16M color modes More robust library internal function naming BLACK now is a constant Several (minor) bug fixes Updated for GRX v2 libbcc.h won't include GRX stuff any more added version control __BCC2GRX__ Linux support setactivepage()/setvisualpage() with GRX v2 For a more complete list of changes and new features check src/changes. 9. LIBGRX 2.4.5 and later ----------------------------------------------------------------------------- Starting with LIBGRX 2.4.5, BCC2GRX supports Turbo-C and BCC. Since Watcom-C is also supported, BCC2GRX now runs on all platforms supported by LIBGRX. The documentation has been updated accordingly. [View Less]

3 4

macroi16.dif
by Dimitar Zhekov 28 Jun '02

28 Jun '02

Second version og statif16.dif plus some more stuff: - inline functions defined as macro and non-inline versions - BGI number of colors for DOS / BCC limited to < 15bpp - BGI aspect ratio fixed for 16-bit systems (DOS / BCC) - _BGI_INLINE_ moved to fldfill.c, the only module that uses it now - inline functions in text4.c replaced with macros, please check it - test\bgi\colortst.c fixed to use getch() not getchar() Compiled and tested with DOS / BCC only. Will test with Linux ASAP. … [View More]diff -Nru3 grx245-1/include/libbcc.h grx/include/libbcc.h --- grx245-1/include/libbcc.h Sat Dec 22 14:02:42 2001 +++ grx/include/libbcc.h Fri Jun 28 16:18:52 2002 @@ -495,217 +495,317 @@ #endif /* ----------------------------------------------------------------- */ -#ifdef __cplusplus -#define _BGI_INLINE_ inline -#elif defined(__GNUC__) -#define _BGI_INLINE_ __inline__ -#elif defined(_MSC_VER) -#define _BGI_INLINE_ _inline -#else -#define _BGI_INLINE_ -#endif +/* --- API functions with macro equivalents --- */ +/* --- (for inlining) --- */ /* ----------------------------------------------------------------- */ +void restorecrtmode(void); +int getgraphmode(void); +int getmaxmode(void); +void getmoderange(int gd, int *lomode, int *himode); +int graphresult(void); +int getx(void); +int gety(void); +void moveto(int x, int y); +void moverel(int dx, int dy); +int getbkcolor(void); +int getcolor(void); +void cleardevice(void); +void setbkcolor(int color); +void setcolor(int color); +void line(int x1, int y1, int x2, int y2); +void linerel(int dx, int dy); +void lineto(int x, int y); +void drawpoly(int numpoints, void *polypoints); +void bar(int left, int top, int right, int bottom); +void circle(int x, int y, int radius); +void ellipse( int x, int y, int stangle, int endangle, + int xradius, int yradius ); +void arc(int x, int y, int stangle, int endangle, int radius); +void getaspectratio(int *xasp, int *yasp); +void setaspectratio( int xasp, int yasp ); +void getfillsettings(struct fillsettingstype *fillinfo); +void getfillpattern(char *pattern); +void sector( int x, int y, int stangle, int endangle, + int xradius, int yradius ); +void pieslice(int x, int y, int stangle, int endangle, int radius); +unsigned setgraphbufsize(unsigned bufsize); +struct palettetype *getdefaultpalette(void); +int installbgidriver(char *name, void *detect); +int registerfarbgidriver(void *driver); +int registerfarbgifont(void *font); +void textlinestyle(int on); +void setpalette(int colornum, int color); +void set_BGI_mode_pages(int p); +int get_BGI_mode_pages(void); +void set_BGI_mode_whc(int *gd, int *gm, int width, int height, int colors); +int getmodemaxcolor(int mode); +int getmodemaxx(int mode); +int getmodemaxy(int mode); +int setrgbcolor(int r, int g, int b); +void setactivepage(int p); +int getactivepage(void); +void setvisualpage(int p); +int getvisualpage(void); + +/* ----------------------------------------------------------------- */ +#define restorecrtmode() __gr_restorecrtmode() +#define getgraphmode() (__gr_INIT ? __gr_Mode : (__gr_Result=grNoInitGraph)) +#define getmaxmode() (__gr_set_up_modes(), __gr_MaxMode) +#define getmoderange(gd, lomode, himode) \ + __gr_getmoderange((gd),(lomode),(himode)) +/* graphresult() uses local variable res */ +#define getx() (__gr_X+0) +#define gety() (__gr_Y+0) +#define moveto(x, y) do { __gr_X = (x); __gr_Y = (y); } while(0) +#define moverel(dx, dy) moveto(getx()+(dx),gety()+(dy)) +#define getbkcolor() (__gr_colorbg+0) +#define getcolor() (__gr_color+0) +#define cleardevice() __gr_cleardevice() +#define setbkcolor(color) do __gr_colorbg = (color); while(0) +#define setcolor(color) do __gr_color = (color); while(0) +#define line(x1, y1, x2, y2) __gr_line((x1),(y1),(x2),(y2)) +#define linerel(dx, dy) __gr_line(getx(),gety(),getx()+(dx),gety()+(dy)) +#define lineto(x, y) __gr_line(getx(),gety(),(x),(y)) +#define drawpoly(numpoints, polypoints) \ + __gr_drawpol((numpoints), (polypoints), FALSE) +#define bar(left, top, right, bottom) __gr_bar((left),(top),(right),(bottom)) +#define circle(x, y, radius) __gr_circle((x),(y),(radius)) +#define ellipse(x, y, stangle, endangle, xradius, yradius) \ + __gr_ellipse((x),(y),(stangle),(endangle),(xradius),(yradius)) +/* arc() uses radius twice */ +#define getaspectratio(xasp, yasp) \ + do { *(xasp) = __gr_Xasp; *(yasp) = __gr_Yasp; } while(0) +#define setaspectratio(xasp, yasp ) \ + do { __gr_Xasp = (xasp); __gr_Yasp = (yasp); } while(0) +/* getfillsettings() uses fillinfo twice */ +#define getfillpattern(pattern) __gr_getfillpattern(pattern) +#define sector(x, y, stangle, endangle, xradius, yradius) \ + __gr_sector((x),(y),(stangle),(endangle),(xradius), (yradius)); +/* pieslice() uses radius twice */ +#define setgraphbufsize(bufsize) __gr_setgraphbufsize(bufsize) +#define getdefaultpalette() (&__gr_EGAdef) +#define installbgidriver(name, detect) __gr_installbgidriver((name), (detect)) +#define registerfarbgidriver(driver) __gr_registerfarbgidriver(driver) +#define registerfarbgifont(font) registerbgifont(font) +#define textlinestyle(on) do __gr_TextLineStyle = on; while(0); +#define setpalette(colornum, color) __gr_setpalette((colornum),(color)) +#define set_BGI_mode_pages(p) __gr_set_BGI_mode_pages(p) +#define get_BGI_mode_pages() __gr_get_BGI_mode_pages() +#define set_BGI_mode_whc(gd, gm, width, height, colors) \ + do { \ + __gr_set_BGI_mode_pages(1); \ + __gr_BGI_w = (width); \ + __gr_BGI_h = (height); \ + __gr_BGI_c = (colors); \ + *(gd) = NATIVE_GRX; \ + *(gm) = GRX_BGI_EMULATION; \ + } while(0) +#define getmodemaxcolor(mode) __gr_getmodemaxcolor(mode) +#define getmodemaxx(mode) __gr_getmodemaxx(mode) +#define getmodemaxy(mode) __gr_getmodemaxx(mode) +#define setrgbcolor(r, g, b) __gr_setrgbcolor((r),(g),(b)) +#define setactivepage(p) __gr_setactivepage(p) +#define getactivepage() __gr_getactivepage() +#define setvisualpage(p) __gr_setvisualpage(p) +#define getvisualpage() __gr_getvisualpage() + +#ifdef __BCCGRX_C /* ----------------------------------------------------------------- */ -/* --- The following functions work line macros with gcc, each --- */ -/* --- function <func> has a compatible direct linkable variant --- */ -/* --- __gr_<func> that is fully compatible --- */ -/* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void restorecrtmode(void) { +void (restorecrtmode)(void) { __gr_restorecrtmode(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getgraphmode(void) { +int (getgraphmode)(void) { return (__gr_INIT ? __gr_Mode : (__gr_Result=grNoInitGraph)); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmaxmode(void) { +int (getmaxmode)(void) { __gr_set_up_modes(); return __gr_MaxMode; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getmoderange(int gd, int *lomode, int *himode) { +void (getmoderange)(int gd, int *lomode, int *himode) { __gr_getmoderange(gd, lomode, himode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int graphresult(void) { +int (graphresult)(void) { int res = (__gr_INIT ? __gr_Result : grNoInitGraph); __gr_Result = grOk; return res; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getx(void) { +int (getx)(void) { return __gr_X; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int gety(void) { +int (gety)(void) { return __gr_Y; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void moveto(int x, int y) { +void (moveto)(int x, int y) { __gr_X = x; __gr_Y = y; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void moverel(int dx, int dy) { +void (moverel)(int dx, int dy) { moveto( getx()+dx, gety()+dy); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getbkcolor(void) { +int (getbkcolor)(void) { return __gr_colorbg; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getcolor(void) { +int (getcolor)(void) { return __gr_color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void cleardevice(void) { +void (cleardevice)(void) { __gr_cleardevice(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setbkcolor(int color) { +void (setbkcolor)(int color) { __gr_colorbg= color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setcolor(int color) { +void (setcolor)(int color) { __gr_color= color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void line(int x1, int y1, int x2, int y2) { +void (line)(int x1, int y1, int x2, int y2) { __gr_line(x1,y1,x2,y2); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void linerel(int dx, int dy) { +void (linerel)(int dx, int dy) { register int x = getx(); register int y = gety(); __gr_line(x,y,x+dx,y+dy); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void lineto(int x, int y) { +void (lineto)(int x, int y) { __gr_line( getx(), gety(), x, y); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void drawpoly(int numpoints, void *polypoints) { +void (drawpoly)(int numpoints, void *polypoints) { __gr_drawpol(numpoints, polypoints, FALSE); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void bar(int left, int top, int right, int bottom) { +void (bar)(int left, int top, int right, int bottom) { __gr_bar(left,top,right, bottom); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void circle(int x, int y, int radius) { +void (circle)(int x, int y, int radius) { __gr_circle(x,y,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void ellipse( int x, int y, int stangle, int endangle, - int xradius, int yradius ) { +void (ellipse)( int x, int y, int stangle, int endangle, + int xradius, int yradius ) { __gr_ellipse( x, y, stangle, endangle, xradius, yradius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void arc(int x, int y, int stangle, int endangle, int radius) { +void (arc)(int x, int y, int stangle, int endangle, int radius) { __gr_ellipse(x,y,stangle,endangle,radius,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getaspectratio(int *xasp, int *yasp) { +void (getaspectratio)(int *xasp, int *yasp) { *xasp = __gr_Xasp; *yasp = __gr_Yasp; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setaspectratio( int xasp, int yasp ) { +void (setaspectratio)( int xasp, int yasp ) { __gr_Xasp = xasp; __gr_Yasp = yasp; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getfillsettings(struct fillsettingstype *fillinfo) { +void (getfillsettings)(struct fillsettingstype *fillinfo) { fillinfo->pattern = __gr_fpatno; fillinfo->color = __gr_colorfill; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getfillpattern(char *pattern) { +void (getfillpattern)(char *pattern) { __gr_getfillpattern(pattern); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void sector( int x, int y, int stangle, int endangle, - int xradius, int yradius ) { +void (sector)( int x, int y, int stangle, int endangle, + int xradius, int yradius ) { __gr_sector(x,y,stangle,endangle,xradius, yradius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void pieslice(int x, int y, int stangle, int endangle, int radius) { +void (pieslice)(int x, int y, int stangle, int endangle, int radius) { __gr_sector(x,y,stangle,endangle,radius,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ unsigned setgraphbufsize(unsigned bufsize) { +unsigned (setgraphbufsize)(unsigned bufsize) { return __gr_setgraphbufsize(bufsize); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ struct palettetype *getdefaultpalette(void) { +struct palettetype *(getdefaultpalette)(void) { return &__gr_EGAdef; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int installbgidriver(char *name, void *detect) { +int (installbgidriver)(char *name, void *detect) { return __gr_installbgidriver(name, detect); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int registerfarbgidriver(void *driver) { +int (registerfarbgidriver)(void *driver) { return __gr_registerfarbgidriver(driver); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int registerfarbgifont(void *font) { +int (registerfarbgifont)(void *font) { return registerbgifont(font); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void textlinestyle(int on) { +void (textlinestyle)(int on) { __gr_TextLineStyle = on; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setpalette(int colornum, int color) { +void (setpalette)(int colornum, int color) { __gr_setpalette(colornum,color); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void set_BGI_mode_pages(int p) { +void (set_BGI_mode_pages)(int p) { __gr_set_BGI_mode_pages(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int get_BGI_mode_pages(void) { +int (get_BGI_mode_pages)(void) { return __gr_get_BGI_mode_pages(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void set_BGI_mode_whc(int *gd, int *gm, - int width, int height, int colors) { +void (set_BGI_mode_whc)(int *gd, int *gm, int width, int height, int colors) { __gr_set_BGI_mode_pages(1); __gr_BGI_w = width; __gr_BGI_h = height; @@ -715,48 +815,49 @@ } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxcolor(int mode) { +int (getmodemaxcolor)(int mode) { /* works like getmaxcolor() for mode */ return __gr_getmodemaxcolor(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxx(int mode) { +int (getmodemaxx)(int mode) { /* works like getmaxx() for mode */ return __gr_getmodemaxx(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxy(int mode) { +int (getmodemaxy)(int mode) { /* works like getmaxy() for mode */ return __gr_getmodemaxx(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int setrgbcolor(int r, int g, int b) { +int (setrgbcolor)(int r, int g, int b) { return __gr_setrgbcolor(r,g,b); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setactivepage(int p) { +void (setactivepage)(int p) { __gr_setactivepage(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getactivepage(void) { +int (getactivepage)(void) { return __gr_getactivepage(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setvisualpage(int p) { +void (setvisualpage)(int p) { __gr_setvisualpage(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getvisualpage(void) { +int (getvisualpage)(void) { return __gr_getvisualpage(); } +#endif /* __BCCGRX_C */ /* ----------------------------------------------------------------- */ #endif diff -Nru3 grx245-1/src/bgi/bccgrx.c grx/src/bgi/bccgrx.c --- grx245-1/src/bgi/bccgrx.c Thu Apr 19 04:20:52 2001 +++ grx/src/bgi/bccgrx.c Fri Jun 28 16:08:50 2002 @@ -176,6 +176,9 @@ ++fmode ) { mp = GrFirstVideoMode(fmode); while (mp != NULL) { +#if defined(__TURBOC__) && defined(__MSDOS__) + if(mp->bpp < 15) +#endif NewMode(mp->width, mp->height, 1<<mp->bpp); mp = GrNextVideoMode(mp); } @@ -324,7 +327,7 @@ __gr_clip = TRUE; __gr_Xasp = 10000; - __gr_Yasp = __gr_Xasp * ((VR+1)*3) / ((VB+1)*4); + __gr_Yasp = __gr_Xasp * ((VR+1)*3L) / ((VB+1)*4L); __gr_lstyle = SOLID_LINE; LNE.lno_pattlen = 0; diff -Nru3 grx245-1/src/bgi/bccgrx00.h grx/src/bgi/bccgrx00.h --- grx245-1/src/bgi/bccgrx00.h Thu Apr 19 04:20:52 2001 +++ grx/src/bgi/bccgrx00.h Fri Jun 28 14:35:44 2002 @@ -103,7 +103,24 @@ #define IMAGE_CONTEXT_SIZE (((sizeof(GrContext)+15)&~15)+4) /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void __gr_Reset_ClipBox(void) +#ifdef GRX_VERSION +#define GrResetClipBox() GrSetClipBox( 0, PY, getmaxx(), getmaxy()+PY) +#endif + +void __gr_Reset_ClipBox(void); +#define __gr_Reset_ClipBox() \ + do { \ + if (__gr_clip) GrSetClipBox( VL, VT+PY, VR, VB+PY); \ + else GrResetClipBox(); \ + } while(0) + +#ifdef GRX_VERSION +#undef GrResetClipBox +#endif + +#ifdef __BCCGRX_C + +void (__gr_Reset_ClipBox)(void) { if (__gr_clip) GrSetClipBox( VL, VT+PY, VR, VB+PY); else @@ -113,6 +130,8 @@ GrResetClipBox(); #endif } + +#endif /* ----------------------------------------------------------------- */ diff -Nru3 grx245-1/src/bgi/fldfill.c grx/src/bgi/fldfill.c --- grx245-1/src/bgi/fldfill.c Thu Apr 19 04:42:56 2001 +++ grx/src/bgi/fldfill.c Fri Jun 28 14:28:54 2002 @@ -67,6 +67,16 @@ #define calc_high_bits(x) ( (~((element)0)) << ((x)&(bits_per_element-1))) #define calc_ofs(x) ((x) / offset_div) +/* ----------------------------------------------------------------- */ +#if defined(__GNUC__) +#define _BGI_INLINE_ __inline__ +#elif defined(_MSC_VER) +#define _BGI_INLINE_ _inline +#else +#define _BGI_INLINE_ +#endif +/* ----------------------------------------------------------------- */ + /* -------- internal line buffer functions ** ** (x,y) scaled to (0..mx,0..my) diff -Nru3 grx245-1/src/bgi/text4.c grx/src/bgi/text4.c --- grx245-1/src/bgi/text4.c Sun Dec 23 03:15:42 2001 +++ grx/src/bgi/text4.c Fri Jun 28 14:11:04 2002 @@ -25,14 +25,8 @@ #include "text.h" /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int xoff(_ushort x) { - /* Csaba did it this way, well done */ - return ((int)(signed char)((x) << 1) >> 1); -} - -static _BGI_INLINE_ int yoff(_ushort y) { - return - ((int)(signed char)((y) >> 7) >> 1); -} +#define xoff(x) ((int)(signed char)(((_ushort) (x)) << 1) >> 1) +#define yoff(y) (-((int)(signed char)(((_ushort) (y)) >> 7) >> 1)) /* ----------------------------------------------------------------- */ void __gr_text_vec(int *xx, int *yy, int XX, int YY, int len, uchar *txt) diff -Nru3 grx245-1/test/bgi/colortst.c grx/test/bgi/colortst.c --- grx245-1/test/bgi/colortst.c Thu Jun 27 12:50:54 2002 +++ grx/test/bgi/colortst.c Fri Jun 28 16:13:34 2002 @@ -7,6 +7,14 @@ #include "libbcc.h" +#ifdef __DJGPP__ +#include <conio.h> +#include <pc.h> +#else +extern int getch(void); +extern int getkey(void); +extern int kbhit(void); +#endif static void testmode(int mode) { int xmax, ymax; @@ -89,7 +97,7 @@ settextjustify( CENTER_TEXT, BOTTOM_TEXT ); outtextxy(getmaxx()/2, getmaxy(), mn); } - getchar(); + getch(); if (oldmode != mode) setgraphmode(oldmode); [View Less]

1 0

statin16.dif
by Dimitar Zhekov 28 Jun '02

28 Jun '02

As far as I know, the static inline functions work as described in readme.bgi only for GNU C. In all other compilers, if a static inline function is not inlined [inline is a request only, the compiler may ignore it], the compiler stores a static copy of that function in each module that references it, or, in a case of a s####y compiler, in each module that sees it, thus greatly enlarging the size of executables and libraries generated. The patch below: - uses static inline for GNU C only,… [View More] or - uses inline if the compiler supports it, or - just declares and defines regular functions. In the last case, the functions are declared always, but defined only once: when the header is included from bccgrx.c, which defines __BCCGRX_C. The _BGI_IPROTO_ define is to distinguish between inline functions being inlined or being declared and defined. Compiled and tested with BCC. GRX library size dropped from 740 to 620KB with the patch applied. However test/bgi/bgilink may fail if a non-GNU C compiled providing inline functions but not addresses for them is used. In theory any compiler should switch to non-inline if the address of an inline function is requested, but who knows... diff -Nru3 grx245-1/include/libbcc.h grx/include/libbcc.h --- grx245-1/include/libbcc.h Sat Dec 22 14:02:42 2001 +++ grx/include/libbcc.h Thu Jun 27 12:59:38 2002 @@ -495,6 +495,14 @@ #endif /* ----------------------------------------------------------------- */ +#ifdef __GNUC__ +#define _BGI_STATIC_ static +#else +#define _BGI_STATIC_ +#endif +/* ----------------------------------------------------------------- */ + +/* ----------------------------------------------------------------- */ #ifdef __cplusplus #define _BGI_INLINE_ inline #elif defined(__GNUC__) @@ -503,6 +511,60 @@ #define _BGI_INLINE_ _inline #else #define _BGI_INLINE_ +#define _BGI_IPROTO_ +#endif + +/* ----------------------------------------------------------------- */ +#ifdef _BGI_IPROTO_ +_BGI_STATIC_ _BGI_INLINE_ void restorecrtmode(void); +_BGI_STATIC_ _BGI_INLINE_ int getgraphmode(void); +_BGI_STATIC_ _BGI_INLINE_ int getmaxmode(void); +_BGI_STATIC_ _BGI_INLINE_ void getmoderange(int gd, int *lomode, int *himode); +_BGI_STATIC_ _BGI_INLINE_ int graphresult(void); +_BGI_STATIC_ _BGI_INLINE_ int getx(void); +_BGI_STATIC_ _BGI_INLINE_ int gety(void); +_BGI_STATIC_ _BGI_INLINE_ void moveto(int x, int y); +_BGI_STATIC_ _BGI_INLINE_ void moverel(int dx, int dy); +_BGI_STATIC_ _BGI_INLINE_ int getbkcolor(void); +_BGI_STATIC_ _BGI_INLINE_ int getcolor(void); +_BGI_STATIC_ _BGI_INLINE_ void cleardevice(void); +_BGI_STATIC_ _BGI_INLINE_ void setbkcolor(int color); +_BGI_STATIC_ _BGI_INLINE_ void setcolor(int color);; +_BGI_STATIC_ _BGI_INLINE_ void line(int x1, int y1, int x2, int y2); +_BGI_STATIC_ _BGI_INLINE_ void linerel(int dx, int dy); +_BGI_STATIC_ _BGI_INLINE_ void lineto(int x, int y); +_BGI_STATIC_ _BGI_INLINE_ void drawpoly(int numpoints, void *polypoints); +_BGI_STATIC_ _BGI_INLINE_ void bar(int left, int top, int right, int bottom); +_BGI_STATIC_ _BGI_INLINE_ void circle(int x, int y, int radius); +_BGI_STATIC_ _BGI_INLINE_ void ellipse( int x, int y, int stangle, int endangle, + int xradius, int yradius ); +_BGI_STATIC_ _BGI_INLINE_ void arc(int x, int y, int stangle, int endangle, int radius); +_BGI_STATIC_ _BGI_INLINE_ void getaspectratio(int *xasp, int *yasp); +_BGI_STATIC_ _BGI_INLINE_ void setaspectratio( int xasp, int yasp ); +_BGI_STATIC_ _BGI_INLINE_ void getfillsettings(struct fillsettingstype *fillinfo); +_BGI_STATIC_ _BGI_INLINE_ void getfillpattern(char *pattern); +_BGI_STATIC_ _BGI_INLINE_ void sector( int x, int y, int stangle, int endangle, + int xradius, int yradius ); +_BGI_STATIC_ _BGI_INLINE_ void pieslice(int x, int y, int stangle, int endangle, int radius); +_BGI_STATIC_ _BGI_INLINE_ unsigned setgraphbufsize(unsigned bufsize); +_BGI_STATIC_ _BGI_INLINE_ struct palettetype *getdefaultpalette(void); +_BGI_STATIC_ _BGI_INLINE_ int installbgidriver(char *name, void *detect); +_BGI_STATIC_ _BGI_INLINE_ int registerfarbgidriver(void *driver); +_BGI_STATIC_ _BGI_INLINE_ int registerfarbgifont(void *font); +_BGI_STATIC_ _BGI_INLINE_ void textlinestyle(int on); +_BGI_STATIC_ _BGI_INLINE_ void setpalette(int colornum, int color); +_BGI_STATIC_ _BGI_INLINE_ void set_BGI_mode_pages(int p); +_BGI_STATIC_ _BGI_INLINE_ int get_BGI_mode_pages(void); +_BGI_STATIC_ _BGI_INLINE_ void set_BGI_mode_whc(int *gd, int *gm, + int width, int height, int colors); +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxcolor(int mode); +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxx(int mode); +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxy(int mode); +_BGI_STATIC_ _BGI_INLINE_ int setrgbcolor(int r, int g, int b); +_BGI_STATIC_ _BGI_INLINE_ void setactivepage(int p); +_BGI_STATIC_ _BGI_INLINE_ int getactivepage(void); +_BGI_STATIC_ _BGI_INLINE_ void setvisualpage(int p); +_BGI_STATIC_ _BGI_INLINE_ int getvisualpage(void); #endif /* ----------------------------------------------------------------- */ @@ -511,200 +573,202 @@ /* --- function <func> has a compatible direct linkable variant --- */ /* --- __gr_<func> that is fully compatible --- */ /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void restorecrtmode(void) { +#if !defined(_BGI_IPROTO_) || defined(__BCCGRX_C) + +_BGI_STATIC_ _BGI_INLINE_ void restorecrtmode(void) { __gr_restorecrtmode(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getgraphmode(void) { +_BGI_STATIC_ _BGI_INLINE_ int getgraphmode(void) { return (__gr_INIT ? __gr_Mode : (__gr_Result=grNoInitGraph)); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmaxmode(void) { +_BGI_STATIC_ _BGI_INLINE_ int getmaxmode(void) { __gr_set_up_modes(); return __gr_MaxMode; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getmoderange(int gd, int *lomode, int *himode) { +_BGI_STATIC_ _BGI_INLINE_ void getmoderange(int gd, int *lomode, int *himode) { __gr_getmoderange(gd, lomode, himode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int graphresult(void) { +_BGI_STATIC_ _BGI_INLINE_ int graphresult(void) { int res = (__gr_INIT ? __gr_Result : grNoInitGraph); __gr_Result = grOk; return res; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getx(void) { +_BGI_STATIC_ _BGI_INLINE_ int getx(void) { return __gr_X; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int gety(void) { +_BGI_STATIC_ _BGI_INLINE_ int gety(void) { return __gr_Y; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void moveto(int x, int y) { +_BGI_STATIC_ _BGI_INLINE_ void moveto(int x, int y) { __gr_X = x; __gr_Y = y; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void moverel(int dx, int dy) { +_BGI_STATIC_ _BGI_INLINE_ void moverel(int dx, int dy) { moveto( getx()+dx, gety()+dy); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getbkcolor(void) { +_BGI_STATIC_ _BGI_INLINE_ int getbkcolor(void) { return __gr_colorbg; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getcolor(void) { +_BGI_STATIC_ _BGI_INLINE_ int getcolor(void) { return __gr_color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void cleardevice(void) { +_BGI_STATIC_ _BGI_INLINE_ void cleardevice(void) { __gr_cleardevice(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setbkcolor(int color) { +_BGI_STATIC_ _BGI_INLINE_ void setbkcolor(int color) { __gr_colorbg= color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setcolor(int color) { +_BGI_STATIC_ _BGI_INLINE_ void setcolor(int color) { __gr_color= color; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void line(int x1, int y1, int x2, int y2) { +_BGI_STATIC_ _BGI_INLINE_ void line(int x1, int y1, int x2, int y2) { __gr_line(x1,y1,x2,y2); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void linerel(int dx, int dy) { +_BGI_STATIC_ _BGI_INLINE_ void linerel(int dx, int dy) { register int x = getx(); register int y = gety(); __gr_line(x,y,x+dx,y+dy); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void lineto(int x, int y) { +_BGI_STATIC_ _BGI_INLINE_ void lineto(int x, int y) { __gr_line( getx(), gety(), x, y); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void drawpoly(int numpoints, void *polypoints) { +_BGI_STATIC_ _BGI_INLINE_ void drawpoly(int numpoints, void *polypoints) { __gr_drawpol(numpoints, polypoints, FALSE); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void bar(int left, int top, int right, int bottom) { +_BGI_STATIC_ _BGI_INLINE_ void bar(int left, int top, int right, int bottom) { __gr_bar(left,top,right, bottom); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void circle(int x, int y, int radius) { +_BGI_STATIC_ _BGI_INLINE_ void circle(int x, int y, int radius) { __gr_circle(x,y,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void ellipse( int x, int y, int stangle, int endangle, +_BGI_STATIC_ _BGI_INLINE_ void ellipse( int x, int y, int stangle, int endangle, int xradius, int yradius ) { __gr_ellipse( x, y, stangle, endangle, xradius, yradius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void arc(int x, int y, int stangle, int endangle, int radius) { +_BGI_STATIC_ _BGI_INLINE_ void arc(int x, int y, int stangle, int endangle, int radius) { __gr_ellipse(x,y,stangle,endangle,radius,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getaspectratio(int *xasp, int *yasp) { +_BGI_STATIC_ _BGI_INLINE_ void getaspectratio(int *xasp, int *yasp) { *xasp = __gr_Xasp; *yasp = __gr_Yasp; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setaspectratio( int xasp, int yasp ) { +_BGI_STATIC_ _BGI_INLINE_ void setaspectratio( int xasp, int yasp ) { __gr_Xasp = xasp; __gr_Yasp = yasp; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getfillsettings(struct fillsettingstype *fillinfo) { +_BGI_STATIC_ _BGI_INLINE_ void getfillsettings(struct fillsettingstype *fillinfo) { fillinfo->pattern = __gr_fpatno; fillinfo->color = __gr_colorfill; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void getfillpattern(char *pattern) { +_BGI_STATIC_ _BGI_INLINE_ void getfillpattern(char *pattern) { __gr_getfillpattern(pattern); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void sector( int x, int y, int stangle, int endangle, +_BGI_STATIC_ _BGI_INLINE_ void sector( int x, int y, int stangle, int endangle, int xradius, int yradius ) { __gr_sector(x,y,stangle,endangle,xradius, yradius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void pieslice(int x, int y, int stangle, int endangle, int radius) { +_BGI_STATIC_ _BGI_INLINE_ void pieslice(int x, int y, int stangle, int endangle, int radius) { __gr_sector(x,y,stangle,endangle,radius,radius); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ unsigned setgraphbufsize(unsigned bufsize) { +_BGI_STATIC_ _BGI_INLINE_ unsigned setgraphbufsize(unsigned bufsize) { return __gr_setgraphbufsize(bufsize); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ struct palettetype *getdefaultpalette(void) { +_BGI_STATIC_ _BGI_INLINE_ struct palettetype *getdefaultpalette(void) { return &__gr_EGAdef; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int installbgidriver(char *name, void *detect) { +_BGI_STATIC_ _BGI_INLINE_ int installbgidriver(char *name, void *detect) { return __gr_installbgidriver(name, detect); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int registerfarbgidriver(void *driver) { +_BGI_STATIC_ _BGI_INLINE_ int registerfarbgidriver(void *driver) { return __gr_registerfarbgidriver(driver); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int registerfarbgifont(void *font) { +_BGI_STATIC_ _BGI_INLINE_ int registerfarbgifont(void *font) { return registerbgifont(font); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void textlinestyle(int on) { +_BGI_STATIC_ _BGI_INLINE_ void textlinestyle(int on) { __gr_TextLineStyle = on; } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setpalette(int colornum, int color) { +_BGI_STATIC_ _BGI_INLINE_ void setpalette(int colornum, int color) { __gr_setpalette(colornum,color); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void set_BGI_mode_pages(int p) { +_BGI_STATIC_ _BGI_INLINE_ void set_BGI_mode_pages(int p) { __gr_set_BGI_mode_pages(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int get_BGI_mode_pages(void) { +_BGI_STATIC_ _BGI_INLINE_ int get_BGI_mode_pages(void) { return __gr_get_BGI_mode_pages(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void set_BGI_mode_whc(int *gd, int *gm, +_BGI_STATIC_ _BGI_INLINE_ void set_BGI_mode_whc(int *gd, int *gm, int width, int height, int colors) { __gr_set_BGI_mode_pages(1); __gr_BGI_w = width; @@ -715,48 +779,49 @@ } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxcolor(int mode) { +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxcolor(int mode) { /* works like getmaxcolor() for mode */ return __gr_getmodemaxcolor(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxx(int mode) { +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxx(int mode) { /* works like getmaxx() for mode */ return __gr_getmodemaxx(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getmodemaxy(int mode) { +_BGI_STATIC_ _BGI_INLINE_ int getmodemaxy(int mode) { /* works like getmaxy() for mode */ return __gr_getmodemaxx(mode); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int setrgbcolor(int r, int g, int b) { +_BGI_STATIC_ _BGI_INLINE_ int setrgbcolor(int r, int g, int b) { return __gr_setrgbcolor(r,g,b); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setactivepage(int p) { +_BGI_STATIC_ _BGI_INLINE_ void setactivepage(int p) { __gr_setactivepage(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getactivepage(void) { +_BGI_STATIC_ _BGI_INLINE_ int getactivepage(void) { return __gr_getactivepage(); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void setvisualpage(int p) { +_BGI_STATIC_ _BGI_INLINE_ void setvisualpage(int p) { __gr_setvisualpage(p); } /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ int getvisualpage(void) { +_BGI_STATIC_ _BGI_INLINE_ int getvisualpage(void) { return __gr_getvisualpage(); } +#endif /* ----------------------------------------------------------------- */ #endif diff -Nru3 grx245-1/src/bgi/bccgrx00.h grx/src/bgi/bccgrx00.h --- grx245-1/src/bgi/bccgrx00.h Thu Apr 19 04:20:52 2001 +++ grx/src/bgi/bccgrx00.h Thu Jun 27 12:41:20 2002 @@ -103,7 +103,13 @@ #define IMAGE_CONTEXT_SIZE (((sizeof(GrContext)+15)&~15)+4) /* ----------------------------------------------------------------- */ -static _BGI_INLINE_ void __gr_Reset_ClipBox(void) +#ifdef __BGI_IPROTO__ +_BGI_STATIC_ _BGI_INLINE_ void __gr_Reset_ClipBox(void); +#endif + +#if !defined(__BGI_IPROTO__) || defined(__BCCGRX_C) + +_BGI_STATIC_ _BGI_INLINE_ void __gr_Reset_ClipBox(void) { if (__gr_clip) GrSetClipBox( VL, VT+PY, VR, VB+PY); else @@ -113,6 +119,8 @@ GrResetClipBox(); #endif } + +#endif /* ----------------------------------------------------------------- */ [View Less]

2 2

bccbgi16.dif
by Dimitar Zhekov 27 Jun '02

27 Jun '02

In an attempt to produce a working "make bgitest" for bcc, I tried to link the BGI test programs against Borland graphics.lib, but failed. Albeit similar, Borland and GRX implementations of BGI are different, so I decided to port GRX BGI to Borland C. What's in the patch below: - all header and source files include libbcc.h and not graphics.h - modename uses long color values - GRX for BCC includes the GRX BGI modules - fontplay "requires DJGPP/GRX", removed from test\bgi\makefile.bcc - … [View More]getch(), getkey() and kbhit() from test\bgi\* synced with test\keys - some compatibility fixes Compiled and tested with Borland C/C++ 5.01 - some of the static inline functions generate harmless warnings - test\bgi\tellipse displays something... well, for sure not ellipse - test\bgi\colortst displays black screen for some modes - all other bgi tests work properly More work is probably required, but this is still better (IMHO) than having non-working/incompatible BGI for BCC, right? And GRX BGI can not be ported to work on top of Borland BGI, they are too different. diff -Nru3 grx245p3/include/bgiext.h grx/include/bgiext.h --- grx245p3/include/bgiext.h Fri Jan 12 03:36:56 2001 +++ grx/include/bgiext.h Mon Jun 24 13:56:12 2002 @@ -24,12 +24,7 @@ #ifndef __BGIEXT_H #define __BGIEXT_H -#ifdef __TURBOC__ -# include <graphics.h> -#endif -#ifdef __GNUC__ -# include <libbcc.h> -#endif +#include <libbcc.h> #ifdef __cplusplus extern "C" { diff -Nru3 grx245p3/src/bgi/modename.c grx/src/bgi/modename.c --- grx245p3/src/bgi/modename.c Fri Jan 12 19:36:44 2001 +++ grx/src/bgi/modename.c Mon Jun 24 13:48:24 2002 @@ -47,9 +47,9 @@ if (!__gr_getmode_whc(mode_number, &xw, &yw, &nc)) return NULL; switch (nc) { - case 1<<15 : strcpy(cols,"32K"); break; - case 1<<16 : strcpy(cols,"64K"); break; - case 1<<24 : strcpy(cols,"16M"); break; + case 1L<<15 : strcpy(cols,"32K"); break; + case 1L<<16 : strcpy(cols,"64K"); break; + case 1L<<24 : strcpy(cols,"16M"); break; default : sprintf(cols, "%ld", nc); break; } diff -Nru3 grx245p3/src/bgi/text.h grx/src/bgi/text.h --- grx245p3/src/bgi/text.h Sun Dec 23 03:15:42 2001 +++ grx/src/bgi/text.h Mon Jun 24 13:41:40 2002 @@ -33,7 +33,7 @@ typedef signed char schar; typedef unsigned short _ushort; -#if defined(_MSC_VER) && defined(_WIN32) +#if defined(__TURBOC__) || (defined(_MSC_VER) && defined(_WIN32)) #include <io.h> #else #include <unistd.h> diff -Nru3 grx245p3/src/makefile.bcc grx/src/makefile.bcc --- grx245p3/src/makefile.bcc Sun Jun 16 02:04:16 2002 +++ grx/src/makefile.bcc Mon Jun 24 13:46:32 2002 @@ -28,10 +28,12 @@ GRX20STa= ..\lib\$(GRX_LIB_SUBDIR)\temp1.lib GRX20STb= ..\lib\$(GRX_LIB_SUBDIR)\temp2.lib GRX20STc= ..\lib\$(GRX_LIB_SUBDIR)\temp3.lib +GRX20STd= ..\lib\$(GRX_LIB_SUBDIR)\temp4.lib +GRX20STe= ..\lib\$(GRX_LIB_SUBDIR)\temp5.lib TEMP_LIB= ..\lib\$(GRX_LIB_SUBDIR)\temp?.lib INCDIR= -I. -I./include -I../include -I$(BCCROOT)/include\ - -I./vdrivers + -I./vdrivers -I./bgi LIBDIR= -L$(BCCROOT)/lib OP=+ @@ -83,7 +85,9 @@ LOBJ1=$(STD_1:/=\) $(STD_2:/=\) $(STD_3:/=\) $(STD_4:/=\) LOBJ2=$(STD_5:/=\) $(STD_6:/=\) $(STD_7:/=\) $(STD_8:/=\) LOBJ3=$(STD_9:/=\) $(STD_10:/=\) -LOBJ4=$(STD_11:/=\) $(BCCOBJ) $(DBG_O) +LOBJ4=$(BGI_1:/=\) $(BGI_2:/=\) $(BGI_3:/=\) +LOBJ5=$(BGI_4:/=\) $(BGI_5:/=\) $(BGI_6:/=\) +LOBJ6=$(STD_11:/=\) $(BCCOBJ) $(DBG_O) UTILP = \ ..\bin\vesaif16.exe \ @@ -126,13 +130,15 @@ if exist $(GRX20ST) del $(GRX20ST) # the & tells TLIB to continue on next line -$(GRX20ST): $(GRX20STa) $(GRX20STb) $(GRX20STc) $(LOBJ4:+=) +$(GRX20ST): $(GRX20STa) $(GRX20STb) $(GRX20STc) $(GRX20STd) $(GRX20STe) $(LOBJ6:+=) if exist $(GRX20ST) del $(GRX20ST) $(TLIB) $(LIBPAGE) /C $(GRX20ST) @&&! +$(GRX20STa) & +$(GRX20STb) & +$(GRX20STc) & - $(LOBJ4) + +$(GRX20STd) & + +$(GRX20STe) & + $(LOBJ6) ! $(GRX20STa): $(LOBJ1:+=) @@ -151,6 +157,18 @@ if exist $(GRX20STc) del $(GRX20STc) $(TLIB) $(LIBPAGE) /C $(GRX20STc) @&&! $(LOBJ3) +! + +$(GRX20STd): $(LOBJ4:+=) + if exist $(GRX20STd) del $(GRX20STd) + $(TLIB) $(LIBPAGE) /C $(GRX20STd) @&&! + $(LOBJ4) +! + +$(GRX20STe): $(LOBJ5:+=) + if exist $(GRX20STe) del $(GRX20STe) + $(TLIB) $(LIBPAGE) /C $(GRX20STe) @&&! + $(LOBJ5) ! ..\bin\vesaif16.exe: utilprog\vesainfo.c $(GRX20ST) config.bcc diff -Nru3 grx245p3/test/bgi/bccbgi.c grx/test/bgi/bccbgi.c --- grx245p3/test/bgi/bccbgi.c Thu Nov 29 22:59:30 2001 +++ grx/test/bgi/bccbgi.c Mon Jun 24 14:43:12 2002 @@ -12,7 +12,10 @@ #if defined(__MSDOS__) # include <dos.h> -# include <pc.h> +# if defined(__DJGPP__) +# include <conio.h> +# include <pc.h> +# endif #elif defined(__WIN32__) # include "bccw32.h" #else diff -Nru3 grx245p3/test/bgi/bgilink.c grx/test/bgi/bgilink.c --- grx245p3/test/bgi/bgilink.c Thu May 31 13:21:48 2001 +++ grx/test/bgi/bgilink.c Mon Jun 24 14:47:12 2002 @@ -2,6 +2,7 @@ * Copyright (C) 1993-97 by Hartmut Schirmer */ +#include <stdlib.h> /* NULL, exit() */ #include <string.h> #include "libbcc.h" diff -Nru3 grx245p3/test/bgi/colortst.c grx/test/bgi/colortst.c --- grx245p3/test/bgi/colortst.c Sat Mar 10 17:02:20 2001 +++ grx/test/bgi/colortst.c Mon Jun 24 14:43:50 2002 @@ -4,11 +4,8 @@ #include <stdio.h> #include <string.h> -#ifdef __GNUC__ -# include "libbcc.h" -#else -# include <graphics.h> -#endif + +#include "libbcc.h" static void testmode(int mode) { diff -Nru3 grx245p3/test/bgi/makefile.bcc grx/test/bgi/makefile.bcc --- grx245p3/test/bgi/makefile.bcc Tue Jan 16 03:31:16 2001 +++ grx/test/bgi/makefile.bcc Mon Jun 24 14:16:28 2002 @@ -14,7 +14,6 @@ bgilink.exe \ bccbgi.exe \ colortst.exe \ - fontplay.exe \ small.exe \ tellipse.exe \ tfill.exe \ diff -Nru3 grx245p3/test/bgi/small.c grx/test/bgi/small.c --- grx245p3/test/bgi/small.c Sat Mar 10 23:29:20 2001 +++ grx/test/bgi/small.c Mon Jun 24 14:42:12 2002 @@ -1,8 +1,4 @@ -#ifdef __GNUC__ -# include <libbcc.h> -#else -# include <graphics.h> -#endif +#include <libbcc.h> #if defined(__WIN32__) int GRXMain(void) diff -Nru3 grx245p3/test/bgi/tellipse.c grx/test/bgi/tellipse.c --- grx245p3/test/bgi/tellipse.c Thu Nov 29 22:59:30 2001 +++ grx/test/bgi/tellipse.c Mon Jun 24 14:44:40 2002 @@ -2,17 +2,15 @@ #include <stdlib.h> #include <math.h> -#ifdef __GNUC__ -# include <libbcc.h> -# ifdef __MSDOS__ -# include <pc.h> -# else - extern int kbhit(void), getkey(void); -# endif -# define getch() getkey() +#include <libbcc.h> + +#ifdef __DJGPP__ +#include <conio.h> +#include <pc.h> #else -# include <graphics.h> -# include <conio.h> +extern int getch(void); +extern int getkey(void); +extern int kbhit(void); #endif #if defined(__WIN32__) diff -Nru3 grx245p3/test/bgi/tfill.c grx/test/bgi/tfill.c --- grx245p3/test/bgi/tfill.c Thu Nov 29 22:59:30 2001 +++ grx/test/bgi/tfill.c Mon Jun 24 14:45:34 2002 @@ -1,17 +1,15 @@ #include <stdio.h> #include <stdlib.h> -#ifdef __GNUC__ -# include <libbcc.h> -# ifdef __MSDOS__ -# include <pc.h> -# else - extern int kbhit(void); - extern int getkey(void); -# endif -# define getch() getkey() + +#include <libbcc.h> + +#ifdef __DJGPP__ +#include <conio.h> +#include <pc.h> #else -# include <graphics.h> -# include <conio.h> +extern int getch(void); +extern int getkey(void); +extern int kbhit(void); #endif #if defined(__WIN32__) diff -Nru3 grx245p3/test/bgi/tpoly.c grx/test/bgi/tpoly.c --- grx245p3/test/bgi/tpoly.c Thu Nov 29 22:59:30 2001 +++ grx/test/bgi/tpoly.c Mon Jun 24 14:45:18 2002 @@ -1,16 +1,15 @@ #include <stdio.h> #include <stdlib.h> -#ifdef __GNUC__ -# include <libbcc.h> -# ifdef __MSDOS__ -# include <pc.h> -# else - extern int kbhit(void), getkey(void); -# endif -# define getch() getkey() + +#include <libbcc.h> + +#ifdef __DJGPP__ +#include <conio.h> +#include <pc.h> #else -# include <graphics.h> -# include <conio.h> +extern int getch(void); +extern int getkey(void); +extern int kbhit(void); #endif #if defined(__WIN32__) diff -Nru3 grx245p3/test/bgi/ttext.c grx/test/bgi/ttext.c --- grx245p3/test/bgi/ttext.c Thu Nov 29 22:59:30 2001 +++ grx/test/bgi/ttext.c Mon Jun 24 14:46:22 2002 @@ -1,16 +1,15 @@ #include <stdio.h> #include <stdlib.h> -#ifdef __GNUC__ -# include <libbcc.h> -# ifdef __MSDOS__ -# include <pc.h> -# else - extern int khbit(void), getkey(void); -# endif -# define getch() getkey() + +#include <libbcc.h> + +#ifdef __DJGPP__ +#include <conio.h> +#include <pc.h> #else -# include <graphics.h> -# include <conio.h> +extern int getch(void); +extern int getkey(void); +extern int kbhit(void); #endif void play_font(char *name, char *file, int *x, int *y) [View Less]

2 3

GRX 2.4.5 pre-release 3
by Mariano Alvarez Fernandez 21 Jun '02

21 Jun '02

Hi. I have uploaded a new GRX pre-release to thr grx site: grx.gnu.de Go to the new "More things" tab to download it. Greetings, M.Alvarez

1 0

dumpfna
by Dimitar Zhekov 17 Jun '02

17 Jun '02

A GrDumpFna(const GrFont *f, char *fileName) function. Please fix FIXME. E-gards: Jimmy

2 1

fontdemo
by Dimitar Zhekov 17 Jun '02

17 Jun '02

This is to be placed in test/ and included in the makefiles under test/. The -s option is to partially simulate EGA/VGA 8+1/16 text modes. getopt() call and high-level argument checking have been replaced with manual option processing, which has been tested, of course, but may still have a bug or two. Copyright and version messages have been replaced with a standard GRX demo header text. E-gards: Jimmy

1 0

ASCII font format (FNA) description
by Dimitar Zhekov 15 Jun '02

15 Jun '02

Err human est, so tell me if something is ambiguous, unclear or wrong. It would be nice to make this an html, but I don't have an html editor (not even a vi). E-gards: Jimmy

2 1

Re: Examples for the new grx 2 font drivers
by Mariano Alvarez Fernandez 12 Jun '02

12 Jun '02

Dimitar Zhekov escribió: > >A question I don't know in advance, your Win driver uses the same extension ".fnt" as > >the GRX standard fonts. It can be a problem, will it? > > Not at all. When loading a font, GRX attempts all font drivers in the order specified by _GrFontDriverTable, > no matter the extension. For each driver, GRX attemps the name passed to GrLoadFont() first, name + driver > extension next, and then, if name does not contain a path, GRXPATH + name and … [View More]GRXPATH + name + ext. Not only > GRX doesn't try to find a driver based on name extension, it doesn't even check if name contains an extension. > You are right, I have integrated your font drivers and they work ok, but I don't like really two different supported font formats in GRX with the same extension. Do you think .fnt is mandatory for the Windows fonts? can we chose another one? I like the .fna format, it seems good to quick editing a font. It will be nice to have a function in GRX like void GrDumpFnaFont(const GrFont *f, char *fileName); and to have a doc describing the .fna format > > >Another question, for the Win driver to be usefull it will be nice if it extract the > >font from the .fon file, will be it harder? > > Much harder. The .fon files are actually 16-bit MS Windows executables. Their full description is about 30KB, > and they differ slightly from version to version. Moreover, they usually contain several fonts [one font in > several different sizes], and there is no way to specify from GRX which of them should be loaded. Loading the > first font is not acceptable, it is usually the smallest. > Ok, thanks, I understand > > Actually, I can write a stand-alone utility that extracts all the resources from a MS Windows executable, > albeit many such utilities already exist (the MS Windows resource editors, for example). That will be a much > cleaner solution, and will also provide access to the .bmp, .ico, .cur and any other (.jpg for example) files > contained in these executables. Want me to write such a tool? (N.B. MS Windows .EXE == .DLL == .FON == ...) > I think is not necesary (except if hundreds of people ask for them :-) Another question, I will probably add a test program to show your three fonts, how do you want license they? Really fonts (except a few) are not part of GRX, so you can choose, the only condition: the fonts need to be redistributable, but it will be nice if they were under the X license (at least), so I can add they in the font subdir without a lot of advices. Regards, M.Alvarez [View Less]

1 0

testbc16.dif
by Dimitar Zhekov 11 Jun '02

11 Jun '02

This fixes grx enough for "make test" to work with DOS / BCC. I can't help with "make bgitest", as it seems to need some grx-to-bgi library. bin2c has only been tested under DOS / BCC, and I may be _wrong_ to presume that it needs <unistd.h> for the SEEK_XXX defines only. Apply vesaif16.dif first. diff -Nru3 grx244/src/makefile.bcc grx/src/makefile.bcc --- grx244/src/makefile.bcc Tue Jun 11 16:29:28 2002 +++ grx/src/makefile.bcc Tue Jun 11 16:31:52 2002 @@ -85,7 +85,13 @@ LOBJ3=$(… [View More]STD_9:/=\) $(STD_10:/=\) LOBJ4=$(STD_11:/=\) $(BCCOBJ) $(DBG_O) -all: config.bcc $(GRX20ST) ..\bin\vesaif16.exe +UTILP = \ + ..\bin\vesaif16.exe \ + ..\bin\fnt2c16.exe \ + ..\bin\modtst16.exe \ + ..\bin\bin2c16.exe + +all: config.bcc $(GRX20ST) $(UTILP) clean: if exist bgi\*.obj del bgi\*.obj @@ -93,8 +99,10 @@ if exist fdrivers\*.obj del fdrivers\*.obj if exist fonts\*.obj del fonts\*.obj if exist image\*.obj del image\*.obj + if exist gformats\*.o del gformats\*.o if exist pnm\*.obj del pnm\*.obj if exist mouse\*.obj del mouse\*.obj + if exist misc\*.obj del misc\*.obj if exist pattern\*.obj del pattern\*.obj if exist setup\*.obj del setup\*.obj if exist shape\*.obj del shape\*.obj @@ -107,6 +115,9 @@ if exist ..\addons\print\*.obj del ..\addons\print\*.obj if exist ..\addons\bmp\*.obj del ..\addons\bmp\*.obj if exist ..\bin\vesaif16.exe del ..\bin\vesaif16.exe + if exist ..\bin\fnt2c16.exe del ..\bin\fnt2c16.exe + if exist ..\bin\modtst16.exe del ..\bin\modtst16.exe + if exist ..\bin\bin2c16.exe del ..\bin\bin2c16.exe if exist config.bcc del config.bcc if exist *.asm del *.asm if exist *.obj del *.obj @@ -146,6 +157,21 @@ ..\bin\vesaif16.exe: utilprog\vesainfo.c $(GRX20ST) config.bcc $(BCC) +config.bcc -e..\bin\vesaif16 @&&! utilprog\vesainfo.c $(GRX20ST) +! + +..\bin\fnt2c16.exe: utilprog\fnt2c.c $(GRX20ST) config.bcc + $(BCC) +config.bcc -e..\bin\fnt2c16 @&&! + utilprog\fnt2c.c $(GRX20ST) +! + +..\bin\modtst16.exe: utilprog\modetest.c $(GRX20ST) config.bcc + $(BCC) +config.bcc -I..\test -e..\bin\modtst16 @&&! + utilprog\modetest.c $(GRX20ST) +! + +..\bin\bin2c16.exe: utilprog\bin2c.c $(GRX20ST) config.bcc + $(BCC) +config.bcc -e..\bin\bin2c16 @&&! + utilprog\bin2c.c $(GRX20ST) ! .c.obj: diff -Nru3 grx244/src/utilprog/bin2c.c grx/src/utilprog/bin2c.c --- grx244/src/utilprog/bin2c.c Wed Jun 27 18:11:00 2001 +++ grx/src/utilprog/bin2c.c Tue Jun 11 16:10:38 2002 @@ -24,10 +24,17 @@ #include <stdlib.h> #include <stdio.h> -#include <unistd.h> #include <string.h> #include <time.h> #include <malloc.h> + +#ifndef SEEK_SET +#define SEEK_SET 0 +#endif + +#ifndef SEEK_END +#define SEEK_END 2 +#endif #define TRUE (1==1) #define FALSE (!TRUE) diff -Nru3 grx244/test/makefile.bcc grx/test/makefile.bcc --- grx244/test/makefile.bcc Thu Jan 25 05:23:26 2001 +++ grx/test/makefile.bcc Tue Jun 11 15:41:24 2002 @@ -17,12 +17,10 @@ cliptest.exe \ colorops.exe \ curstest.exe \ - fnt2c.exe \ fonttest.exe \ imgtest.exe \ life.exe \ linetest.exe \ - modtst16.exe \ mousetst.exe \ pcirctst.exe \ pnmtest.exe \ @@ -35,28 +33,14 @@ winclip.exe \ wintest.exe -all: $(PROGS) ..\bin\modtst16.exe ..\bin\fnt2c16.exe +all: $(PROGS) clean: if exist *.obj del *.obj if exist *.exe del *.exe -..\bin\modtst16.exe: modtst16.exe - copy modtst16.exe ..\bin - -$(STRIP) ..\bin\modtst16.exe - -..\bin\fnt2c16.exe: fnt2c16.exe - copy fnt2c16.exe ..\bin - -$(STRIP) ..\bin\fnt2c16.exe - -modtst16.exe: modetest.obj - $(BCC) $(LIBDIR) $(LDOPT) -n. -emodtst16 modetest.obj $(GRX20ST) - spdtst16.exe: speedtst.obj $(BCC) $(LIBDIR) $(LDOPT) -n. -espdtst16 speedtst.obj $(GRX20ST) - -fnt2c16.exe: fnt2c.obj - $(BCC) $(LIBDIR) $(LDOPT) -n. -efnt2c16 fnt2c.obj $(GRX20ST) .obj.exe: $(BCC) $(LIBDIR) $(LDOPT) -n. -e$* $*.obj $(GRX20ST) [View Less]

2 2

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

2000

1999

1998

1997

1996

1995

1994

Grx June 2002