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=585f69d6c97cca2bdec3a2626569b198cee0ff24;hpb=b9a19b44575168f01926c0b99289a50f334447cf;p=sdl_omap.git diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index 585f69d..1d682fb 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -11,6 +11,8 @@ #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" #include "../../events/SDL_events_c.h" + +#include "linux/xenv.h" #include "omapsdl.h" @@ -37,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) { @@ -45,10 +47,11 @@ 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; this->info.hw_available = 1; return 0; @@ -65,35 +68,14 @@ static void omap_VideoQuit(SDL_VideoDevice *this) static SDL_Rect **omap_ListModes(SDL_VideoDevice *this, SDL_PixelFormat *format, Uint32 flags) { - static SDL_Rect omap_mode_list[] = { - /* XXX: we are not really restricted to fixed modes */ - { 0, 0, 1600, 1200 }, - { 0, 0, 1408, 1056 }, - { 0, 0, 1280, 1024 }, - { 0, 0, 1152, 864 }, - { 0, 0, 1024, 768 }, - { 0, 0, 960, 720 }, - { 0, 0, 800, 600 }, - { 0, 0, 768, 576 }, - { 0, 0, 720, 576 }, - { 0, 0, 800, 480 }, - { 0, 0, 720, 480 }, - { 0, 0, 640, 480 }, - { 0, 0, 640, 400 }, - { 0, 0, 512, 384 }, - { 0, 0, 320, 240 }, - { 0, 0, 320, 200 }, + static SDL_Rect omap_mode_max = { + /* with handles_any_size, should accept anything up to this + * XXX: possibly set this dynamically based on free vram? */ + 0, 0, 1600, 1200 }; /* broken API needs this stupidity */ static SDL_Rect *omap_modes[] = { - &omap_mode_list[ 0], &omap_mode_list[ 1], - &omap_mode_list[ 2], &omap_mode_list[ 3], - &omap_mode_list[ 4], &omap_mode_list[ 5], - &omap_mode_list[ 6], &omap_mode_list[ 7], - &omap_mode_list[ 8], &omap_mode_list[ 9], - &omap_mode_list[10], &omap_mode_list[11], - &omap_mode_list[12], &omap_mode_list[13], - &omap_mode_list[14], &omap_mode_list[15], + &omap_mode_max, NULL }; @@ -109,20 +91,75 @@ 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); - if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0) + omapsdl_config_from_env(pdata); + + switch (bpp) { + case 16: + format = SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0); + break; + case 24: + format = SDL_ReallocFormat(current, 24, 0xff0000, 0xff00, 0xff, 0); + break; + case 32: + format = SDL_ReallocFormat(current, 32, 0xff0000, 0xff00, 0xff, 0xff000000); + break; + default: + err("SetVideoMode: bpp %d not supported", bpp); + return NULL; + } + if (format == NULL) return NULL; - if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 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; + } + + 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 = SDL_FULLSCREEN | SDL_DOUBLEBUF | SDL_HWSURFACE; + 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; } @@ -141,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; } @@ -168,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) @@ -195,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); @@ -210,9 +264,16 @@ static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure) static void omap_PumpEvents(SDL_VideoDevice *this) { + struct SDL_PrivateVideoData *pdata = this->hidden; + int dummy; + 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) + xenv_update(&dummy); } static SDL_VideoDevice *omap_create(int devindex)