projects
/
dosdemo
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DOS logger now redirects stdout/stderr instead of providing a new
[dosdemo]
/
src
/
dos
/
main.c
diff --git
a/src/dos/main.c
b/src/dos/main.c
index
06fd0bb
..
53b8888
100644
(file)
--- a/
src/dos/main.c
+++ b/
src/dos/main.c
@@
-7,14
+7,17
@@
#include "mouse.h"
#include "timer.h"
#include "gfx.h"
#include "mouse.h"
#include "timer.h"
#include "gfx.h"
+#include "logger.h"
static int quit;
static int use_mouse;
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_logger("demo.log");
init_timer(100);
kb_init(32);
init_timer(100);
kb_init(32);
@@
-29,9
+32,11
@@
int main(int argc, char **argv)
return 1;
}
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();
@@
-52,9
+57,6
@@
int main(int argc, char **argv)
time_msec = get_msec();
demo_draw();
time_msec = get_msec();
demo_draw();
-
- /*wait_vsync();*/
- memcpy(vmem, fb_pixels, fbsize);
}
break_evloop:
}
break_evloop:
@@
-68,3
+70,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);
+ }
+}