gnustep/libs-back
0
0
Fork 0
mirror of https://github.com/gnustep/libs-back.git synced 2025-05-31 01:11:00 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reformat to better fit the coding standard.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/back/trunk@14313 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
alexm 2002-08-21 13:02:26 +00:00
parent 4ededbe49f
commit ba626c7954
5 changed files with 1008 additions and 1003 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2002-08-21 14:52 Alexander Malmberg <alexander@malmberg.org>
* Source/art/blit.h, Source/art/blit.m, Source/art/ftfont.h,
Source/art/ftfont.m: Reformat to fit coding standards better.
2002-08-21 13:50 Alexander Malmberg <alexander@malmberg.org> 2002-08-21 13:50 Alexander Malmberg <alexander@malmberg.org>
* Source/art/ARTContext.m: Move common code from _fill and DPSstroke * Source/art/ARTContext.m: Move common code from _fill and DPSstroke

115
Source/art/blit.h
View file

@ -36,27 +36,27 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
typedef struct render_run_s typedef struct render_run_s
{ {
unsigned char r,g,b,a,real_a; unsigned char r, g, b, a, real_a;
unsigned char *dst,*dsta; unsigned char *dst, *dsta;
/* the following fields are only used by the svp rendering helpers */ /* the following fields are only used by the svp rendering helpers */
int x0,x1; int x0, x1;
int rowstride,arowstride,bpp; int rowstride, arowstride, bpp;
void (*run_alpha)(struct render_run_s *ri,int num); void (*run_alpha)(struct render_run_s *ri, int num);
void (*run_opaque)(struct render_run_s *ri,int num); void (*run_opaque)(struct render_run_s *ri, int num);
} render_run_t; } render_run_t;
typedef struct typedef struct
{ {
unsigned char *dst,*dsta; unsigned char *dst, *dsta;
unsigned char *src,*srca; unsigned char *src, *srca;
} composite_run_t; } composite_run_t;
typedef struct draw_info_s typedef struct draw_info_s
{ {
int how; int how;
#define DI_FALLBACK 0 #define DI_FALLBACK 0
/* counting from lsb */ /* counting from lsb */
@ -72,64 +72,65 @@ typedef struct draw_info_s
#define DI_NUM 9 #define DI_NUM 9
int bytes_per_pixel; int bytes_per_pixel;
int drawing_depth; int drawing_depth;
int inline_alpha,inline_alpha_ofs; int inline_alpha, inline_alpha_ofs;
void (*render_run_alpha)(render_run_t *ri,int num); void (*render_run_alpha)(render_run_t *ri, int num);
void (*render_run_opaque)(render_run_t *ri,int num); void (*render_run_opaque)(render_run_t *ri, int num);
void (*render_run_alpha_a)(render_run_t *ri,int num); void (*render_run_alpha_a)(render_run_t *ri, int num);
void (*render_run_opaque_a)(render_run_t *ri,int num); void (*render_run_opaque_a)(render_run_t *ri, int num);
void (*render_blit_alpha_opaque)(unsigned char *dst, void (*render_blit_alpha_opaque)(unsigned char *dst,
const unsigned char *src, const unsigned char *src,
unsigned char r,unsigned char g,unsigned char b,int num); unsigned char r, unsigned char g,
void (*render_blit_mono_opaque)(unsigned char *dst, unsigned char b, int num);
const unsigned char *src,int src_ofs, void (*render_blit_mono_opaque)(unsigned char *dst,
unsigned char r,unsigned char g,unsigned char b, const unsigned char *src, int src_ofs,
int num); unsigned char r, unsigned char g,
unsigned char b, int num);
void (*render_blit_alpha)(unsigned char *dst,const unsigned char *src, void (*render_blit_alpha)(unsigned char *dst, const unsigned char *src,
unsigned char r,unsigned char g,unsigned char b, unsigned char r, unsigned char g, unsigned char b,
unsigned char alpha,int num); unsigned char alpha, int num);
void (*render_blit_mono)(unsigned char *dst, void (*render_blit_mono)(unsigned char *dst,
const unsigned char *src,int src_ofs, const unsigned char *src, int src_ofs,
unsigned char r,unsigned char g,unsigned char b, unsigned char r, unsigned char g, unsigned char b,
unsigned char alpha,int num); unsigned char alpha, int num);
void (*composite_sover_aa)(composite_run_t *c,int num); void (*composite_sover_aa)(composite_run_t *c, int num);
void (*composite_sover_ao)(composite_run_t *c,int num); void (*composite_sover_ao)(composite_run_t *c, int num);
void (*composite_sin_aa)(composite_run_t *c,int num); void (*composite_sin_aa)(composite_run_t *c, int num);
void (*composite_sin_oa)(composite_run_t *c,int num); void (*composite_sin_oa)(composite_run_t *c, int num);
void (*composite_sout_aa)(composite_run_t *c,int num); void (*composite_sout_aa)(composite_run_t *c, int num);
void (*composite_sout_oa)(composite_run_t *c,int num); void (*composite_sout_oa)(composite_run_t *c, int num);
void (*composite_satop_aa)(composite_run_t *c,int num); void (*composite_satop_aa)(composite_run_t *c, int num);
void (*composite_dover_aa)(composite_run_t *c,int num); void (*composite_dover_aa)(composite_run_t *c, int num);
void (*composite_dover_oa)(composite_run_t *c,int num); void (*composite_dover_oa)(composite_run_t *c, int num);
void (*composite_din_aa)(composite_run_t *c,int num); void (*composite_din_aa)(composite_run_t *c, int num);
void (*composite_dout_aa)(composite_run_t *c,int num); void (*composite_dout_aa)(composite_run_t *c, int num);
void (*composite_datop_aa)(composite_run_t *c,int num); void (*composite_datop_aa)(composite_run_t *c, int num);
void (*composite_xor_aa)(composite_run_t *c,int num); void (*composite_xor_aa)(composite_run_t *c, int num);
void (*composite_plusl_aa)(composite_run_t *c,int num); void (*composite_plusl_aa)(composite_run_t *c, int num);
void (*composite_plusl_oa)(composite_run_t *c,int num); void (*composite_plusl_oa)(composite_run_t *c, int num);
void (*composite_plusl_ao)(composite_run_t *c,int num); void (*composite_plusl_ao)(composite_run_t *c, int num);
void (*composite_plusl_oo)(composite_run_t *c,int num); void (*composite_plusl_oo)(composite_run_t *c, int num);
void (*composite_plusd_aa)(composite_run_t *c,int num); void (*composite_plusd_aa)(composite_run_t *c, int num);
void (*composite_plusd_oa)(composite_run_t *c,int num); void (*composite_plusd_oa)(composite_run_t *c, int num);
void (*composite_plusd_ao)(composite_run_t *c,int num); void (*composite_plusd_ao)(composite_run_t *c, int num);
void (*composite_plusd_oo)(composite_run_t *c,int num); void (*composite_plusd_oo)(composite_run_t *c, int num);
} draw_info_t; } draw_info_t;
#define RENDER_RUN_ALPHA (DI.render_run_alpha) #define RENDER_RUN_ALPHA (DI.render_run_alpha)
@ -143,13 +144,13 @@ typedef struct draw_info_s
#define RENDER_BLIT_MONO DI.render_blit_mono #define RENDER_BLIT_MONO DI.render_blit_mono
void artcontext_setup_draw_info(draw_info_t *di, void artcontext_setup_draw_info(draw_info_t *di,
unsigned int red_mask,unsigned int green_mask,unsigned int blue_mask, unsigned int red_mask, unsigned int green_mask, unsigned int blue_mask,
int bpp); int bpp);
void artcontext_render_svp(const ArtSVP *svp,int x0,int y0,int x1,int y1, void artcontext_render_svp(const ArtSVP *svp, int x0, int y0, int x1, int y1,
unsigned char r,unsigned char g,unsigned char b,unsigned char a, unsigned char r, unsigned char g, unsigned char b, unsigned char a,
unsigned char *dst,int rowstride, unsigned char *dst, int rowstride,
unsigned char *dsta,int arowstride,int has_alpha, unsigned char *dsta, int arowstride, int has_alpha,
draw_info_t *di); draw_info_t *di);
#endif #endif

264
Source/art/blit.m
View file

@ -1356,58 +1356,58 @@ ourself.
static void render_svp_callback(void *data,int y,int start, static void render_svp_callback(void *data,int y,int start,
ArtSVPRenderAAStep *steps,int n_steps) ArtSVPRenderAAStep *steps,int n_steps)
{ {
render_run_t *ri=data; render_run_t *ri=data;
int x0=ri->x0,x1; int x0=ri->x0,x1;
int num; int num;
int alpha; int alpha;
unsigned char *dst,*dsta; unsigned char *dst,*dsta;
alpha=start; alpha=start;
/* empty line; very common case */ /* empty line; very common case */
if (alpha<0x10000 && !n_steps) if (alpha<0x10000 && !n_steps)
{
ri->dst+=ri->rowstride;
ri->dsta+=ri->arowstride;
return;
}
dst=ri->dst+ri->rowstride;
dsta=ri->dsta+ri->arowstride;
for (;n_steps;n_steps--,steps++)
{
x1=steps->x;
num=x1-x0;
ri->a=(alpha*ri->real_a+0x800000)>>24;
if (ri->a && num)
{ {
ri->dst+=ri->rowstride; if (ri->a==255)
ri->dsta+=ri->arowstride; ri->run_opaque(ri,num);
return; else
ri->run_alpha(ri,num);
} }
ri->dst+=ri->bpp*num;
ri->dsta+=num;
dst=ri->dst+ri->rowstride; alpha+=steps->delta;
dsta=ri->dsta+ri->arowstride; x0=x1;
}
for (;n_steps;n_steps--,steps++) x1=ri->x1;
{ num=x1-x0;
x1=steps->x; ri->a=(alpha*ri->real_a+0x800000)>>24;
num=x1-x0; if (ri->a && num)
{
if (ri->a==255)
ri->run_opaque(ri,num);
else
ri->run_alpha(ri,num);
}
ri->a=(alpha*ri->real_a+0x800000)>>24; ri->dst=dst;
if (ri->a && num) ri->dsta=dsta;
{
if (ri->a==255)
ri->run_opaque(ri,num);
else
ri->run_alpha(ri,num);
}
ri->dst+=ri->bpp*num;
ri->dsta+=num;
alpha+=steps->delta;
x0=x1;
}
x1=ri->x1;
num=x1-x0;
ri->a=(alpha*ri->real_a+0x800000)>>24;
if (ri->a && num)
{
if (ri->a==255)
ri->run_opaque(ri,num);
else
ri->run_alpha(ri,num);
}
ri->dst=dst;
ri->dsta=dsta;
} }
void artcontext_render_svp(const ArtSVP *svp,int x0,int y0,int x1,int y1, void artcontext_render_svp(const ArtSVP *svp,int x0,int y0,int x1,int y1,
@ -1416,35 +1416,35 @@ void artcontext_render_svp(const ArtSVP *svp,int x0,int y0,int x1,int y1,
unsigned char *dsta,int arowstride,int has_alpha, unsigned char *dsta,int arowstride,int has_alpha,
draw_info_t *di) draw_info_t *di)
{ {
render_run_t ri; render_run_t ri;
ri.x0=x0; ri.x0=x0;
ri.x1=x1; ri.x1=x1;
ri.r=r; ri.r=r;
ri.g=g; ri.g=g;
ri.b=b; ri.b=b;
ri.real_a=ri.a=a; ri.real_a=ri.a=a;
ri.bpp=di->bytes_per_pixel; ri.bpp=di->bytes_per_pixel;
ri.dst=dst; ri.dst=dst;
ri.rowstride=rowstride; ri.rowstride=rowstride;
if (has_alpha) if (has_alpha)
{ {
ri.dsta=dsta; ri.dsta=dsta;
ri.arowstride=arowstride; ri.arowstride=arowstride;
ri.run_alpha=di->render_run_alpha_a; ri.run_alpha=di->render_run_alpha_a;
ri.run_opaque=di->render_run_opaque_a; ri.run_opaque=di->render_run_opaque_a;
} }
else else
{ {
ri.run_alpha=di->render_run_alpha; ri.run_alpha=di->render_run_alpha;
ri.run_opaque=di->render_run_opaque; ri.run_opaque=di->render_run_opaque;
} }
art_svp_render_aa(svp,x0,y0,x1,y1,render_svp_callback,&ri); art_svp_render_aa(svp,x0,y0,x1,y1,render_svp_callback,&ri);
} }
@ -1504,84 +1504,84 @@ might eventually need to be fixed */
static int byte_ofs_of_mask(unsigned int m) static int byte_ofs_of_mask(unsigned int m)
{ {
union union
{ {
unsigned char b[4]; unsigned char b[4];
unsigned int m; unsigned int m;
} tmp; } tmp;
tmp.m=m; tmp.m=m;
if (tmp.b[0]==0xff && !tmp.b[1] && !tmp.b[2] && !tmp.b[3]) if (tmp.b[0]==0xff && !tmp.b[1] && !tmp.b[2] && !tmp.b[3])
return 0; return 0;
else if (tmp.b[1]==0xff && !tmp.b[0] && !tmp.b[2] && !tmp.b[3]) else if (tmp.b[1]==0xff && !tmp.b[0] && !tmp.b[2] && !tmp.b[3])
return 1; return 1;
else if (tmp.b[2]==0xff && !tmp.b[0] && !tmp.b[1] && !tmp.b[3]) else if (tmp.b[2]==0xff && !tmp.b[0] && !tmp.b[1] && !tmp.b[3])
return 2; return 2;
else if (tmp.b[3]==0xff && !tmp.b[0] && !tmp.b[1] && !tmp.b[2]) else if (tmp.b[3]==0xff && !tmp.b[0] && !tmp.b[1] && !tmp.b[2])
return 3; return 3;
else else
return -1; return -1;
} }
void artcontext_setup_draw_info(draw_info_t *di, void artcontext_setup_draw_info(draw_info_t *di,
unsigned int red_mask,unsigned int green_mask,unsigned int blue_mask, unsigned int red_mask,unsigned int green_mask,unsigned int blue_mask,
int bpp) int bpp)
{ {
int t=DI_FALLBACK; int t=DI_FALLBACK;
if (bpp==16 && red_mask==0xf800 && green_mask==0x7e0 && if (bpp==16 && red_mask==0xf800 && green_mask==0x7e0 &&
blue_mask==0x1f) blue_mask==0x1f)
{
t=DI_16_B5_G6_R5;
}
else if (bpp==16 && red_mask==0x7c00 && green_mask==0x3e0 &&
blue_mask==0x1f)
{
t=DI_16_B5_G5_R5_A1;
}
else if (bpp==24 || bpp==32)
{
int r,g,b;
r=byte_ofs_of_mask(red_mask);
g=byte_ofs_of_mask(green_mask);
b=byte_ofs_of_mask(blue_mask);
if (bpp==24)
{ {
t=DI_16_B5_G6_R5; if (r==0 && g==1 && b==2)
t=DI_24_RGB;
else if (r==2 && g==1 && b==0)
t=DI_24_BGR;
} }
else if (bpp==16 && red_mask==0x7c00 && green_mask==0x3e0 && else if (bpp==32)
blue_mask==0x1f)
{ {
t=DI_16_B5_G5_R5_A1; if (r==0 && g==1 && b==2)
t=DI_32_RGBA;
else if (r==2 && g==1 && b==0)
t=DI_32_BGRA;
else if (r==1 && g==2 && b==3)
t=DI_32_ARGB;
else if (r==3 && g==2 && b==1)
t=DI_32_ABGR;
} }
else if (bpp==24 || bpp==32) }
{
int r,g,b;
r=byte_ofs_of_mask(red_mask); // t=DI_32_ARGB; /* HACK */
g=byte_ofs_of_mask(green_mask);
b=byte_ofs_of_mask(blue_mask);
if (bpp==24) *di=draw_infos[t];
{ if (!di->render_run_alpha)
if (r==0 && g==1 && b==2) *di=draw_infos[DI_FALLBACK];
t=DI_24_RGB; if (di->how==DI_FALLBACK)
else if (r==2 && g==1 && b==0) {
t=DI_24_BGR; NSLog(@"Unrecognized color masks: %08x:%08x:%08x %i",
} red_mask,green_mask,blue_mask,bpp);
else if (bpp==32) // NSLog(@"Attempting to use fallback code (currently unimplemented). This will be _very_ slow!");
{ NSLog(@"Please report this along with details on your pixel format "
if (r==0 && g==1 && b==2) @"(ie. the four numbers above). (Or better yet, implement it "
t=DI_32_RGBA; @"and send me a patch.)");
else if (r==2 && g==1 && b==0) exit(1);
t=DI_32_BGRA; }
else if (r==1 && g==2 && b==3)
t=DI_32_ARGB;
else if (r==3 && g==2 && b==1)
t=DI_32_ABGR;
}
}
// t=DI_32_ARGB; /* HACK */
*di=draw_infos[t];
if (!di->render_run_alpha)
*di=draw_infos[DI_FALLBACK];
if (di->how==DI_FALLBACK)
{
NSLog(@"Unrecognized color masks: %08x:%08x:%08x %i",
red_mask,green_mask,blue_mask,bpp);
// NSLog(@"Attempting to use fallback code (currently unimplemented). This will be _very_ slow!");
NSLog(@"Please report this along with details on your pixel format "
@"(ie. the four numbers above). (Or better yet, implement it "
@"and send me a patch.)");
exit(1);
}
} }
#endif #endif

11
Source/art/ftfont.h
View file

@ -25,12 +25,15 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
@protocol FTFontInfo @protocol FTFontInfo
-(void) drawString: (const char *)s -(void) drawString: (const char *)s
at: (int)x:(int)y at: (int)x : (int)y
to: (int)x0:(int)y0:(int)x1:(int)y1:(unsigned char *)buf:(int)bpl to: (int)x0 : (int)y0 : (int)x1 : (int)y1
color:(unsigned char)r:(unsigned char)g:(unsigned char)b:(unsigned char)alpha : (unsigned char *)buf : (int)bpl
color: (unsigned char)r : (unsigned char)g : (unsigned char)b
: (unsigned char)alpha
transform: (NSAffineTransform *)transform transform: (NSAffineTransform *)transform
drawinfo: (struct draw_info_s *)di; drawinfo: (struct draw_info_s *)di;
/* TODO: see if this is really necessary */
-(void) drawString: (const char *)s -(void) drawString: (const char *)s
at: (int)x:(int)y at: (int)x:(int)y
to: (int)x0:(int)y0:(int)x1:(int)y1:(unsigned char *)buf:(int)bpl to: (int)x0:(int)y0:(int)x1:(int)y1:(unsigned char *)buf:(int)bpl
@ -39,7 +42,7 @@ copyright 2002 Alexander Malmberg <alexander@malmberg.org>
deltas: (const float *)delta_data : (int)delta_size : (int)delta_flags; deltas: (const float *)delta_data : (int)delta_size : (int)delta_flags;
-(void) outlineString: (const char *)s -(void) outlineString: (const char *)s
at: (float)x:(float)y at: (float)x : (float)y
gstate: (void *)func_param; gstate: (void *)func_param;
+(void) initializeBackend; +(void) initializeBackend;

1616
Source/art/ftfont.m
View file

File diff suppressed because it is too large Load diff