fixes in dfbapi, buggy ising.c added

[physik/ising.git] / dfbapi.c

diff --git a/dfbapi.c b/dfbapi.c
index 9a8519b..0b46a60 100644 (file)
--- a/dfbapi.c
+++ b/dfbapi.c
@@ -28,7 +28,8 @@ int d2_lattice_init(int *argc,char **argv,d2_lattice *d2_l,int x,int y)
  d2_l->p_surface->GetSize(d2_l->p_surface,&(d2_l->s_width),&(d2_l->s_height));
  
  font_dsc.flags=DFDESC_HEIGHT;
  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->max_y*((d2_l->s_height)/(d2_l->max_y))/20; /* 20 ? */
+ font_dsc.height=d2_l->max_y*((d2_l->s_height)/(d2_l->max_y))/40; /* 40 ? */
+ 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);
 
  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);
 


@@ -113,9 +114,9 @@ int d2_lattice_draw(d2_lattice *d2_l,int x,int y,int arg_c,char **arg_v)
  d2_l->p_surface->SetColor(d2_l->p_surface,0x80,0x80,0xff,0xff);
  for(i=1;i<=arg_c;i++)
  {
  d2_l->p_surface->SetColor(d2_l->p_surface,0x80,0x80,0xff,0xff);
  for(i=1;i<=arg_c;i++)
  {

-  d2_l->p_surface->DrawString(d2_l->p_surface,arg_v[1],-1,
+  d2_l->p_surface->DrawString(d2_l->p_surface,arg_v[i],-1,

                               d2_l->info_x+d2_l->fakt_x,
                               d2_l->info_x+d2_l->fakt_x,

-                              d2_l->info_y+d2_l->fakt_x+(i-1)*d2_l->fakt_x,
+                              d2_l->info_y+d2_l->fakt_y+d2_l->font_h+(i-1)*2*d2_l->font_h,

                               DSTF_LEFT);
  }
  /* now we flip all to surface */
                               DSTF_LEFT);
  }
  /* now we flip all to surface */