graphics 1.0.0b6 → 1.0.0

data/ext/sdl/sge/Makefile

@@ -8,24 +8,49 @@ LIBS =$(SGE_LIBS)
 SGE_VER = 030809
 API_VER = 0
 
+UNAME = $(shell uname)
+ARCH = $(shell uname -m)
+ifeq ($(UNAME), Darwin)
+	LIBNAME = libSGE2.dylib
+	LIBNAMEAPI = libSGE2.$(API_VER).dylib
+	LIBNAMEVER = libSGE2.$(API_VER).$(SGE_VER).dylib
+	LIBDIR = lib
+	LIBFLAG = -install_name
+else
+	LIBNAME = libSGE2.so
+	LIBNAMEAPI = libSGE2.so.$(API_VER)
+	LIBNAMEVER = libSGE2.so.$(API_VER).$(SGE_VER)
+	LIBFLAG = -soname
+	ifeq ($(FORCE32), y)
+		LIBDIR = lib
+	else
+		ifeq ($(ARCH), x86_64)
+			LIBDIR = lib64
+		else
+			LIBDIR = lib
+		endif
+	endif
+endif
+
+
 OBJECTS=sge_surface.o sge_primitives.o sge_tt_text.o sge_bm_text.o sge_misc.o sge_textpp.o sge_blib.o sge_rotation.o sge_collision.o sge_shape.o
 
 all:	config $(OBJECTS) 
-	@ar rsc libSGE.a $(OBJECTS)
+	@ar rsc libSGE2.a $(OBJECTS)
 
 $(OBJECTS):	%.o:%.cpp %.h   #Each object depends on thier .cpp and .h file
 	$(CXX) $(CFLAGS) -c $<
 
 shared: all
-	$(CXX) $(CFLAGS) -Wl,-soname,libSGE.so.$(API_VER) -fpic -fPIC -shared -o libSGE.so $(OBJECTS) $(LIBS)
+	$(CXX) $(CFLAGS) -Wl,$(LIBFLAG),$(LIBNAMEAPI) -fpic -fPIC -shared -o $(LIBNAME) $(OBJECTS) $(LIBS)
 
 shared-strip:	shared
-	@strip libSGE.so
+	@strip $(LIBNAME)
 
 # Building a dll... I have no idea how to do this, but it should be something like below.
 dll:	config $(OBJECTS)
 	dlltool --output-def SGE.def $(OBJECTS)
-	dllwrap --driver-name $(CXX) -o SGE.dll --def SGE.def --output-lib libSGE.a --dllname SGE.dll $(OBJECTS) $(LIBS)
+	dllwrap --driver-name $(CXX) -o SGE.dll --def SGE.def --output-lib libSGE2.a --dllname SGE.dll $(OBJECTS) $(LIBS)
 
 dll-strip:	dll
 	@strip SGE.dll
@@ -73,11 +98,11 @@ endif
 install:	shared
 	@mkdir -p $(PREFIX_H)
 	install -c -m 644 sge*.h $(PREFIX_H)
-	@mkdir -p $(PREFIX)/lib
-	install -c -m 644 libSGE.a $(PREFIX)/lib
-	install -c libSGE.so $(PREFIX)/lib/libSGE.so.$(API_VER).$(SGE_VER)
-	@cd $(PREFIX)/lib;\
-	ln -sf libSGE.so.$(API_VER).$(SGE_VER) libSGE.so.$(API_VER);\
-	ln -sf libSGE.so.$(API_VER) libSGE.so
+	@mkdir -p $(PREFIX)/$(LIBDIR)
+	install -c -m 644 libSGE2.a $(PREFIX)/$(LIBDIR)
+	install -c $(LIBNAME) $(PREFIX)/$(LIBDIR)/$(LIBNAMEVER)
+	@cd $(PREFIX)/$(LIBDIR);\
+	ln -sf $(LIBNAMEVER) $(LIBNAMEAPI);\
+	ln -sf $(LIBNAMEAPI) $(LIBNAME)
 	@echo "** Headerfiles installed in $(PREFIX_H)"
-	@echo "** Library files installed in $(PREFIX)/lib"
+	@echo "** Library files installed in $(PREFIX)/$(LIBDIR)"

data/ext/sdl/sge/Makefile.conf

@@ -3,36 +3,42 @@
 # Comment/uncomment the following line to disable/enable build options
 # (See README for more info)
 C_COMP = y
-#USE_FT = n
-#USE_IMG = n
+USE_FT = n
+USE_IMG = n
 #QUIET = y
 
+# Use this to build 32-bit libs on 64-bit Linux systems
+FORCE32 = n
 
 # Compilers (C and C++)
 CC=gcc
 CXX=g++
+ifeq ($(FORCE32), y)
+	CC += -m32
+	CXX += -m32
+endif
 
 # Make sure sdl-config is available
-HAVE_SDL =$(shell if (sdl-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
+HAVE_SDL =$(shell if (sdl2-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 ifeq ($(HAVE_SDL),n)
   $(error ERROR: Can't find SDL! Make sure that you have SDL (http://www.libsdl.org/) and its development files installed)
 endif
 
 # Where should SGE be installed?
-PREFIX =$(shell sdl-config --prefix)
+PREFIX =$(shell sdl2-config --prefix)
 
 # Where should the headerfiles be installed?
-PREFIX_H =$(shell sdl-config --prefix)/include/SDL
+PREFIX_H =$(shell sdl2-config --prefix)/include/SDL2
 
 # Flags passed to the compiler
 CFLAGS =-Wall -O3 -ffast-math
-SGE_CFLAGS =$(shell sdl-config --cflags)
+SGE_CFLAGS =$(shell sdl2-config --cflags)
 # Uncomment to make some more optimizations
 #CFLAGS =-Wall -O9 -ffast-math -march=i686
 
 
 # Libs config
-SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+SGE_LIBS =$(shell sdl2-config --libs) -lstdc++
 
 
 # Is freetype-config available?
@@ -49,7 +55,7 @@ endif
 
 
 # Is SDL_image available?
-HAVE_IMG =$(shell if test -e "`sdl-config --prefix`/include/SDL/SDL_image.h" >/dev/null 2>&1; then echo "y"; else echo "n"; fi;)
+HAVE_IMG =$(shell if test -e "`sdl2-config --prefix`/include/SDL2/SDL_image.h" >/dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 
 ifneq ($(USE_IMG),y)
   ifneq ($(USE_IMG),n)
@@ -58,6 +64,6 @@ ifneq ($(USE_IMG),y)
 endif
 
 ifeq ($(USE_IMG),y)
-  SGE_LIBS +=-lSDL_image
+  SGE_LIBS +=-lSDL2_image
 endif
 

data/ext/sdl/sge/sge_bm_text.cpp

@@ -51,12 +51,13 @@ sge_bmpFont* sge_BF_CreateFont(SDL_Surface *surface, Uint8 flags)
 	font = new(nothrow) sge_bmpFont; if(font==NULL){SDL_SetError("SGE - Out of memory");return NULL;}
 	
 	if(!(flags&SGE_BFNOCONVERT) && !(flags&SGE_BFSFONT)){    /* Get a converted copy */
-		font->FontSurface = SDL_DisplayFormat(surface);
+		SDL_assert(0 && "sge_BF_CreateFont");
+		/*font->FontSurface = SDL_DisplayFormat(surface);*/
 		if(font->FontSurface==NULL){SDL_SetError("SGE - Out of memory");return NULL;}
 		
 		if(flags&SGE_BFPALETTE){  //We want an 8bit surface
 			SDL_Surface *tmp;
-			tmp = SDL_AllocSurface(SDL_SWSURFACE, surface->w, surface->h, 8, 0, 0, 0, 0);
+			tmp = SDL_CreateRGBSurface(SDL_SWSURFACE, surface->w, surface->h, 8, 0, 0, 0, 0);
 			if(tmp==NULL){SDL_SetError("SGE - Out of memory");SDL_FreeSurface(font->FontSurface);return NULL;}
 			
 			//Set the palette
@@ -64,7 +65,7 @@ sge_bmpFont* sge_BF_CreateFont(SDL_Surface *surface, Uint8 flags)
 			c[0].r=0; c[1].r=255;
 			c[0].g=0; c[1].g=255;
 			c[0].b=0; c[1].b=255;
-			SDL_SetColors(tmp, c, 0, 2);
+			SDL_SetPaletteColors(tmp->format->palette, c, 0, 2);
 			
 			if (SDL_MUSTLOCK(font->FontSurface) && _sge_lock)
 				if (SDL_LockSurface(font->FontSurface) < 0){
@@ -154,7 +155,7 @@ sge_bmpFont* sge_BF_CreateFont(SDL_Surface *surface, Uint8 flags)
 	if(flags&SGE_BFTRANSP || flags&SGE_BFSFONT)
 		#if SDL_VERSIONNUM(SDL_MAJOR_VERSION, SDL_MINOR_VERSION, SDL_PATCHLEVEL) >= \
     		SDL_VERSIONNUM(1, 1, 4)
-		SDL_SetColorKey(font->FontSurface,SDL_SRCCOLORKEY, font->bcolor);  //Some versions of SDL have a bug with SDL_RLEACCEL
+		SDL_SetColorKey(font->FontSurface,SDL_TRUE, font->bcolor);  //Some versions of SDL have a bug with SDL_RLEACCEL
 		#else
 		SDL_SetColorKey(font->FontSurface,SDL_SRCCOLORKEY|SDL_RLEACCEL, font->bcolor);
 		#endif
@@ -383,7 +384,7 @@ void sge_BF_SetColor(sge_bmpFont *font, Uint8 R, Uint8 G, Uint8 B)
 		c[0].r=0; c[1].r=R;
 		c[0].g=0; c[1].g=G;
 		c[0].b=0; c[1].b=B;
-		SDL_SetColors(font->FontSurface, c, 0, 2);
+		SDL_SetPaletteColors(font->FontSurface->format->palette, c, 0, 2);
 	}
 }
 
@@ -393,7 +394,7 @@ void sge_BF_SetColor(sge_bmpFont *font, Uint8 R, Uint8 G, Uint8 B)
 //==================================================================================
 void sge_BF_SetAlpha(sge_bmpFont *font, Uint8 alpha)
 {
-	SDL_SetAlpha(font->FontSurface,SDL_SRCALPHA|SDL_RLEACCEL, alpha);
+	SDL_SetSurfaceAlphaMod(font->FontSurface, alpha);
 }
 
 

data/ext/sdl/sge/sge_collision.cpp

@@ -40,6 +40,7 @@ sge_cdata *sge_make_cmap(SDL_Surface *img)
 	Uint8 *map;
 	Sint16 x,y;
 	Sint32 offs;
+	Uint32 key;
 	int i;
 	
 	cdata=new(nothrow) sge_cdata;
@@ -56,7 +57,8 @@ sge_cdata *sge_make_cmap(SDL_Surface *img)
 	for(y=0; y < img->h; y++){
 		for(x=0; x < img->w; x++){
 			if(i>7){i=0;map++;}
-			if(sge_GetPixel(img, Sint16(x),Sint16(y))!=img->format->colorkey){
+			SDL_GetColorKey(img, &key);
+			if(sge_GetPixel(img, Sint16(x),Sint16(y))!=key){
 				*map=*map|sge_mask[i];	
 			}
 			i++;

data/ext/sdl/sge/sge_config.h

@@ -1,6 +1,4 @@
 /* SGE Config header (generated automatically) */
 #define SGE_VER 030809
 #define _SGE_C_AND_CPP
-#define _SGE_HAVE_IMG
 #define _SGE_NOTTF
-

data/ext/sdl/sge/sge_internal.h

@@ -79,14 +79,6 @@
 #endif
 
 
-/*
-*  Older versions of SDL doesn't have SDL_CreateRGBSurface
-*/
-#ifndef SDL_AllocSurface
-	#define SDL_CreateRGBSurface  SDL_AllocSurface
-#endif
-
-
 /*
 *  Macro to get clipping
 */

data/ext/sdl/sge/sge_primitives.cpp

@@ -2514,14 +2514,3 @@ void sge_AABezier(SDL_Surface *surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16
 	sge_AABezierAlpha(surface,x1,y1,x2,y2,x3,y3,x4,y4,level, SDL_MapRGB(surface->format,R,G,B),255);
 }
 
-//==================================================================================
-// Added by zenspider:
-//==================================================================================
-
-void sge_FastFilledRect(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color) {
-  for (Sint16 y = y1; y <= y2; y++) {
-    _HLine(Surface, x1, x2, y, color);
-  }
-
-  sge_UpdateRect(Surface, x1, y1, x2, y2);
-}

data/ext/sdl/sge/sge_primitives.h

@@ -105,9 +105,6 @@ DECLSPEC void sge_Bezier(SDL_Surface *surface, Sint16 x1, Sint16 y1, Sint16 x2,
 DECLSPEC void sge_BezierAlpha(SDL_Surface *surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,Sint16 x3, Sint16 y3, Sint16 x4, Sint16 y4, int level, Uint8 R, Uint8 G, Uint8 B, Uint8 alpha);
 DECLSPEC void sge_AABezier(SDL_Surface *surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,Sint16 x3, Sint16 y3, Sint16 x4, Sint16 y4, int level, Uint8 R, Uint8 G, Uint8 B);
 DECLSPEC void sge_AABezierAlpha(SDL_Surface *surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2,Sint16 x3, Sint16 y3, Sint16 x4, Sint16 y4, int level, Uint8 R, Uint8 G, Uint8 B, Uint8 alpha);
-
-// Added by zenspider
-DECLSPEC void sge_FastFilledRect(SDL_Surface *Surface, Sint16 x1, Sint16 y1, Sint16 x2, Sint16 y2, Uint32 color);
 #endif /* sge_C_ONLY */
 
 

data/ext/sdl/sge/sge_rotation.cpp

@@ -645,7 +645,7 @@ SDL_Surface *sge_rotate_scaled_surface(SDL_Surface *src, int angle, double scale
 
 	/* Create the destination surface*/
 	int max = int( sqrt( (src->h*src->h/2 + src->w*src->w/2) *scale + 1 ) );
-	dest=SDL_AllocSurface(SDL_SWSURFACE, max, max, src->format->BitsPerPixel, src->format->Rmask, src->format->Gmask, src->format->Bmask, src->format->Amask );
+	dest=SDL_CreateRGBSurface(SDL_SWSURFACE, max, max, src->format->BitsPerPixel, src->format->Rmask, src->format->Gmask, src->format->Bmask, src->format->Amask );
 	if(!dest){SDL_SetError("SGE - Out of memory");return NULL;}
 	sge_ClearSurface(dest,bcol);	
 

data/ext/sdl/sge/sge_shape.cpp

@@ -27,6 +27,11 @@
 
 using namespace std;
 
+template <typename T>
+T absDiff(T a, T b)
+{
+    return (a > b) ? (a - b) : (b - a);
+}
 
 sge_screen *the_screen=NULL;  //The pointer to the active screen class (or NULL)
 
@@ -37,10 +42,12 @@ sge_screen::sge_screen(SDL_Surface *screen)
 {
 	sge_screen::screen=screen;  //Our screen pointer
 	
-	/* Test some flags */
+	SDL_assert(0 && "sge_screen");
+	/* Test some flags
 	HW=(((screen->flags) & SDL_HWSURFACE) != 0);	
 	DB=(((screen->flags) & SDL_DOUBLEBUF) != 0);
 	FS=(((screen->flags) & SDL_FULLSCREEN) != 0);
+	*/
 	
 	/* Test the resolution of SDL_Delay() */
 	//sge_CalibrateDelay();
@@ -144,14 +151,16 @@ void sge_screen::update(void)
 			r[j++]=*i;	
 		}
 		
-		SDL_UpdateRects(screen,rects.size(), r); //Let SDL update the rectangles
+		SDL_assert(0 && "sge_screen::update");
+		//SDL_UpdateRects(screen,rects.size(), r); //Let SDL update the rectangles
 		
 		delete[] r;
 
 		rects.clear(); //Empty the list
 	}
 	else if(DB)   //double-buffered
-		SDL_Flip(screen);
+		SDL_assert(0 && "sge_screen::update");
+		//SDL_Flip(screen);
 }
 
 
@@ -214,14 +223,14 @@ int sge_surface::get_warp(SDL_Rect rec, SDL_Rect &r1, SDL_Rect &r2, SDL_Rect &r3
 		if(rec.x<border.x){
 			r1.w = border.x - rec.x;
 			r1.x = border.x + border.w - r1.w;
-			r2.w = abs(rec.w - r1.w);           //SDL_Rect w/h is unsigned
+			r2.w = absDiff(rec.w, r1.w);           //SDL_Rect w/h is unsigned
 			r2.x = border.x;
 			rects=2; 
 		}else if(rec.x+rec.w > border.x + border.w){
 			r1.x = rec.x;
 			r1.w = border.x + border.w - rec.x;
 			r2.x = border.x;
-			r2.w = abs(rec.w - r1.w);
+			r2.w = absDiff(rec.w, r1.w);
 			rects=2;
 		}
 		
@@ -232,13 +241,13 @@ int sge_surface::get_warp(SDL_Rect rec, SDL_Rect &r1, SDL_Rect &r2, SDL_Rect &r3
 			if(rects==0){
 				r1.h = border.y - rec.y;
 				r1.y = border.y + border.h - r1.h;
-				r2.h = abs(rec.h - r1.h);
+				r2.h = absDiff(rec.h, r1.h);
 				r2.y = border.y;
 				rects=2;
 			}else{
 				r2.h = r1.h= border.y - rec.y;
 				r2.y = r1.y= border.y + border.h - r1.h;
-				r4.h = r3.h= abs(rec.h - r1.h);
+				r4.h = r3.h= absDiff(rec.h, r1.h);
 				r4.y = r3.y= border.y;
 				rects=4;
 			}
@@ -247,13 +256,13 @@ int sge_surface::get_warp(SDL_Rect rec, SDL_Rect &r1, SDL_Rect &r2, SDL_Rect &r3
 				r1.y = rec.y;
 				r1.h = border.y + border.h - rec.y;
 				r2.y = border.y;
-				r2.h = abs(rec.h - r1.h);
+				r2.h = absDiff(rec.h, r1.h);
 				rects=2;
 			}else{
 				r2.y = r1.y = rec.y;
 				r2.h = r1.h = border.y + border.h - rec.y;
 				r4.y = r3.y = border.y;
-				r4.h = r3.h = abs(rec.h - r1.h);
+				r4.h = r3.h = absDiff(rec.h, r1.h);
 				rects=4;
 			}
 		}	

data/ext/sdl/sge/sge_surface.cpp

@@ -87,6 +87,8 @@ Uint8 sge_getLock(void)
 //==================================================================================
 void sge_UpdateRect(SDL_Surface *screen, Sint16 x, Sint16 y, Uint16 w, Uint16 h)
 {
+	SDL_assert(0 && "sge_UpdateRect");
+/*
 	if(_sge_update!=1 || screen != SDL_GetVideoSurface()){return;}
 	
 	if(x>=screen->w || y>=screen->h){return;}
@@ -103,6 +105,7 @@ void sge_UpdateRect(SDL_Surface *screen, Sint16 x, Sint16 y, Uint16 w, Uint16 h)
 	if(b+y > screen->h){b=screen->h-y;}
 
 	SDL_UpdateRect(screen,x,y,a,b);
+*/
 }
 
 
@@ -592,8 +595,11 @@ void sge_ClearSurface(SDL_Surface *Surface, Uint32 color)
 
 	SDL_FillRect(Surface,NULL, color);
 
+	SDL_assert(0 && "sge_ClearSurface");
+/*
 	if(_sge_update!=1){return;}
 	SDL_UpdateRect(Surface, 0,0,0,0);
+*/
 }
 
 
@@ -659,10 +665,10 @@ int sge_BlitTransparent(SDL_Surface *Src, SDL_Surface *Dest, Sint16 SrcX, Sint16
 	#endif
 
  	/* Set the color to be transparent */
- 	SDL_SetColorKey(Src, SDL_SRCCOLORKEY, Clear);
+ 	SDL_SetColorKey(Src, SDL_TRUE, Clear);
 
  	/* Set the alpha value */
- 	SDL_SetAlpha(Src, SDL_SRCALPHA, Alpha);
+ 	SDL_SetSurfaceAlphaMod(Src, Alpha);
 
 	/* Blit */	
  	ret=SDL_BlitSurface(Src, &src, Dest, &dest);
@@ -676,8 +682,8 @@ int sge_BlitTransparent(SDL_Surface *Src, SDL_Surface *Dest, Sint16 SrcX, Sint16
 	#endif
 
 	/* Set normal levels */
-	SDL_SetAlpha(Src,0,0);
-	SDL_SetColorKey(Src,0,0);
+	SDL_SetSurfaceAlphaMod(Src,0);
+	SDL_SetColorKey(Src,SDL_TRUE,0);
 
 	return ret;
 }

data/ext/sdl/sge/sge_textpp.cpp

@@ -310,8 +310,10 @@ bool sge_TextEditor::check(SDL_Event* event)
 		return move_start();
 	else if(event->key.keysym.sym==SDLK_END)
 		return move_end();
+/*
 	else if(event->key.keysym.unicode!=0)
 		return insert(event->key.keysym.unicode);
+*/
 	
 	return false;
 }
@@ -415,10 +417,10 @@ bool sge_text::update_textSurface(bool force)
 			if(!text_surface)
 				return false;
 				
-			SDL_SetColorKey(text_surface,SDL_SRCCOLORKEY,SDL_MapRGB(text_surface->format,background.r,background.g,background.b));
+			SDL_SetColorKey(text_surface,SDL_TRUE,SDL_MapRGB(text_surface->format,background.r,background.g,background.b));
 			
 			if( alpha_level != SDL_ALPHA_OPAQUE )
-				SDL_SetAlpha(text_surface, SDL_SRCALPHA, alpha_level);
+				SDL_SetSurfaceAlphaMod(text_surface, alpha_level);
 				
 			set_textSurface(text_surface);
 		}else 
@@ -453,7 +455,7 @@ bool sge_text::update_textSurface(bool force)
 				c[1].r=bm_font->FontSurface->format->palette->colors[1].r;
 				c[1].g=bm_font->FontSurface->format->palette->colors[1].g;
 				c[1].b=bm_font->FontSurface->format->palette->colors[1].b;
-				SDL_SetColors(text_surface, c, 0, 2);
+				SDL_SetPaletteColors(text_surface->format->palette, c, 0, 2);
 				bcol = 0;
 			}else{
 				//Use the same background color as the font surface
@@ -465,10 +467,10 @@ bool sge_text::update_textSurface(bool force)
 			
 			sge_BF_textout(text_surface, bm_font, (char*)(text.c_str()), 0, 0);
 				
-			SDL_SetColorKey(text_surface,SDL_SRCCOLORKEY, bcol);
+			SDL_SetColorKey(text_surface,SDL_TRUE, bcol);
 			
 			if( alpha_level != SDL_ALPHA_OPAQUE )
-				SDL_SetAlpha(text_surface, SDL_SRCALPHA, alpha_level);
+				SDL_SetSurfaceAlphaMod(text_surface, alpha_level);
 			
 			set_textSurface(text_surface);
 		}else
@@ -519,9 +521,9 @@ SDL_Rect sge_text::render_text(SDL_Surface *surface, Sint16 x, Sint16 y)
 		if(!tmp)
 			return ret;
 			
-		SDL_SetColorKey(tmp,SDL_SRCCOLORKEY,SDL_MapRGB(tmp->format,background.r,background.g,background.b));
+		SDL_SetColorKey(tmp,SDL_TRUE,SDL_MapRGB(tmp->format,background.r,background.g,background.b));
 		if( alpha_level != SDL_ALPHA_OPAQUE )
-				SDL_SetAlpha(tmp, SDL_SRCALPHA, alpha_level);
+				SDL_SetSurfaceAlphaMod(tmp, alpha_level);
 				
 		sge_Blit(tmp, surface, 0, 0, x, y, tmp->w, tmp->h);
 		ret.x=x; ret.y=y; ret.w=tmp->w; ret.h=tmp->h;
@@ -534,7 +536,7 @@ SDL_Rect sge_text::render_text(SDL_Surface *surface, Sint16 x, Sint16 y)
 		string text=get_string(sCursor);
 		
 		if( alpha_level != SDL_ALPHA_OPAQUE  &&  !bm_font->FontSurface->format->Amask)
-			SDL_SetAlpha(bm_font->FontSurface,SDL_SRCALPHA, alpha_level);
+			SDL_SetSurfaceAlphaMod(bm_font->FontSurface, alpha_level);
 			
 		return sge_BF_textout(surface, bm_font, (char*)(text.c_str()), x, y);
 	}else{
@@ -705,17 +707,19 @@ int sge_text_input(sge_TextSurface *tc, Uint8 flags)
 	bool is_ttf = tc->get_bg(&bg);       /* No bc color indicates bitmap font */
 	
 	if( flags&SGE_FLAG1  ||  !is_ttf ){  /* Keep background? */
-		buffer = SDL_DisplayFormat(screen);
+		SDL_assert(0 && "sge_text_input");
+		//buffer = SDL_DisplayFormat(screen);
 		if(buffer==NULL){
 			SDL_SetError("SGE - Out of memory");return -3;
 		}
  	}
 	
 	/* Enable keyrepeat */
-	if(!(flags&SGE_FLAG3))
- 		SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL+50);
+	//if(!(flags&SGE_FLAG3))
+ 	//	SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL+50);
 	
-	int uflag = SDL_EnableUNICODE(1);
+	SDL_assert(0 && "sge_text_input");
+	//int uflag = SDL_EnableUNICODE(1);
  
 	Sint16 x = tc->get_xpos();
 	Sint16 y = tc->get_ypos();
@@ -773,7 +777,7 @@ int sge_text_input(sge_TextSurface *tc, Uint8 flags)
 
 	_sge_update = update;
 
-	SDL_EnableUNICODE(uflag);  //Restore unicode setting
+	//SDL_EnableUNICODE(uflag);  //Restore unicode setting
 
 	if( quit < 0 )
 		return quit;