#include "../SDL_sysvideo.h"
#include "../SDL_pixels_c.h"
#include "../../events/SDL_events_c.h"
+
+#include "linux/xenv.h"
#include "omapsdl.h"
this->info.current_h = this->hidden->screen_h;
}
+ this->handles_any_size = 1;
this->info.hw_available = 1;
return 0;
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
};
static SDL_Surface *omap_SetVideoMode(SDL_VideoDevice *this, SDL_Surface *current, int width,
int height, int bpp, Uint32 flags)
{
+ SDL_PixelFormat *format;
+ Uint32 unhandled_flags;
+ int ret;
+
trace("%d, %d, %d, %08x", width, height, bpp, flags);
- if (osdl_video_set_mode(this->hidden, width, height, bpp) < 0)
+ 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;
+ }
+ if (format == NULL)
return NULL;
- if (!SDL_ReallocFormat(current, 16, 0xf800, 0x07e0, 0x001f, 0))
+ if (!(flags & SDL_DOUBLEBUF) && gcfg_force_doublebuf) {
+ log("forcing SDL_DOUBLEBUF");
+ flags |= SDL_DOUBLEBUF;
+ }
+
+ 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);
{
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);
}
-
- this->screen->pixels = osdl_video_flip(this->hidden);
}
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)