X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=1d682fb7af8033125088857aa3c363d9d773bf09;hb=9225e894f5e5f4595741065701978ef6730213a2;hp=f7ab47f947ba3a702f5f475a7acc61caf1908442;hpb=3576a5ac362536f8440c0d6610017dd367b59732;p=sdl_omap.git diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index f7ab47f..1d682fb 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -39,7 +39,7 @@ static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat) 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) { @@ -47,8 +47,8 @@ static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat) 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; @@ -91,10 +91,15 @@ static SDL_Rect **omap_ListModes(SDL_VideoDevice *this, SDL_PixelFormat *format, 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; + void *fbmem; 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); @@ -106,21 +111,55 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren 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; + } + + if (pdata->border_l | pdata->border_r | pdata->border_t | pdata->border_b) { + if (pdata->border_l + pdata->border_r >= width + || pdata->border_t + pdata->border_b >= height) + { + err("specified border too large, ignoring"); + pdata->border_l = pdata->border_r = pdata->border_t = pdata->border_b = 0; + } + } + + fbmem = osdl_video_set_mode(pdata, + pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b, + width, height, bpp, (flags & SDL_DOUBLEBUF) ? 1 : 0); + if (fbmem == NULL) { + log("failing on mode %dx%d@%d, doublebuf %s", + width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off"); 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); + current->pixels = fbmem; + pdata->app_uses_flip = 0; + + if (pdata->layer_w != 0 && pdata->layer_h != 0) { + int v_width = width - (pdata->border_l + pdata->border_r); + int v_height = height - (pdata->border_t + pdata->border_b); + pdata->ts_xmul = (v_width << 16) / pdata->layer_w; + pdata->ts_ymul = (v_height << 16) / pdata->layer_h; + } return current; } @@ -139,9 +178,12 @@ static void omap_UnlockHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) static int omap_FlipHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) { + struct SDL_PrivateVideoData *pdata = this->hidden; + trace("%p", surface); - surface->pixels = osdl_video_flip(this->hidden); + surface->pixels = osdl_video_flip(pdata); + pdata->app_uses_flip = 1; return 0; } @@ -166,18 +208,17 @@ static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SD static void omap_UpdateRects(SDL_VideoDevice *this, int nrects, SDL_Rect *rects) { + struct SDL_PrivateVideoData *pdata = this->hidden; + 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; - } + /* for doublebuf forcing on apps */ + if (nrects == 1 && rects->x == 0 && rects->y == 0 + && !pdata->app_uses_flip && (this->screen->flags & SDL_DOUBLEBUF) + && rects->w == this->screen->w && rects->h == this->screen->h) + { + this->screen->pixels = osdl_video_flip(pdata); } - - this->screen->pixels = osdl_video_flip(this->hidden); } static void omap_InitOSKeymap(SDL_VideoDevice *this) @@ -193,9 +234,24 @@ static int key_event_cb(void *cb_arg, int sdl_kc, int is_pressed) 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 = pdata->border_l + ((x - pdata->layer_x) * pdata->ts_xmul >> 16); + y = pdata->border_t + ((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); @@ -213,7 +269,7 @@ static void omap_PumpEvents(SDL_VideoDevice *this) 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)