#include <limits.h>
#include <SDL/SDL.h>
#include "demo.h"
+#include "tinyfps.h"
static void handle_event(SDL_Event *ev);
+static void toggle_fullscreen(void);
static int quit;
static long start_time;
static int fbscale = 2;
static int xsz, ysz;
+static unsigned int sdl_flags = SDL_SWSURFACE;
int main(int argc, char **argv)
{
int s, i, j;
char *env;
unsigned short *sptr, *dptr;
- unsigned int sdl_flags = SDL_SWSURFACE;
if((env = getenv("FBSCALE")) && (s = atoi(env))) {
fbscale = s;
xsz = fb_width * fbscale;
ysz = fb_height * fbscale;
- if(!(fb_pixels = malloc(fb_width * fb_height * fb_bpp / CHAR_BIT))) {
+ /* allocate 1 extra row as a guard band, until we fucking fix the rasterizer */
+ if(!(fb_pixels = malloc(fb_width * (fb_height + 1) * fb_bpp / CHAR_BIT))) {
fprintf(stderr, "failed to allocate virtual framebuffer\n");
return 1;
}
time_msec = SDL_GetTicks() - start_time;
demo_draw();
+ drawFps(fb_pixels);
if(SDL_MUSTLOCK(fbsurf)) {
SDL_LockSurface(fbsurf);
}
sptr = fb_pixels;
- dptr = fbsurf->pixels;
+ dptr = (unsigned short*)fbsurf->pixels + (fbsurf->w - xsz) / 2;
for(i=0; i<fb_height; i++) {
for(j=0; j<fb_width; j++) {
int x, y;
for(y=0; y<fbscale; y++) {
for(x=0; x<fbscale; x++) {
- dptr[y * xsz + x] = pixel;
+ dptr[y * fbsurf->w + x] = pixel;
}
}
dptr += fbscale;
}
- dptr += xsz * (fbscale - 1);
+ dptr += (fbsurf->w - fb_width) * fbscale;
}
if(SDL_MUSTLOCK(fbsurf)) {
case SDL_KEYDOWN:
case SDL_KEYUP:
+ if(ev->key.keysym.sym == 'f') {
+ if(ev->key.state == SDL_PRESSED) {
+ toggle_fullscreen();
+ }
+ break;
+ }
demo_keyboard(ev->key.keysym.sym, ev->key.state == SDL_PRESSED ? 1 : 0);
break;
break;
case SDL_MOUSEBUTTONDOWN:
- mouse_bmask |= 1 << ev->button.button;
+ mouse_bmask |= 1 << (ev->button.button - SDL_BUTTON_LEFT);
if(0) {
case SDL_MOUSEBUTTONUP:
- mouse_bmask &= ~(1 << ev->button.button);
+ mouse_bmask &= ~(1 << (ev->button.button - SDL_BUTTON_LEFT));
}
mouse_x = ev->button.x / fbscale;
mouse_y = ev->button.y / fbscale;
break;
}
}
+
+static void toggle_fullscreen(void)
+{
+ SDL_Surface *newsurf;
+ unsigned int newflags = sdl_flags ^ SDL_FULLSCREEN;
+
+ if(!(newsurf = SDL_SetVideoMode(xsz, ysz, fb_bpp, newflags))) {
+ fprintf(stderr, "failed to go %s\n", newflags & SDL_FULLSCREEN ? "fullscreen" : "windowed");
+ return;
+ }
+
+ fbsurf = newsurf;
+ sdl_flags = newflags;
+}