added spaceball on linux

[dosdemo] / src / dos / main.c

diff --git a/src/dos/main.c b/src/dos/main.c
index 7564be3..aed4e8a 100644 (file)
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -3,6 +3,8 @@
 #include <math.h>
 #include <string.h>
 #include <limits.h>
+#include <assert.h>
+#include <conio.h>
 #include "demo.h"
 #include "keyb.h"
 #include "mouse.h"
@@ -12,6 +14,9 @@
 #include "sball.h"
 #include "cfgopt.h"
 #include "logger.h"
+#include "tinyfps.h"
+
+#undef NOKEYB
 
 static int handle_sball_event(sball_event *ev);
 static void recalc_sball_matrix(float *xform);
@@ -31,9 +36,12 @@ int main(int argc, char **argv)
        init_logger("demo.log");
 
        init_timer(100);
+#ifndef NOKEYB
        kb_init(32);
+#endif
 
        if((use_mouse = have_mouse())) {
+               printf("initializing mouse input\n");
                set_mouse_limits(0, 0, fb_width, fb_height);
                set_mouse(fb_width / 2, fb_height / 2);
        }
@@ -43,11 +51,15 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       if(!(vmem_front = set_video_mode(fb_width, fb_height, fb_bpp))) {
+       if(!(vmem_back = set_video_mode(fb_width, fb_height, fb_bpp))) {
                return 1;
        }
-       /* TODO implement multiple video memory pages for flipping */
-       vmem_back = vmem_front;
+       if(!(vmem_front = page_flip(FLIP_NOW))) {
+               fprintf(stderr, "page flipping not supported. falling back to double buffering\n");
+               vmem_front = vmem_back;
+       } else {
+               assert(vmem_back != vmem_front);
+       }
 
        if(demo_init(argc, argv) == -1) {
                set_text_mode();
@@ -61,10 +73,16 @@ int main(int argc, char **argv)
        reset_timer();
 
        while(!quit) {
+#ifndef NOKEYB
                int key;
                while((key = kb_getkey()) != -1) {
                        demo_keyboard(key, 1);
                }
+#else
+               if(kbhit()) {
+                       demo_keyboard(getch(), 1);
+               }
+#endif
                if(quit) goto break_evloop;
 
                if(use_mouse) {
@@ -72,7 +90,6 @@ int main(int argc, char **argv)
                }
                if(use_sball && sball_pending()) {
                        sball_event ev;
-                       printf("got sball event\n");
                        while(sball_getevent(&ev)) {
                                handle_sball_event(&ev);
                        }
@@ -86,7 +103,9 @@ int main(int argc, char **argv)
 break_evloop:
        set_text_mode();
        demo_cleanup();
+#ifndef NOKEYB
        kb_shutdown();
+#endif
        if(use_sball) {
                sball_shutdown();
        }
@@ -100,13 +119,31 @@ void demo_quit(void)
 
 void swap_buffers(void *pixels)
 {
-       /* TODO implement page flipping */
        if(pixels) {
-               /*wait_vsync();*/
+               /* just memcpy to the front buffer */
+               if(opt.vsync) {
+                       wait_vsync();
+               }
                drawFps(pixels);
                memcpy(vmem_front, pixels, fbsize);
+
        } else {
+               /* attempt page flipping */
+               void *next;
+
                drawFps(vmem_back);
+               if((next = page_flip(opt.vsync ? FLIP_VBLANK_WAIT : FLIP_NOW))) {
+                       assert(next == vmem_back);
+                       vmem_back = vmem_front;
+                       vmem_front = next;
+               } else {
+                       /* failed to page flip, assume we drew in the front buffer then
+                        * and just wait for vsync if necessary
+                        */
+                       if(opt.vsync) {
+                               wait_vsync();
+                       }
+               }
        }
 }