#include <ctype.h>
#include <time.h>
#include "app.h"
+#include "timer.h"
#include "keyb.h"
#include "vidsys.h"
#include "cdpmi.h"
}
static void draw_cursor(int x, int y);
+static void draw_rband(rtk_rect *r);
static uint32_t *vmem;
-static int quit, disp_pending, dirty_valid;
+static int quit, dirty_valid;
static rtk_rect dirty;
-static int mx, my;
+static int mx, my, prev_mx, prev_my;
static rtk_rect rband, prev_rband;
{
int i;
int vmidx;
- int mdx, mdy, prev_mx, prev_my, bnstate, bndiff;
+ int mdx, mdy, bnstate, bndiff;
static int prev_bnstate;
char *env;
__djgpp_nearptr_enable();
#endif
+ if(!have_mouse()) {
+ fprintf(stderr, "No mouse detected. Make sure the mouse driver is installed\n");
+ return 1;
+ }
+
init_logger();
if(read_cpuid(&cpuid) == 0) {
print_cpuid(&cpuid);
}
+ init_timer(0);
kb_init();
- if(!have_mouse()) {
- fprintf(stderr, "No mouse detected. Make sure the mouse driver is installed\n");
- return 1;
- }
+ load_options(CFGFILE);
if((env = getenv("RRLOG"))) {
if(tolower(env[0]) == 'c' && tolower(env[1]) == 'o' && tolower(env[2]) == 'm'
return 1;
}
- if((vmidx = vid_findmode(640, 480, 32)) == -1) {
+ if((vmidx = vid_findmode(opt.xres, opt.yres, opt.bpp)) == -1) {
return 1;
}
if(!(vmem = vid_setmode(vmidx))) {
return 1;
}
- win_width = 640;
- win_height = 480;
+ win_width = opt.xres;
+ win_height = opt.yres;
win_aspect = (float)win_width / (float)win_height;
if(app_init() == -1) {
app_reshape(win_width, win_height);
mx = win_width / 2;
my = win_height / 2;
+ prev_mx = prev_my = -1;
for(;;) {
int key;
prev_bnstate = bnstate;
read_mouse_rel(&mdx, &mdy);
- prev_mx = mx;
- prev_my = my;
mx = clamp(mx + mdx, 0, win_width - 1);
my = clamp(my + mdy, 0, win_height - 1);
mdx = mx - prev_mx;
app_motion(mx, my);
}
- if(disp_pending) {
- disp_pending = 0;
- app_display();
- }
-
+ app_display();
app_swap_buffers();
-
- draw_cursor(prev_mx, prev_my);
- draw_cursor(mx, my);
}
break_evloop:
return 0;
}
-long app_getmsec(void)
-{
- return time(0) * 1000; /* TODO */
-}
-
void app_redisplay(int x, int y, int w, int h)
{
rtk_rect r;
} else {
dirty = r;
}
- disp_pending = 1;
dirty_valid = 1;
}
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(prev_mx >= 0) {
+ draw_cursor(prev_mx, prev_my);
+ }
+ draw_cursor(mx, my);
+ prev_mx = mx;
+ prev_my = my;
+ if(prev_rband.width) {
+ draw_rband(&prev_rband);
+ }
if(rband.width) {
- if(prev_rband.width) {
- draw_rband(&prev_rband);
- }
draw_rband(&rband);
- prev_rband = rband;
}
+ prev_rband = rband;
}
void app_quit(void)
{
if(!(w | h)) {
w = h = 0;
- prev_rband.width = 0;
}
rband.x = x;
rect = *r;
rtk_fix_rect(&rect);
+ if(rect.width <= 0 || rect.height <= 0) {
+ return;
+ }
+
fbptr = vmem + rect.y * win_width + rect.x;
bptr = fbptr + win_width * (rect.height - 1);