rubber band in platform-specific code

[retroray] / src / dos / main.c

diff --git a/src/dos/main.c b/src/dos/main.c
index 77752fb..e6e2346 100644 (file)
--- a/src/dos/main.c
+++ b/src/dos/main.c
@@ -18,15 +18,18 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <ctype.h>
 #include <time.h>
 #include "app.h"
 #include "keyb.h"
-#include "gfx.h"
+#include "vidsys.h"
 #include "cdpmi.h"
 #include "mouse.h"
 #include "logger.h"
 #include "options.h"
 #include "cpuid.h"
+#include "util.h"
+#include "rtk.h"
 
 static INLINE int clamp(int x, int a, int b)
 {
@@ -38,14 +41,19 @@ static INLINE int clamp(int x, int a, int b)
 static void draw_cursor(int x, int y);
 
 static uint32_t *vmem;
-static int quit, disp_pending;
+static int quit, disp_pending, dirty_valid;
+static rtk_rect dirty;
+static int mx, my;
+static rtk_rect rband, prev_rband;
+
 
 int main(int argc, char **argv)
 {
        int i;
        int vmidx;
-       int mx, my, mdx, mdy, prev_mx, prev_my, bnstate, bndiff;
+       int mdx, mdy, prev_mx, prev_my, bnstate, bndiff;
        static int prev_bnstate;
+       char *env;
 
 #ifdef __DJGPP__
        __djgpp_nearptr_enable();
@@ -64,16 +72,23 @@ int main(int argc, char **argv)
                return 1;
        }
 
-       add_log_file("retroray.log");
+       if((env = getenv("RRLOG"))) {
+               if(tolower(env[0]) == 'c' && tolower(env[1]) == 'o' && tolower(env[2]) == 'm'
+                               && isdigit(env[3])) {
+                       add_log_console(env);
+               } else {
+                       add_log_file(env);
+               }
+       }
 
-       if(init_video() == -1) {
+       if(vid_init() == -1) {
                return 1;
        }
 
-       if((vmidx = match_video_mode(640, 480, 32)) == -1) {
+       if((vmidx = vid_findmode(640, 480, 32)) == -1) {
                return 1;
        }
-       if(!(vmem = set_video_mode(vmidx, 1))) {
+       if(!(vmem = vid_setmode(vmidx))) {
                return 1;
        }
 
@@ -84,7 +99,7 @@ int main(int argc, char **argv)
        if(app_init() == -1) {
                goto break_evloop;
        }
-       disp_pending = 1;
+       app_redisplay(0, 0, 0, 0);
 
        app_reshape(win_width, win_height);
        mx = win_width / 2;
@@ -105,7 +120,11 @@ int main(int argc, char **argv)
                }
 
                while((key = kb_getkey()) != -1) {
-                       app_keyboard(key, 1);
+                       if(key == 'r' && (modkeys & KEY_MOD_CTRL)) {
+                               app_redisplay(0, 0, 0, 0);
+                       } else {
+                               app_keyboard(key, 1);
+                       }
                        if(quit) goto break_evloop;
                }
 
@@ -134,16 +153,15 @@ int main(int argc, char **argv)
                        app_display();
                }
 
+               app_swap_buffers();
+
                draw_cursor(prev_mx, prev_my);
                draw_cursor(mx, my);
-
-               app_swap_buffers();
        }
 
 break_evloop:
        app_shutdown();
-       set_text_mode();
-       cleanup_video();
+       vid_cleanup();
        kb_shutdown();
        return 0;
 }
@@ -153,14 +171,57 @@ long app_getmsec(void)
        return time(0) * 1000;  /* TODO */
 }
 
-void app_redisplay(void)
+void app_redisplay(int x, int y, int w, int h)
 {
+       rtk_rect r;
+
+       if((w | h) == 0) {
+               r.x = r.y = 0;
+               r.width = win_width;
+               r.height = win_height;
+       } else {
+               r.x = x;
+               r.y = y;
+               r.width = w;
+               r.height = h;
+       }
+
+       if(dirty_valid) {
+               rtk_rect_union(&dirty, &r);
+       } else {
+               dirty = r;
+       }
        disp_pending = 1;
+       dirty_valid = 1;
 }
 
 void app_swap_buffers(void)
 {
-       blit_frame(framebuf, opt.vsync);
+       if(opt.vsync) {
+               vid_vsync();
+       }
+       if(dirty_valid) {
+               if(dirty.width < win_width || dirty.height < win_height) {
+                       uint32_t *src = framebuf + dirty.y * win_width + dirty.x;
+                       vid_blit32(dirty.x, dirty.y, dirty.width, dirty.height, src, 0);
+
+                       if(mx >= dirty.x && my >= dirty.y && mx < dirty.x + dirty.width && my < dirty.y + dirty.height) {
+                               draw_cursor(mx, my);
+                       }
+               } else {
+                       vid_blitfb32(framebuf, 0);
+                       draw_cursor(mx, my);
+               }
+               dirty_valid = 0;
+       }
+
+       if(rband.width) {
+               if(prev_rband.width) {
+                       draw_rband(&prev_rband);
+               }
+               draw_rband(&rband);
+               prev_rband = rband;
+       }
 }
 
 void app_quit(void)
@@ -180,10 +241,23 @@ void app_vsync(int vsync)
 {
 }
 
+void app_rband(int x, int y, int w, int h)
+{
+       if(!(w | h)) {
+               w = h = 0;
+               prev_rband.width = 0;
+       }
+
+       rband.x = x;
+       rband.y = y;
+       rband.width = w;
+       rband.height = h;
+}
+
 static void draw_cursor(int x, int y)
 {
        int i;
-       uint32_t *fbptr = framebuf + y * win_width + x;
+       uint32_t *fbptr = vmem + y * win_width + x;
 
        for(i=0; i<3; i++) {
                int offs = i + 1;
@@ -193,3 +267,27 @@ static void draw_cursor(int x, int y)
                if(x < win_width - offs - 1) fbptr[offs] ^= 0xffffff;
        }
 }
+
+static void draw_rband(rtk_rect *r)
+{
+       int i;
+       rtk_rect rect;
+       uint32_t *fbptr, *bptr;
+
+       rect = *r;
+       rtk_fix_rect(&rect);
+
+       fbptr = vmem + rect.y * win_width + rect.x;
+       bptr = fbptr + win_width * (rect.height - 1);
+
+       for(i=0; i<rect.width; i++) {
+               fbptr[i] ^= 0xffffff;
+               bptr[i] ^= 0xffffff;
+       }
+       fbptr += win_width;
+       for(i=0; i<rect.height-2; i++) {
+               fbptr[0] ^= 0xffffff;
+               fbptr[rect.width - 1] ^= 0xffffff;
+               fbptr += win_width;
+       }
+}