X-Git-Url: https://www.hackdaworld.org/gitweb/?a=blobdiff_plain;f=display.c;h=16f379a8358108f5757d45d0ba389b10aa18f76a;hb=30afbcffe819262c3bc4407f3a92fe4308f7a849;hp=809b556fe65a760f4204d35c0354682214a34748;hpb=dcc213e7fef0a79e92d8548bd9a37461e91c9a5c;p=physik%2Fmorpheus.git diff --git a/display.c b/display.c index 809b556..16f379a 100644 --- a/display.c +++ b/display.c @@ -8,7 +8,7 @@ #include "defines.h" -int display_init(int x,int y,int z,display *display,void *cell,int *argc,char **argv) +int display_init(u32 x,u32 y,u32 z,display *display,void *cell,int *argc,char **argv) { #ifdef USE_DFB_API DFBSurfaceDescription surface_dsc; @@ -173,15 +173,16 @@ int display_event_init(display *display) int display_scan_event(display *display,u32 *x,u32 *y,u32 *z,int *quit) { DFBInputEvent keyboard_event; + display->keyboard_buffer->WaitForEvent(display->keyboard_buffer); display->keyboard_buffer->GetEvent(display->keyboard_buffer,DFB_EVENT(&keyboard_event)); if(keyboard_event.type==DIET_KEYPRESS) { if(keyboard_event.key_id==DIKI_LEFT && *x!=0) *x-=1; - if(keyboard_event.key_id==DIKI_RIGHT && *x!=(display->max_x)-1) *x+=1; + if(keyboard_event.key_id==DIKI_RIGHT && *x!=display->max_x-1) *x+=1; if(keyboard_event.key_id==DIKI_DOWN && *y!=0) *y-=1; - if(keyboard_event.key_id==DIKI_UP && *y!=(display->max_y)-1) *y+=1; + if(keyboard_event.key_id==DIKI_UP && *y!=display->max_y-1) *y+=1; if(keyboard_event.key_id==DIKI_PAGE_UP && *z!=0) *z-=1; - if(keyboard_event.key_id==DIKI_PAGE_DOWN && *z!=(display->max_z)-1) *z+=1; + if(keyboard_event.key_id==DIKI_PAGE_DOWN && *z!=display->max_z-1) *z+=1; if(keyboard_event.key_id==DIKI_Q) *quit=1; } return 23;