projects
/
physik
/
morpheus.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-
[physik/morpheus.git]
/
display.c
diff --git
a/display.c
b/display.c
index
809b556
..
16f379a
100644
(file)
--- a/
display.c
+++ b/
display.c
@@
-8,7
+8,7
@@
#include "defines.h"
#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;
{
#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;
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;
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_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_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;
if(keyboard_event.key_id==DIKI_Q) *quit=1;
}
return 23;