X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fvideo%2Fomapdss%2Fsdlif.c;h=4628735241fc54be7b62d00640da1a25d3ad21fd;hb=5d957fa546b1d2df1ccebc98c1a45cae38092f5e;hp=dc97a0a533d06932d79072d130292af47d0d5fff;hpb=9a8e84f82ce2d22a033605d293eb8ba3a4936398;p=sdl_omap.git diff --git a/src/video/omapdss/sdlif.c b/src/video/omapdss/sdlif.c index dc97a0a..4628735 100644 --- a/src/video/omapdss/sdlif.c +++ b/src/video/omapdss/sdlif.c @@ -5,21 +5,15 @@ * 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" -struct SDL_PrivateVideoData { - struct vout_fbdev *fbdev; -// void *fbmem; -}; - static int omap_available(void) { trace(); @@ -34,6 +28,9 @@ 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 @@ -42,6 +39,19 @@ static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat) omapsdl_input_init(); omapsdl_config(); + 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->screen_w; + this->info.current_h = this->hidden->screen_h; + } + + this->handles_any_size = 1; + this->info.hw_available = 1; + return 0; } @@ -49,37 +59,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 }; @@ -97,17 +91,8 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren { 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; - - oshide_init(); - } - else { - if (vout_fbdev_resize(this->hidden->fbdev, width, height, 0, 0, 0, 0, 0) < 0) - return NULL; - } + if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0) + return NULL; if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0)) return NULL; @@ -117,19 +102,11 @@ static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *curren current->h = height; current->pitch = SDL_CalculatePitch(current); - current->pixels = vout_fbdev_flip(this->hidden->fbdev); + current->pixels = osdl_video_flip(this->hidden); 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); @@ -146,11 +123,23 @@ static int omap_FlipHWSurface(SDL_VideoDevice *this, SDL_Surface *surface) { trace("%p", surface); - surface->pixels = flip_it(this->hidden->fbdev); + surface->pixels = osdl_video_flip(this->hidden); 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); @@ -170,8 +159,7 @@ static void omap_UpdateRects(SDL_VideoDevice *this, int nrects, SDL_Rect *rects) } } - if (this->hidden->fbdev) - this->screen->pixels = flip_it(this->hidden->fbdev); + this->screen->pixels = osdl_video_flip(this->hidden); } static void omap_InitOSKeymap(SDL_VideoDevice *this) @@ -179,7 +167,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 +175,24 @@ static int event_cb(void *cb_arg, int sdl_kc, int is_pressed) SDL_PrivateKeyboard(is_pressed, &keysym); } +static int ts_event_cb(void *cb_arg, int x, int y, unsigned int pressure) +{ + static int was_pressed; + + 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) { trace(); - omapsdl_input_get_events(0, event_cb, NULL); + omapsdl_input_get_events(0, key_event_cb, ts_event_cb, NULL); } static SDL_VideoDevice *omap_create(int devindex) @@ -210,6 +211,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;