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=dc97a0a533d06932d79072d130292af47d0d5fff;hpb=9a8e84f82ce2d22a033605d293eb8ba3a4936398;p=sdl_omap.git diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index dc97a0a..1d682fb 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -5,20 +5,16 @@ * See the COPYING file in the top-level directory. */ +#include #include #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" #include "../../events/SDL_events_c.h" -#include "linux/fbdev.h" -#include "linux/oshide.h" -#include "omapsdl.h" +#include "linux/xenv.h" +#include "omapsdl.h" -struct SDL_PrivateVideoData { - struct vout_fbdev *fbdev; -// void *fbmem; -}; static int omap_available(void) { @@ -34,13 +30,29 @@ static void omap_free(SDL_VideoDevice *device) static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat) { + const char *tmp; + int w, h, ret; + trace(); // default to 16bpp 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_w = w; + this->info.current_h = h; + } + else if (osdl_video_detect_screen(this->hidden) == 0) { + 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; } @@ -49,37 +61,21 @@ static void omap_VideoQuit(SDL_VideoDevice *this) { trace(); - if (this->hidden->fbdev != NULL) { - vout_fbdev_finish(this->hidden->fbdev); - this->hidden->fbdev = NULL; - - oshide_finish(); - } + osdl_video_finish(this->hidden); this->screen->pixels = NULL; + omapsdl_input_finish(); } 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 - // FIXME: should really check the display for max supported - { 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 + /* 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_max, NULL }; @@ -95,41 +91,79 @@ 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 (this->hidden->fbdev == NULL) { - this->hidden->fbdev = vout_fbdev_init("/dev/fb0", &width, &height, 0); - if (this->hidden->fbdev == NULL) - return NULL; + 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; - oshide_init(); + if (!(flags & SDL_DOUBLEBUF) && pdata->cfg_force_doublebuf) { + log("forcing SDL_DOUBLEBUF"); + flags |= SDL_DOUBLEBUF; } - else { - if (vout_fbdev_resize(this->hidden->fbdev, width, height, 0, 0, 0, 0, 0) < 0) - return NULL; + + 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; + } } - if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 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 = vout_fbdev_flip(this->hidden->fbdev); + 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; } -static void *flip_it(struct vout_fbdev *fbdev) -{ - if (gcfg_force_vsync) - vout_fbdev_wait_vsync(fbdev); - - return vout_fbdev_flip(fbdev); -} - static int omap_LockHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) { trace("%p", surface); @@ -144,13 +178,28 @@ 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 = flip_it(this->hidden->fbdev); + surface->pixels = osdl_video_flip(pdata); + pdata->app_uses_flip = 1; return 0; } +/* we can't do hw surfaces (besides screen one) yet */ +static int omap_AllocHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) +{ + trace("%p", surface); + return -1; +} + +static void omap_FreeHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) +{ + trace("%p", surface); +} + static int omap_SetColors(SDL_VideoDevice *this, int firstcolor, int ncolors, SDL_Color *colors) { trace("%d, %d, %p", firstcolor, ncolors, colors); @@ -159,19 +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); } - - if (this->hidden->fbdev) - this->screen->pixels = flip_it(this->hidden->fbdev); } static void omap_InitOSKeymap(SDL_VideoDevice *this) @@ -179,7 +226,7 @@ static void omap_InitOSKeymap(SDL_VideoDevice *this) trace(); } -static int event_cb(void *cb_arg, int sdl_kc, int is_pressed) +static int key_event_cb(void *cb_arg, int sdl_kc, int is_pressed) { SDL_keysym keysym = { 0, }; @@ -187,11 +234,46 @@ static int 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); + + pressure = !!pressure; + if (pressure != was_pressed) { + SDL_PrivateMouseButton(pressure ? SDL_PRESSED : SDL_RELEASED, 1, 0, 0); + was_pressed = pressure; + } +} + static void omap_PumpEvents(SDL_VideoDevice *this) { + struct SDL_PrivateVideoData *pdata = this->hidden; + int dummy; + trace(); - omapsdl_input_get_events(0, 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) @@ -210,6 +292,8 @@ static SDL_VideoDevice *omap_create(int devindex) this->LockHWSurface = omap_LockHWSurface; this->UnlockHWSurface = omap_UnlockHWSurface; this->FlipHWSurface = omap_FlipHWSurface; + this->AllocHWSurface = omap_AllocHWSurface; + this->FreeHWSurface = omap_FreeHWSurface; this->SetColors = omap_SetColors; this->UpdateRects = omap_UpdateRects; this->VideoQuit = omap_VideoQuit;