valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Changes for environ detection

Browse source 
Added special part handler for direct blitting.


Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@1013
This commit is contained in:
Sjoerd van der Berg 2003-05-21 08:34:23 +00:00
parent e70b82aa64
commit e4249f1006
1 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/gui/sdlmain.cpp
View file

@ -19,6 +19,7 @@
#define _GNU_SOURCE
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <unistd.h>
@ -40,7 +41,7 @@
//#define DISABLE_JOYSTICK
#define C_GFXTHREADED 1 //Enabled by default
#if defined(MACOSX)
#if !(ENVIRON_INCLUDED)
extern char** environ;
#endif
@ -55,7 +56,7 @@ struct SDL_Block {
bool full_screen;
bool nowait;
SDL_Surface * surface;
SDL_Surface * shadow_surface;
SDL_Surface * blit_surface;
SDL_Joystick * joy;
SDL_cond *cond;
#if C_GFXTHREADED
@ -94,6 +95,12 @@ static void ResetScreen(void) {
if (sdl.surface==0) {
E_Exit("SDL:Can't get a surface error:%s.",SDL_GetError());
}
/* Create special surface for direct blitting if needed */
if (sdl.blit_surface) SDL_FreeSurface(sdl.blit_surface);
sdl.blit_surface=SDL_CreateRGBSurfaceFrom(0,0,0,sdl.surface->format->BytesPerPixel,0,
sdl.surface->format->Rmask,sdl.surface->format->Gmask,sdl.surface->format->Bmask,sdl.surface->format->Amask
);
SDL_WM_SetCaption(VERSION,VERSION);
@ -142,6 +149,19 @@ void GFX_SwitchFullScreen(void) {
SwitchFullScreen();
}
/* Special render part handler that blits directly to the output screen */
void GFX_Render_Blit(Bit8u * src,Bitu x,Bitu y,Bitu dx,Bitu dy) {
sdl.blit_surface->w=dx;
sdl.blit_surface->h=dy;
sdl.blit_surface->pitch=dx;
sdl.blit_surface->pixels=src;
SDL_UnlockSurface(sdl.surface);
SDL_Rect dest;
dest.x=x;
dest.y=y;
SDL_BlitSurface(sdl.blit_surface,0,sdl.surface,&dest);
}
static void SDL_DrawScreen(void) {
sdl.drawing=true;
if (SDL_MUSTLOCK(sdl.surface)) {
@ -257,6 +277,7 @@ static void GUI_StartUp(Section * sec) {
sdl.mouse.autoenable=section->Get_bool("autolock");
sdl.mouse.autolock=false;
sdl.mouse.sensitivity=section->Get_int("sensitivity");
sdl.blit_surface=0;
#if C_GFXTHREADED
sdl.kill_thread=false;
sdl.mutex=SDL_CreateMutex();
@ -527,7 +548,7 @@ void GFX_Events() {
HandleVideoResize(&event.resize);
break;
case SDL_QUIT:
throw(true);
throw(0);
break;
}
}
@ -543,7 +564,6 @@ void GFX_ShowMsg(char * format,...) {
};
int main(int argc, char* argv[]) {
try {
CommandLine com_line(argc,argv);
Config myconf(&com_line);
@ -574,7 +594,9 @@ int main(int argc, char* argv[]) {
}
/* Parse the config file */
control->ParseConfigFile(config_file.c_str());
#if (ENVIRON_LINKED)
control->ParseEnv(environ);
#endif
/* Init all the sections */
control->Init();
/* Some extra SDL Functions */
@ -598,7 +620,7 @@ int main(int argc, char* argv[]) {
LOG_MSG("Exit to error: %sPress enter to continue.",error);
if(!sdl.nowait) fgetc(stdin);
}
catch (...){
catch (int){
if (sdl.full_screen) SwitchFullScreen();
if (sdl.mouse.locked) CaptureMouse();
}