From 8606664e5b596a894a726597b8696bf9b1309cf3 Mon Sep 17 00:00:00 2001 From: hackbard Date: Wed, 23 Jun 2004 11:36:28 +0000 Subject: [PATCH] changed display style ... --- dfbapi.c | 43 ++++++----- dfbapi.h | 1 + nel-profile.txt | 200 ++++++++++++++++++++++++------------------------ 3 files changed, 125 insertions(+), 119 deletions(-) diff --git a/dfbapi.c b/dfbapi.c index 11c1128..b9b2656 100644 --- a/dfbapi.c +++ b/dfbapi.c @@ -26,7 +26,7 @@ int d2_lattice_init(int *argc,char **argv,d2_lattice *d2_l) d2_l->p_surface->GetSize(d2_l->p_surface,&(d2_l->s_width),&(d2_l->s_height)); font_dsc.flags=DFDESC_HEIGHT; - font_dsc.height=d2_l->s_height/40; /* 40 ? */ + font_dsc.height=d2_l->s_height/60; /* 60 ? */ d2_l->font_h=font_dsc.height; d2_l->dfb->CreateFont(d2_l->dfb,FONT,&font_dsc,&(d2_l->font)); d2_l->p_surface->SetFont(d2_l->p_surface,d2_l->font); @@ -65,12 +65,13 @@ int d3_lattice_init(int *argc,char **argv,d3_lattice *d3_l) d3_l->dfb->CreateFont(d3_l->dfb,FONT,&font_dsc,&(d3_l->font)); d3_l->p_surface->SetFont(d3_l->p_surface,d3_l->font); - d3_l->fakt_y=(d3_l->s_height-(3*Y_GAP))/(d3_l->max_z+d3_l->max_y); - d3_l->fakt_x=(d3_l->s_width-(3*X_GAP))/(d3_l->max_x+d3_l->max_y); - d3_l->info_x=d3_l->fakt_x*d3_l->max_x+(2*X_GAP); - d3_l->info_y=d3_l->fakt_y*d3_l->max_z+(2*Y_GAP); - d3_l->info_w=d3_l->fakt_x*d3_l->max_y; - d3_l->info_h=d3_l->fakt_y*d3_l->max_y; + d3_l->fakt_y=(d3_l->s_height-(2*Y_GAP))/d3_l->max_z; + d3_l->fakt_x=(d3_l->s_width-(4*X_GAP))/(d3_l->max_x+d3_l->max_y+d3_l->max_x); + d3_l->info_x=d3_l->fakt_x*(d3_l->max_x+d3_l->max_y)+(3*X_GAP); + d3_l->info_y=d3_l->fakt_y*d3_l->max_y+(2*Y_GAP); + d3_l->o_x=d3_l->fakt_x*d3_l->max_x+(2*X_GAP); + d3_l->info_w=d3_l->fakt_x*d3_l->max_x; + d3_l->info_h=d3_l->fakt_y*(d3_l->max_z-d3_l->max_y)-Y_GAP; return 1; } @@ -247,7 +248,7 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un } d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a); d3_l->p_surface->DrawRectangle(d3_l->p_surface, - y_c*d3_l->fakt_x+d3_l->info_x, + y_c*d3_l->fakt_x+d3_l->o_x, z_c*d3_l->fakt_y+Y_GAP, d3_l->fakt_x,d3_l->fakt_y); } @@ -277,8 +278,8 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un } d3_l->p_surface->SetColor(d3_l->p_surface,r,g,b,a); d3_l->p_surface->DrawRectangle(d3_l->p_surface, - x_c*d3_l->fakt_x+X_GAP, - y_c*d3_l->fakt_y+d3_l->info_y, + x_c*d3_l->fakt_x+d3_l->info_x, + y_c*d3_l->fakt_y+Y_GAP, d3_l->fakt_x,d3_l->fakt_y); } } @@ -295,27 +296,31 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v,un d3_l->p_surface->DrawRectangle(d3_l->p_surface, d3_l->info_x,d3_l->info_y, d3_l->info_w,d3_l->info_h); + /* old style d3_l->p_surface->DrawLine(d3_l->p_surface, d3_l->info_x+d3_l->info_w/2, d3_l->info_y, d3_l->info_x+d3_l->info_w/2, d3_l->info_y+d3_l->info_h); + */ d3_l->p_surface->SetColor(d3_l->p_surface,0x80,0x80,0xff,0xff); for(i=1;i<=arg_c;i++) { - if(i<13) - { + // if(i<13) + // { d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1, d3_l->info_x+d3_l->fakt_x, d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i-1)*d3_l->font_h, DSTF_LEFT); - } else - { - d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1, - d3_l->info_x+d3_l->info_w/2+d3_l->fakt_x, - d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i%13-1)*d3_l->font_h, - DSTF_LEFT); - } + // } else + // { + /* old style + d3_l->p_surface->DrawString(d3_l->p_surface,arg_v[i],-1, + d3_l->info_x+d3_l->info_w/2+d3_l->fakt_x, + d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i%13-1)*d3_l->font_h, + DSTF_LEFT); + */ + // } } /* now we flip all to surface */ diff --git a/dfbapi.h b/dfbapi.h index 6d628d8..abee6e1 100644 --- a/dfbapi.h +++ b/dfbapi.h @@ -46,6 +46,7 @@ typedef struct __d3_lattice int s_height,s_width; int fakt_x,fakt_y; int info_x,info_y; + int o_x; int info_w,info_h; int font_h; unsigned char *status; /* status&1 -> red, else blue */ diff --git a/nel-profile.txt b/nel-profile.txt index caf8dd3..22060e8 100644 --- a/nel-profile.txt +++ b/nel-profile.txt @@ -1,100 +1,100 @@ -800100,E-04 3216,79E-03 -160010,E-03 3075,05E-03 -240010,E-03 3143,18E-03 -320010,E-03 3219,79E-03 -400010,E-03 3376,13E-03 -480010,E-03 3372,10E-03 -560010,E-03 3355,78E-03 -640010,E-03 3464,64E-03 -720010,E-03 3500,30E-03 -800010,E-03 3682,39E-03 -880010,E-03 3613,67E-03 -960010,E-03 3767,24E-03 -104001,E-02 3782,77E-03 -112001,E-02 3712,38E-03 -120001,E-02 3898,09E-03 -128001,E-02 4098,88E-03 -136001,E-02 4024,27E-03 -144001,E-02 4236,01E-03 -152001,E-02 4271,16E-03 -160001,E-02 4350,11E-03 -168001,E-02 4445,08E-03 -176001,E-02 4541,91E-03 -184001,E-02 4743,65E-03 -192001,E-02 4793,74E-03 -200001,E-02 4858,77E-03 -208001,E-02 5082,54E-03 -216001,E-02 5132,66E-03 -224001,E-02 5264,37E-03 -232001,E-02 5168,46E-03 -240001,E-02 5353,25E-03 -248001,E-02 5545,37E-03 -256001,E-02 5933,99E-03 -264001,E-02 6036,05E-03 -272001,E-02 6070,48E-03 -280001,E-02 6344,41E-03 -288001,E-02 6544,72E-03 -296001,E-02 6824,88E-03 -304001,E-02 6935,89E-03 -312001,E-02 6929,64E-03 -320001,E-02 7110,25E-03 -328001,E-02 7174,12E-03 -336001,E-02 7435,69E-03 -344001,E-02 7778,75E-03 -352001,E-02 8014,75E-03 -360001,E-02 8066,68E-03 -368001,E-02 8316,20E-03 -376001,E-02 8465,42E-03 -384001,E-02 8595,79E-03 -392001,E-02 8806,10E-03 -400001,E-02 8891,96E-03 -408001,E-02 8915,27E-03 -416001,E-02 9092,26E-03 -424001,E-02 8958,24E-03 -432001,E-02 8918,95E-03 -440001,E-02 8811,51E-03 -448001,E-02 8707,25E-03 -456001,E-02 8732,42E-03 -464001,E-02 8491,13E-03 -472001,E-02 8208,35E-03 -480001,E-02 7891,68E-03 -488001,E-02 7435,04E-03 -496001,E-02 7195,51E-03 -504001,E-02 6656,11E-03 -512001,E-02 6131,67E-03 -520001,E-02 5561,24E-03 -528001,E-02 5154,09E-03 -536001,E-02 4589,91E-03 -544001,E-02 4025,89E-03 -552001,E-02 3515,17E-03 -560001,E-02 3063,79E-03 -568001,E-02 2616,11E-03 -576001,E-02 2172,26E-03 -584001,E-02 1758,54E-03 -592001,E-02 1439,73E-03 -600001,E-02 1135,96E-03 -608001,E-02 8795,44E-04 -616001,E-02 6934,24E-04 -624001,E-02 5123,25E-04 -632001,E-02 3924,54E-04 -640001,E-02 2757,85E-04 -648001,E-02 2022,33E-04 -656001,E-02 1394,18E-04 -664001,E-02 9877,09E-05 -672001,E-02 6246,92E-05 -680001,E-02 4447,48E-05 -688001,E-02 2404,19E-05 -696001,E-02 2221,25E-05 -704001,E-02 1360,45E-05 -712001,E-02 8023,02E-06 -720001,E-02 5441,88E-06 -728001,E-02 4821,42E-06 -736001,E-02 1955,61E-06 -744001,E-02 1111,77E-06 -752001,E-02 1880,49E-07 -760001,E-02 2346,72E-07 -768001,E-02 1273,80E-07 -776001,E-02 0000,00E+00 -784001,E-02 0000,00E+00 -792001,E-02 0000,00E+00 -800001,E-02 0000,00E+00 +800100,E-04 3216,79E-5 +160010,E-03 3075,05E-5 +240010,E-03 3143,18E-5 +320010,E-03 3219,79E-5 +400010,E-03 3376,13E-5 +480010,E-03 3372,10E-5 +560010,E-03 3355,78E-5 +640010,E-03 3464,64E-5 +720010,E-03 3500,30E-5 +800010,E-03 3682,39E-5 +880010,E-03 3613,67E-5 +960010,E-03 3767,24E-5 +104001,E-02 3782,77E-5 +112001,E-02 3712,38E-5 +120001,E-02 3898,09E-5 +128001,E-02 4098,88E-5 +136001,E-02 4024,27E-5 +144001,E-02 4236,01E-5 +152001,E-02 4271,16E-5 +160001,E-02 4350,11E-5 +168001,E-02 4445,08E-5 +176001,E-02 4541,91E-5 +184001,E-02 4743,65E-5 +192001,E-02 4793,74E-5 +200001,E-02 4858,77E-5 +208001,E-02 5082,54E-5 +216001,E-02 5132,66E-5 +224001,E-02 5264,37E-5 +232001,E-02 5168,46E-5 +240001,E-02 5353,25E-5 +248001,E-02 5545,37E-5 +256001,E-02 5933,99E-5 +264001,E-02 6036,05E-5 +272001,E-02 6070,48E-5 +280001,E-02 6344,41E-5 +288001,E-02 6544,72E-5 +296001,E-02 6824,88E-5 +304001,E-02 6935,89E-5 +312001,E-02 6929,64E-5 +320001,E-02 7110,25E-5 +328001,E-02 7174,12E-5 +336001,E-02 7435,69E-5 +344001,E-02 7778,75E-5 +352001,E-02 8014,75E-5 +360001,E-02 8066,68E-5 +368001,E-02 8316,20E-5 +376001,E-02 8465,42E-5 +384001,E-02 8595,79E-5 +392001,E-02 8806,10E-5 +400001,E-02 8891,96E-5 +408001,E-02 8915,27E-5 +416001,E-02 9092,26E-5 +424001,E-02 8958,24E-5 +432001,E-02 8918,95E-5 +440001,E-02 8811,51E-5 +448001,E-02 8707,25E-5 +456001,E-02 8732,42E-5 +464001,E-02 8491,13E-5 +472001,E-02 8208,35E-5 +480001,E-02 7891,68E-5 +488001,E-02 7435,04E-5 +496001,E-02 7195,51E-5 +504001,E-02 6656,11E-5 +512001,E-02 6131,67E-5 +520001,E-02 5561,24E-5 +528001,E-02 5154,09E-5 +536001,E-02 4589,91E-5 +544001,E-02 4025,89E-5 +552001,E-02 3515,17E-5 +560001,E-02 3063,79E-5 +568001,E-02 2616,11E-5 +576001,E-02 2172,26E-5 +584001,E-02 1758,54E-5 +592001,E-02 1439,73E-5 +600001,E-02 1135,96E-5 +608001,E-02 8795,44E-6 +616001,E-02 6934,24E-6 +624001,E-02 5123,25E-6 +632001,E-02 3924,54E-6 +640001,E-02 2757,85E-6 +648001,E-02 2022,33E-6 +656001,E-02 1394,18E-6 +664001,E-02 9877,09E-7 +672001,E-02 6246,92E-7 +680001,E-02 4447,48E-7 +688001,E-02 2404,19E-7 +696001,E-02 2221,25E-7 +704001,E-02 1360,45E-7 +712001,E-02 8023,02E-8 +720001,E-02 5441,88E-8 +728001,E-02 4821,42E-8 +736001,E-02 1955,61E-8 +744001,E-02 1111,77E-8 +752001,E-02 1880,49E-9 +760001,E-02 2346,72E-9 +768001,E-02 1273,80E-9 +776001,E-02 0000,00E+00 +784001,E-02 0000,00E+00 +792001,E-02 0000,00E+00 +800001,E-02 0000,00E+00 -- 2.20.1