X-Git-Url: https://hackdaworld.org/gitweb/?p=physik%2Fnlsop.git;a=blobdiff_plain;f=dfbapi.c;h=eb74fa364933f53d4c3768fca4ba916da1c74557;hp=138f7e44bfaa7bdcf983ba50081af874652a3f5a;hb=40dfea76e1d7217b798999a5ffdca318ee951b81;hpb=e08a152c3adeed6ccad3b19d1a40a2685d700612 diff --git a/dfbapi.c b/dfbapi.c index 138f7e4..eb74fa3 100644 --- a/dfbapi.c +++ b/dfbapi.c @@ -257,17 +257,17 @@ int d3_lattice_draw(d3_lattice *d3_l,int x,int y,int z,int arg_c,char **arg_v) d3_l->p_surface->SetColor(d3_l->p_surface,0x80,0x80,0xff,0xff); for(i=1;i<=arg_c;i++) { - if(i<8) + 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+d3_l->fakt_y+d3_l->font_h+(i-1)*2*d3_l->font_h, + 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+d3_l->fakt_y+d3_l->font_h+(i%8-1)*2*d3_l->font_h, + d3_l->info_y+2*d3_l->fakt_y+d3_l->font_h+(i%13-1)*d3_l->font_h, DSTF_LEFT); } } @@ -298,15 +298,16 @@ int scan_event(d3_lattice *d3_l,int *x,int *y,int *z,int *q,int *esc) { DFBInputEvent ke; + d3_l->k_buffer->WaitForEvent(d3_l->k_buffer); d3_l->k_buffer->GetEvent(d3_l->k_buffer,DFB_EVENT(&ke)); if(ke.type==DIET_KEYPRESS) { if(ke.key_id==DIKI_LEFT && *x!=0) *x-=1; if(ke.key_id==DIKI_RIGHT && *x!=d3_l->max_x-1) *x+=1; - if(ke.key_id==DIKI_DOWN && *y!=0) *y-=1; - if(ke.key_id==DIKI_UP && *y!=d3_l->max_y-1) *y+=1; - if(ke.key_id==DIKI_PAGE_DOWN && *z!=0) *z-=1; - if(ke.key_id==DIKI_PAGE_UP && *z!=d3_l->max_z-1) *z+=1; + if(ke.key_id==DIKI_UP && *y!=0) *y-=1; + if(ke.key_id==DIKI_DOWN && *y!=d3_l->max_y-1) *y+=1; + if(ke.key_id==DIKI_PAGE_UP && *z!=0) *z-=1; + if(ke.key_id==DIKI_PAGE_DOWN && *z!=d3_l->max_z-1) *z+=1; if(ke.key_id==DIKI_Q) *q=1; if(ke.key_id==DIKI_ESCAPE) *esc=1; }