foo

[cdmenu] / menu / src / dos / main.c

diff --git a/menu/src/dos/main.c b/menu/src/dos/main.c
index a8e9c1b..240a390 100644 (file)
--- a/menu/src/dos/main.c
+++ b/menu/src/dos/main.c
@@ -38,6 +38,8 @@ int main(int argc, char **argv)
                } else {
                        add_log_file(env);
                }
+       } else {
+               add_log_file("menu.log");
        }
 
        if(!(use_mouse = have_mouse())) {
@@ -50,9 +52,7 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       scr_width = 640;
-       scr_height = 480;
-       if((vmidx = vid_findmode(scr_width, scr_height, 8)) == -1) {
+       if((vmidx = vid_findmode(SCR_WIDTH, SCR_HEIGHT, 8)) == -1) {
                return 1;
        }
        if(!(vmem = vid_setmode(vmidx))) {
@@ -64,9 +64,8 @@ int main(int argc, char **argv)
        }
        app_invalidate(0, 0, 0, 0);
 
-       app_reshape(scr_width, scr_height);
-       mx = scr_width / 2;
-       my = scr_height / 2;
+       mx = SCR_WIDTH / 2;
+       my = SCR_HEIGHT / 2;
        prev_mx = prev_my = -1;
 
        for(;;) {
@@ -100,10 +99,10 @@ int main(int argc, char **argv)
                        read_mouse_rel(&mdx, &mdy);
                        mx += mdx;
                        if(mx < 0) mx = 0;
-                       if(mx >= scr_width) mx = scr_width - 1;
+                       if(mx >= SCR_WIDTH) mx = SCR_WIDTH - 1;
                        my += mdy;
                        if(my < 0) my = 0;
-                       if(my >= scr_height) my = scr_height - 1;
+                       if(my >= SCR_HEIGHT) my = SCR_HEIGHT - 1;
                        mdx = mx - prev_mx;
                        mdy = my - prev_my;
 
@@ -133,8 +132,8 @@ void app_invalidate(int x, int y, int w, int h)
 
        if((w | h) == 0) {
                r.x = r.y = 0;
-               r.width = scr_width;
-               r.height = scr_height;
+               r.width = SCR_WIDTH;
+               r.height = SCR_HEIGHT;
        } else {
                r.x = x;
                r.y = y;
@@ -157,11 +156,11 @@ void app_swap_buffers(void)
        vid_vsync();
 
        if(dirty_valid) {
-               if(dirty.width < scr_width || dirty.height < scr_height) {
-                       src = framebuf + dirty.y * scr_width + dirty.x;
-                       vid_blit8(dirty.x, dirty.y, dirty.width, dirty.height, src, 0);
+               if(dirty.width < SCR_WIDTH || dirty.height < SCR_HEIGHT) {
+                       src = framebuf + dirty.y * SCR_WIDTH + dirty.x;
+                       vid_blit(dirty.x, dirty.y, dirty.width, dirty.height, src, SCR_WIDTH);
                } else {
-                       vid_blitfb8(framebuf, 0);
+                       vid_blitfb(framebuf, SCR_WIDTH);
                }
                dirty_valid = 0;
        }
@@ -172,14 +171,11 @@ void app_quit(void)
        quit = 1;
 }
 
-void app_resize(int x, int y)
-{
-}
-
-void app_fullscreen(int fs)
-{
-}
-
-void app_vsync(int vsync)
+void app_setcolor(int idx, int r, int g, int b)
 {
+       struct vid_color col;
+       col.r = r;
+       col.g = g;
+       col.b = b;
+       vid_setpal(idx, 1, &col);
 }