Grx

grx@gnu.de

559 discussions

bccbgi16.dif
by Dimitar Zhekov 26 Jun '02

26 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 - 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)

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 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

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=$(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)

2 2

Examples for the new grx 2 font drivers
by Dimitar Zhekov 11 Jun '02

11 Jun '02

The psf file pseudographics are for Linux EGA/VGA console (-m iso01). For the PSF files contained in Linux systems to be readable with GRX, you'll have to unzip them. To use the MS Windows .FON files, split them into .FNT or .RES files using a resource editor. But make sure it is legal to split the .FON file... E-gards: Jimmy

2 1

New font drivers for grx 2
by Dimitar Zhekov 07 Jun '02

07 Jun '02

About: 3 new font drivers for grx 2. RAW driver - for RAW data and Linux PSF (not PCF) files. RAW data files must be 8 points wide. 512 character PSF files are supported. FNA driver - for the ascii font format used by grx 1 font read/write tool and by grx 2 for debugging purposes. WIN driver - for MS Windows FNT and RES files. FNT versions 2 and 3 are supported, 32-bit RES and FON files are not. The first resource from RES is used. As far as I know, all MS Windows-es from 2.0 to NT 4.0 use FNT version 2 and 16-bit resources packed into FON for raster fonts. Bugs: Not any that I know of. Since grx-2.3.1, only the calculation (read: guessing) of the family and baseline for RAW/PSF files was changed. Aside from grx-2.4.4 endian and binary open mode changes, of course. Big endian support is untested. Compatibility: DOS / Borland C 5.01 and Linux / svgalib work, and so should the others. Never tested on big endian machines. License: "the version of GPL adequate for this type of code" ( == LGPL), version 2.0 or later. Enjoy. E-gards: Jimmy

2 1

vesaif16.dif
by Dimitar Zhekov 07 Jun '02

07 Jun '02

Small fixes for at least "make libs" to work correctly with DOS / BCC diff -Nru3 grx244/bin/dummy grx/bin/dummy --- grx244/bin/dummy 2002-06-05 20:16:46.000000000 +0300 +++ grx/bin/dummy 2002-06-05 20:17:24.000000000 +0300 @@ -0,0 +1 @@ +-- empty -- diff -Nru3 grx244/src/makefile.bcc grx/src/makefile.bcc --- grx244/src/makefile.bcc 2001-02-07 02:36:14.000000000 +0200 +++ grx/src/makefile.bcc 2002-06-05 20:23:42.000000000 +0300 @@ -58,6 +58,7 @@ +fdrivers\vga8x.obj \ +mouse\dosinput.obj \ +mouse\doskeys.obj \ + +misc\dosmisc.obj \ +utils\bccarith.obj \ +utils\bcccopy.obj \ +utils\bccfil08.obj \ @@ -142,9 +143,9 @@ $(LOBJ3) ! -..\bin\vesaif16.exe: vdrivers\vesainfo.c $(GRX20ST) config.bcc +..\bin\vesaif16.exe: utilprog\vesainfo.c $(GRX20ST) config.bcc $(BCC) +config.bcc -e..\bin\vesaif16 @&&! - vdrivers\vesainfo.c $(GRX20ST) + utilprog\vesainfo.c $(GRX20ST) ! .c.obj:

2 1

← Newer
1
...
29
30
31
32
33
34
35
...
56
Older →

Jump to page:

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