projects
/
physik
/
nlsop.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add ati tiff to bmp conv tool
[physik/nlsop.git]
/
dfbapi.c
diff --git
a/dfbapi.c
b/dfbapi.c
index
3dfecda
..
0fe54dc
100644
(file)
--- a/
dfbapi.c
+++ b/
dfbapi.c
@@
-121,7
+121,7
@@
int dx_lattice_get_color(unsigned char *status,unsigned char *r,unsigned char *g
return 1;
}
return 1;
}
-int d2_lattice_draw(d2_lattice *d2_l,int x,int y,int arg_c,char **arg_v,unsigned char mode)
+int d2_lattice_draw(d2_lattice *d2_l,int x,int y,int arg_c,char **arg_v,unsigned char mode
,int max_extra
)
{
int x_c,y_c;
int i;
{
int x_c,y_c;
int i;
@@
-137,7
+137,7
@@
int d2_lattice_draw(d2_lattice *d2_l,int x,int y,int arg_c,char **arg_v,unsigned
if(!mode) dx_lattice_get_color((*d2_l).status+x_c+y_c*d2_l->max_x,&r,&g,&b,mode);
if(mode==1)
{
if(!mode) dx_lattice_get_color((*d2_l).status+x_c+y_c*d2_l->max_x,&r,&g,&b,mode);
if(mode==1)
{
- foobar=(unsigned char)(*(d2_l->extra+x_c+y_c*d2_l->max_x)*255/
MAX_EXTRA
);
+ foobar=(unsigned char)(*(d2_l->extra+x_c+y_c*d2_l->max_x)*255/
max_extra
);
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
@@
-184,7
+184,7
@@
int d2_lattice_draw(d2_lattice *d2_l,int x,int y,int arg_c,char **arg_v,unsigned
return 1;
}
return 1;
}
-int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,unsigned char mode)
+int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,unsigned char mode
,int max_extra
)
{
int x_c,y_c,z_c;
int i;
{
int x_c,y_c,z_c;
int i;
@@
-201,7
+201,7
@@
int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
- foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
MAX_EXTRA
);
+ foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
max_extra
);
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
@@
-231,7
+231,7
@@
int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
- foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
MAX_EXTRA
);
+ foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
max_extra
);
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
@@
-261,7
+261,7
@@
int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
if(!mode) dx_lattice_get_color((*d3_l).status+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y,&r,&g,&b,mode);
if(mode==1)
{
- foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
MAX_EXTRA
);
+ foobar=(unsigned char)(*(d3_l->extra+x_c+y_c*d3_l->max_x+z_c*d3_l->max_x*d3_l->max_y)*255/
max_extra
);
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
dx_lattice_get_color(&foobar,&r,&g,&b,mode);
}
if(mode==2)
@@
-340,7
+340,7
@@
int d3_event_init(d3_lattice *d3_l)
return 1;
}
return 1;
}
-int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode)
+int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switchmode
,int *bmp
)
{
DFBInputEvent ke;
{
DFBInputEvent ke;
@@
-357,6
+357,9
@@
int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc,int *switch
if(ke.key_id==DIKI_Q) *q=1;
if(ke.key_id==DIKI_ESCAPE) *esc=1;
if(ke.key_id==DIKI_M) *switchmode=(*switchmode+1)%3;
if(ke.key_id==DIKI_Q) *q=1;
if(ke.key_id==DIKI_ESCAPE) *esc=1;
if(ke.key_id==DIKI_M) *switchmode=(*switchmode+1)%3;
+ if(ke.key_id==DIKI_1) *bmp=1;
+ if(ke.key_id==DIKI_2) *bmp=2;
+ if(ke.key_id==DIKI_3) *bmp=3;
}
return 1;
}
return 1;