* See the COPYING file in the top-level directory.
*/
+#include <stdio.h>
#include <stdlib.h>
#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)
{
static int omap_VideoInit(SDL_VideoDevice *this, SDL_PixelFormat *vformat)
{
+ const char *tmp;
+ int w, h, ret;
+
trace();
// default to 16bpp
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;
}
{
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
};
static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *current, int width,
int height, int bpp, Uint32 flags)
{
- trace("%d, %d, %d, %08x", width, height, bpp, flags);
+ SDL_PixelFormat *format;
+ Uint32 unhandled_flags;
+ int ret;
- if (this->hidden->fbdev == NULL) {
- this->hidden->fbdev = vout_fbdev_init("/dev/fb0", &width, &height, 0);
- if (this->hidden->fbdev == NULL)
- return NULL;
+ trace("%d, %d, %d, %08x", width, height, bpp, flags);
- oshide_init();
+ omapsdl_config_from_env();
+
+ 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;
}
- else {
- if (vout_fbdev_resize(this->hidden->fbdev, width, height, 0, 0, 0, 0, 0) < 0)
- return NULL;
+ if (format == NULL)
+ return NULL;
+
+ if (!(flags & SDL_DOUBLEBUF) && gcfg_force_doublebuf) {
+ log("forcing SDL_DOUBLEBUF");
+ flags |= SDL_DOUBLEBUF;
}
- if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0))
+ ret = osdl_video_set_mode(this->hidden, width, height, bpp,
+ (flags & SDL_DOUBLEBUF) ? 1 : 0);
+ if (ret < 0)
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 = 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);
{
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);
{
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;
- }
+ /* hmh.. */
+ if (nrects == 1 && rects->x == 0 && rects->y == 0 &&
+ (this->screen->flags & SDL_DOUBLEBUF) &&
+ rects->w == this->screen->w && rects->h == this->screen->h)
+ {
+ this->screen->pixels = osdl_video_flip(this->hidden);
}
-
- if (this->hidden->fbdev)
- this->screen->pixels = flip_it(this->hidden->fbdev);
}
static void omap_InitOSKeymap(SDL_VideoDevice *this)
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);
+
+ // XXX: we might want to process some X events too
+ if (pdata->xenv_up)
+ xenv_update(&dummy);
}
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;