vformat->BitsPerPixel = 16;
omapsdl_input_init();
- omapsdl_config();
+ omapsdl_config(this->hidden);
tmp = getenv("SDL_OMAP_DEFAULT_MODE");
if (tmp != NULL && sscanf(tmp, "%dx%d", &w, &h) == 2) {
this->info.current_h = h;
}
else if (osdl_video_detect_screen(this->hidden) == 0) {
- this->info.current_w = this->hidden->screen_w;
- this->info.current_h = this->hidden->screen_h;
+ this->info.current_w = this->hidden->phys_w;
+ this->info.current_h = this->hidden->phys_h;
}
this->handles_any_size = 1;
static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *current, int width,
int height, int bpp, Uint32 flags)
{
+ struct SDL_PrivateVideoData *pdata = this->hidden;
SDL_PixelFormat *format;
+ Uint32 unhandled_flags;
+ int ret;
trace("%d, %d, %d, %08x", width, height, bpp, flags);
+ omapsdl_config_from_env(pdata);
+
switch (bpp) {
case 16:
format = SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0);
format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0xff000000);
break;
default:
- err("SetVideoMode: bpp %d not supported\n", bpp);
+ err("SetVideoMode: bpp %d not supported", bpp);
return NULL;
}
if (format == NULL)
return NULL;
- if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
+ if (!(flags & SDL_DOUBLEBUF) && pdata->cfg_force_doublebuf) {
+ log("forcing SDL_DOUBLEBUF");
+ flags |= SDL_DOUBLEBUF;
+ }
+
+ ret = osdl_video_set_mode(pdata, width, height, bpp,
+ (flags & SDL_DOUBLEBUF) ? 1 : 0);
+ if (ret < 0)
return NULL;
- current->flags = SDL_FULLSCREEN | SDL_DOUBLEBUF | SDL_HWSURFACE;
+ flags |= SDL_FULLSCREEN | SDL_HWSURFACE;
+ unhandled_flags = flags & ~(SDL_FULLSCREEN | SDL_HWSURFACE | SDL_DOUBLEBUF);
+ if (unhandled_flags != 0) {
+ log("dropping unhandled flags: %08x", unhandled_flags);
+ flags &= ~unhandled_flags;
+ }
+
+ current->flags = flags;
current->w = width;
current->h = height;
current->pitch = SDL_CalculatePitch(current);
- current->pixels = osdl_video_flip(this->hidden);
+ if (pdata->layer_w != 0 && pdata->layer_h != 0) {
+ pdata->ts_xmul = (width << 16) / pdata->layer_w;
+ pdata->ts_ymul = (height << 16) / pdata->layer_h;
+ }
+
+ current->pixels = osdl_video_flip(pdata);
return current;
}
{
trace("%d, %p", nrects, rects);
- if (nrects != 1 || rects->x != 0 || rects->y != 0 ||
- rects->w != this->screen->w || rects->h != this->screen->h) {
- static int warned = 0;
- if (!warned) {
- not_supported();
- warned = 1;
- }
+ /* hmh.. */
+ if (nrects == 1 && rects->x == 0 && rects->y == 0 &&
+ (this->screen->flags & SDL_DOUBLEBUF) &&
+ rects->w == this->screen->w && rects->h == this->screen->h)
+ {
+ this->screen->pixels = osdl_video_flip(this->hidden);
}
-
- this->screen->pixels = osdl_video_flip(this->hidden);
}
static void omap_InitOSKeymap(SDL_VideoDevice *this)
SDL_PrivateKeyboard(is_pressed, &keysym);
}
+/* clamp x to min..max-1 */
+#define clamp(x, min, max) \
+ if (x < (min)) x = min; \
+ if (x >= (max)) x = max
+
static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure)
{
static int was_pressed;
+ SDL_VideoDevice *this = cb_arg;
+ struct SDL_PrivateVideoData *pdata = this->hidden;
+ int xoffs;
+
+ if (!pdata->cfg_no_ts_translate && pdata->layer_w != 0 && pdata->layer_h != 0) {
+ x = (x - pdata->layer_x) * pdata->ts_xmul >> 16;
+ y = (y - pdata->layer_y) * pdata->ts_ymul >> 16;
+ clamp(x, 0, this->screen->w);
+ clamp(y, 0, this->screen->h);
+ }
SDL_PrivateMouseMotion(0, 0, x, y);
trace();
- omapsdl_input_get_events(0, key_event_cb, ts_event_cb, NULL);
+ omapsdl_input_get_events(0, key_event_cb, ts_event_cb, this);
// XXX: we might want to process some X events too
if (pdata->xenv_up)