Merge changes I505c4aea,I2ae0529c

* changes:
  Import SDL release-1.2.15
  Handle SDL windows with BGRA color

1 files changed, 106 insertions, 0 deletions

diff --git a/distrib/sdl-1.2.15/src/video/xbios/SDL_xbios_milan.c b/distrib/sdl-1.2.15/src/video/xbios/SDL_xbios_milan.c
new file mode 100644
index 0000000..a99ee18
--- /dev/null
+++ b/distrib/sdl-1.2.15/src/video/xbios/SDL_xbios_milan.c
@@ -0,0 +1,106 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2012 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+/*
+	Milan Xbios video functions
+
+	Patrice Mandin
+*/
+
+#include <mint/cookie.h>
+#include <mint/falcon.h>
+
+#include "SDL_xbios.h"
+#include "SDL_xbios_milan.h"
+
+#define NUM_PREDEFINED_MODES 7
+
+typedef struct {
+	Uint16 width, height;
+} predefined_mode_t;
+
+static const predefined_mode_t mode_list[NUM_PREDEFINED_MODES]={
+	{640,400},
+	{640,480},
+	{800,608},
+	{1024,768},
+	{1152,864},
+	{1280,1024},
+	{1600,1200}	
+};
+
+static const Uint8 mode_bpp[4]={
+	8, 15, 16, 32
+};
+
+/*--- Variables ---*/
+
+static int enum_actually_add;
+static SDL_VideoDevice *enum_this;
+
+/*--- Functions ---*/
+
+static unsigned long /*cdecl*/ enumfunc(SCREENINFO *inf, unsigned long flag)
+{
+	xbiosmode_t modeinfo;
+
+	modeinfo.number = inf->devID;
+	modeinfo.width = inf->scrWidth;
+	modeinfo.height = inf->scrHeight;
+	modeinfo.depth = inf->scrPlanes;
+	modeinfo.flags = 0;
+
+	SDL_XBIOS_AddMode(enum_this, enum_actually_add, &modeinfo);
+
+	return ENUMMODE_CONT; 
+} 
+
+void SDL_XBIOS_ListMilanModes(_THIS, int actually_add)
+{
+	int i;
+
+	/* Read validated predefined modes */
+	for (i=0; i<NUM_PREDEFINED_MODES; i++) {
+		int j;
+		Uint16 deviceid = 0x1000 + (i<<4);
+
+		for (j=1; j<4; j++) {
+			if (Validmode(deviceid + j)) {
+				xbiosmode_t modeinfo;
+				
+				modeinfo.number = deviceid + j;
+				modeinfo.width = mode_list[i].width;
+				modeinfo.height = mode_list[i].height;
+				modeinfo.depth = mode_bpp[j-1];
+				modeinfo.flags = 0;
+
+				SDL_XBIOS_AddMode(this, actually_add, &modeinfo);
+			}
+		}
+	}
+
+	/* Read custom created modes */
+	enum_this = this;
+	enum_actually_add = actually_add;
+	VsetScreen(-1, &enumfunc, MI_MAGIC, CMD_ENUMMODES);
+}