projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
[dosdemo]
/
src
/
dos
/
main.c
diff --git
a/src/dos/main.c
b/src/dos/main.c
index
442f343
..
10492fe
100644
(file)
--- a/
src/dos/main.c
+++ b/
src/dos/main.c
@@
-1,28
+1,39
@@
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
#include <limits.h>
#include "demo.h"
#include "keyb.h"
#include <limits.h>
#include "demo.h"
#include "keyb.h"
+#include "mouse.h"
#include "timer.h"
#include "gfx.h"
static int quit;
#include "timer.h"
#include "gfx.h"
static int quit;
+static int use_mouse;
+static long fbsize;
int main(int argc, char **argv)
{
int main(int argc, char **argv)
{
- void *vmem;
- long fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
+ fbsize = fb_width * fb_height * fb_bpp / CHAR_BIT;
init_timer(100);
kb_init(32);
init_timer(100);
kb_init(32);
+ if((use_mouse = have_mouse())) {
+ set_mouse_limits(0, 0, fb_width, fb_height);
+ set_mouse(fb_width / 2, fb_height / 2);
+ }
+
if(!(fb_pixels = malloc(fbsize))) {
fprintf(stderr, "failed to allocate backbuffer\n");
return 1;
}
if(!(fb_pixels = malloc(fbsize))) {
fprintf(stderr, "failed to allocate backbuffer\n");
return 1;
}
- if(!(vmem = set_video_mode(fb_width, fb_height, fb_bpp))) {
+ if(!(vmem_front = set_video_mode(fb_width, fb_height, fb_bpp))) {
return 1;
}
return 1;
}
+ /* TODO implement multiple video memory pages for flipping */
+ vmem_back = vmem_front;
if(demo_init(argc, argv) == -1) {
set_text_mode();
if(demo_init(argc, argv) == -1) {
set_text_mode();
@@
-37,13
+48,12
@@
int main(int argc, char **argv)
}
if(quit) goto break_evloop;
}
if(quit) goto break_evloop;
- mouse_bmask = read_mouse(&mouse_x, &mouse_y);
+ if(use_mouse) {
+ mouse_bmask = read_mouse(&mouse_x, &mouse_y);
+ }
time_msec = get_msec();
demo_draw();
time_msec = get_msec();
demo_draw();
-
- /*wait_vsync();*/
- memcpy(vmem, fb_pixels, fbsize);
}
break_evloop:
}
break_evloop:
@@
-57,3
+67,12
@@
void demo_quit(void)
{
quit = 1;
}
{
quit = 1;
}
+
+void swap_buffers(void *pixels)
+{
+ /* TODO implement page flipping */
+ if(pixels) {
+ /*wait_vsync();*/
+ memcpy(vmem_front, pixels, fbsize);
+ }
+}