X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=sdl_omap.git;a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=b367c3a825c7153775d9c4f0486d49c5ba88c692;hp=71ea5c00e77b39da8c763cfb3419d1dedbffbf55;hb=090bcb85b9cebd193299c9e93f4de8c5888094f4;hpb=f9b3f440374c61339a12046b226066658e313065 diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index 71ea5c0..b367c3a 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -1,5 +1,5 @@ /* - * (C) Gražvydas "notaz" Ignotas, 2010 + * (C) Gražvydas "notaz" Ignotas, 2010-2012 * * This work is licensed under the terms of the GNU LGPL, version 2.1 or later. * See the COPYING file in the top-level directory. @@ -7,13 +7,14 @@ #include #include +#include #include "../SDL_sysvideo.h" #include "../SDL_pixels_c.h" #include "../../events/SDL_events_c.h" #include "linux/xenv.h" -#include "omapsdl.h" +#include "osdl.h" static int omap_available(void) @@ -39,7 +40,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 +48,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,20 +92,82 @@ 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; + int doublebuf; + 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, 0); + 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; + } + } + + doublebuf = (flags & SDL_DOUBLEBUF) ? 1 : 0; + fbmem = osdl_video_set_mode(pdata, + pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b, + width, height, bpp, &doublebuf, this->wm_title); + if (fbmem == NULL) { + err("failing on mode %dx%d@%d, doublebuf %s, border %d,%d,%d,%d", + width, height, bpp, (flags & SDL_DOUBLEBUF) ? "on" : "off", + pdata->border_l, pdata->border_r, pdata->border_t, pdata->border_b); return NULL; + } + if ((flags & SDL_DOUBLEBUF) && !doublebuf) { + log("doublebuffering could not be set\n"); + flags &= ~SDL_DOUBLEBUF; + } + + 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; } @@ -123,9 +186,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; } @@ -150,18 +216,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) @@ -169,39 +234,104 @@ static void omap_InitOSKeymap(SDL_VideoDevice *this) trace(); } -static int key_event_cb(void *cb_arg, int sdl_kc, int is_pressed) +static int key_event_cb(void *cb_arg, int sdl_kc, int sdl_sc, int is_pressed) { SDL_keysym keysym = { 0, }; keysym.sym = sdl_kc; + keysym.scancode = sdl_sc; 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 void translate_mouse(SDL_VideoDevice *this, int *x, int *y) +{ + struct SDL_PrivateVideoData *pdata = this->hidden; + + 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); + } +} + 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; - SDL_PrivateMouseMotion(0, 0, x, y); + translate_mouse(this, &x, &y); pressure = !!pressure; if (pressure != was_pressed) { - SDL_PrivateMouseButton(pressure ? SDL_PRESSED : SDL_RELEASED, 1, 0, 0); + SDL_PrivateMouseButton(pressure ? SDL_PRESSED : SDL_RELEASED, 1, x, y); was_pressed = pressure; } + else + SDL_PrivateMouseMotion(0, 0, x, y); +} + +static int xmouseb_event_cb(void *cb_arg, int x, int y, int button, int is_pressed) +{ + SDL_VideoDevice *this = cb_arg; + struct SDL_PrivateVideoData *pdata = this->hidden; + + translate_mouse(this, &x, &y); + SDL_PrivateMouseButton(is_pressed ? SDL_PRESSED : SDL_RELEASED, button, x, y); +} + +static int xmousem_event_cb(void *cb_arg, int x, int y) +{ + SDL_VideoDevice *this = cb_arg; + struct SDL_PrivateVideoData *pdata = this->hidden; + + translate_mouse(this, &x, &y); + SDL_PrivateMouseMotion(0, 0, x, y); +} + +static int xkey_cb(void *cb_arg, int kc, int is_pressed) +{ + SDL_VideoDevice *this = cb_arg; + struct SDL_PrivateVideoData *pdata = this->hidden; + int ret; + + if (kc == XF86XK_MenuKB && is_pressed) { + ret = osdl_video_pause(pdata, 1); + if (ret == 0) { + xenv_minimize(); + osdl_video_pause(pdata, 0); + omapsdl_input_get_events(0, NULL, NULL, NULL); + } + } } static void omap_PumpEvents(SDL_VideoDevice *this) { struct SDL_PrivateVideoData *pdata = this->hidden; - int dummy; + int read_tslib = 1; trace(); - omapsdl_input_get_events(0, key_event_cb, ts_event_cb, NULL); + if (pdata->xenv_up) { + if (!pdata->cfg_ts_force_tslib) { + xenv_update(xkey_cb, xmouseb_event_cb, xmousem_event_cb, this); + if (pdata->xenv_mouse) + read_tslib = 0; + } + else { + /* just flush X event queue */ + xenv_update(NULL, NULL, NULL, NULL); + } + } - // XXX: we might want to process some X events too - if (pdata->xenv_up) - xenv_update(&dummy); + omapsdl_input_get_events(0, key_event_cb, + read_tslib ? ts_event_cb : NULL, this); } static SDL_VideoDevice *omap_create(int devindex)