projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test test
[dosdemo]
/
src
/
demo.c
diff --git
a/src/demo.c
b/src/demo.c
index
4bd02c7
..
7d22dc4
100644
(file)
--- a/
src/demo.c
+++ b/
src/demo.c
@@
-3,24
+3,45
@@
#include <string.h>
#include <math.h>
#include <errno.h>
#include <string.h>
#include <math.h>
#include <errno.h>
+#include <limits.h>
#include "demo.h"
#include "screen.h"
int fb_width = 320;
int fb_height = 240;
int fb_bpp = 16;
#include "demo.h"
#include "screen.h"
int fb_width = 320;
int fb_height = 240;
int fb_bpp = 16;
-unsigned char *fb_pixels;
+void *fb_pixels;
unsigned long time_msec;
unsigned long time_msec;
+int mouse_x, mouse_y;
+unsigned int mouse_bmask;
static unsigned long nframes;
static unsigned long nframes;
+static const char *start_scr_name;
int demo_init(int argc, char **argv)
{
int demo_init(int argc, char **argv)
{
+ struct screen *scr;
+
+ if(argv[1]) {
+ start_scr_name = argv[1];
+ }
+
if(scr_init() == -1) {
return -1;
}
if(scr_init() == -1) {
return -1;
}
- scr_change(scr_lookup("tunnel"), 4000);
+ if(start_scr_name) {
+ scr = scr_lookup(start_scr_name);
+ } else {
+ scr = scr_screen(0);
+ }
+
+ if(!scr || scr_change(scr, 4000) == -1) {
+ fprintf(stderr, "screen %s not found\n", start_scr_name ? start_scr_name : "0");
+ return -1;
+ }
+ /* clear the framebuffer at least once */
+ memset(fb_pixels, 0, fb_width * fb_height * fb_bpp / CHAR_BIT);
return 0;
}
return 0;
}
@@
-51,6
+72,11
@@
void demo_keyboard(int key, int state)
break;
default:
break;
default:
+ if(key >= '1' && key <= '1' + scr_num_screens()) {
+ int idx = key - '1';
+ printf("change screen %d\n", idx);
+ scr_change(scr_screen(idx), 4000);
+ }
break;
}
}
break;
}
}