Changeset - r423:c15cfc680b31
[Not reviewed]
master
0 1 0
tron - 20 years ago 2004-11-15 09:05:06
tron@openttd.org
(svn r621) Merge r450 to trunk:
Cleanups and #if 0 some unused debug code
1 file changed with 72 insertions and 71 deletions:
sdl.c
72
71
0 comments (0 inline, 0 general)
sdl.c
Show inline comments
 
@@ -92,13 +92,13 @@ static const char sdl_files[] =
 
	M("")
 
;
 
#undef M
 

	
 
static SDLProcs _proc;
 

	
 
static char *LoadSdlDLL()
 
static char *LoadSdlDLL(void)
 
{
 
	if (_proc.SDL_Init != NULL)
 
		return NULL;
 
	if (!LoadLibraryList((void**)&_proc, sdl_files))
 
		return "Unable to load sdl.dll";
 
	return NULL;
 
@@ -119,18 +119,21 @@ static void SdlAbort(int sig)
 
#endif
 

	
 

	
 
static char *SdlOpen(uint32 x)
 
{
 
#if defined(DYNAMICALLY_LOADED_SDL) && defined(WIN32)
 
	{ char *s = LoadSdlDLL(); if (s) return s; }
 
	{
 
		char *s = LoadSdlDLL();
 
		if (s != NULL) return s;
 
	}
 
#endif
 
	if (_sdl_usage++ == 0) {
 
		if (SDL_CALL SDL_Init(x) == -1)
 
			return SDL_CALL SDL_GetError();
 
	} else if (x) {
 
	} else if (x != 0) {
 
		if (SDL_CALL SDL_InitSubSystem(x) == -1)
 
			return SDL_CALL SDL_GetError();
 
	}
 

	
 
#ifdef UNIX
 
	signal(SIGABRT, SdlAbort);
 
@@ -138,13 +141,13 @@ static char *SdlOpen(uint32 x)
 

	
 
	return NULL;
 
}
 

	
 
static void SdlClose(uint32 x)
 
{
 
	if (x)
 
	if (x != 0)
 
		SDL_CALL SDL_QuitSubSystem(x);
 
	if (--_sdl_usage == 0) {
 
		SDL_CALL SDL_Quit();
 
#ifdef UNIX
 
#ifndef __MORPHOS__
 
		signal(SIGABRT, SIG_DFL);
 
@@ -167,13 +170,14 @@ static void SdlVideoMakeDirty(int left, 
 
	}
 
	_num_dirty_rects++;
 
}
 

	
 
static SDL_Color pal[256];
 

	
 
static void UpdatePalette(uint start, uint end) {
 
static void UpdatePalette(uint start, uint end)
 
{
 
	uint i;
 
	byte *b;
 

	
 
	for(i = start, b = _cur_palette + start * 3; i != end; i++, b += 3) {
 
		pal[i].r = b[0];
 
		pal[i].g = b[1];
 
@@ -181,57 +185,57 @@ static void UpdatePalette(uint start, ui
 
		pal[i].unused = b[3];
 
	}
 

	
 
	SDL_CALL SDL_SetColors(_sdl_screen, pal, start, end);
 
}
 

	
 
static void InitPalette(void) {
 
static void InitPalette(void)
 
{
 
	UpdatePalette(0, 256);
 
}
 

	
 
static void CheckPaletteAnim()
 
static void CheckPaletteAnim(void)
 
{
 
	if(_pal_last_dirty != -1) {
 
		UpdatePalette(_pal_first_dirty, _pal_last_dirty + 1);
 
		_pal_last_dirty = -1;
 
	}
 
}
 

	
 
static void DrawSurfaceToScreen()
 
static void DrawSurfaceToScreen(void)
 
{
 
	int n;
 

	
 
	if ((n=_num_dirty_rects) != 0) {
 
	int n = _num_dirty_rects;
 
	if (n != 0) {
 
		_num_dirty_rects = 0;
 
		if (n > MAX_DIRTY_RECTS)
 
			SDL_CALL SDL_UpdateRect(_sdl_screen, 0, 0, 0, 0);
 
		else {
 
		else
 
			SDL_CALL SDL_UpdateRects(_sdl_screen, n, _dirty_rects);
 
		}
 
	}
 
}
 

	
 
static int CDECL compare_res(const void *pa, const void *pb)
 
{
 
	int x = ((const uint16*)pa)[0] - ((const uint16*)pb)[0];
 
	if (x) return x;
 
	if (x != 0) return x;
 
	return ((const uint16*)pa)[1] - ((const uint16*)pb)[1];
 
}
 

	
 
static const uint16 default_resolutions[][2] = {
 
	{640,480},
 
	{800,600},
 
	{1024,768},
 
	{1152,864},
 
	{1280,960},
 
	{1280,1024},
 
	{1400,1050},
 
	{1600,1200},
 
	{1600, 1200}
 
};
 

	
 
static void GetVideoModes(void) {
 
static void GetVideoModes(void)
 
{
 
	int i;
 
	SDL_Rect **modes;
 

	
 
	modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0));
 

	
 
	if(modes == NULL)
 
@@ -289,14 +293,12 @@ static int GetAvailableVideoMode(int *w,
 
		uint newdelta = abs((_resolutions[i][0] - *w) * (_resolutions[i][1] - *h));
 
		if (newdelta < delta) {
 
			best = i;
 
			delta = newdelta;
 
		}
 
	}
 

	
 
	// use the default mode
 
	*w = _resolutions[best][0];
 
	*h = _resolutions[best][1];
 
	return 2;
 
}
 

	
 
static bool CreateMainSurface(int w, int h)
 
@@ -305,13 +307,13 @@ static bool CreateMainSurface(int w, int
 

	
 
	GetAvailableVideoMode(&w, &h);
 

	
 
	DEBUG(misc, 0) ("sdl: using mode %dx%d", w, h);
 

	
 
	// DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK
 
	newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE + SDL_HWPALETTE + (_fullscreen?SDL_FULLSCREEN:SDL_RESIZABLE));
 
	newscreen = SDL_CALL SDL_SetVideoMode(w, h, 8, SDL_SWSURFACE | SDL_HWPALETTE | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
 
	if(newscreen == NULL)
 
		return false;
 

	
 
	_screen.width = newscreen->w;
 
	_screen.height = newscreen->h;
 
	_screen.pitch = newscreen->pitch;
 
@@ -324,13 +326,13 @@ static bool CreateMainSurface(int w, int
 

	
 
	GameSizeChanged();
 

	
 
	return true;
 
}
 

	
 
typedef struct {
 
typedef struct VkMapping {
 
	uint16 vk_from;
 
	byte vk_count;
 
	byte map_to;
 
} VkMapping;
 

	
 
#define AS(x,z) {x,0,z}
 
@@ -369,60 +371,49 @@ static const VkMapping _vk_mapping[] = {
 
	AM(SDLK_KP0,SDLK_KP9, WKC_NUM_0, WKC_NUM_9),
 
	AS(SDLK_KP_DIVIDE,		WKC_NUM_DIV),
 
	AS(SDLK_KP_MULTIPLY,	WKC_NUM_MUL),
 
	AS(SDLK_KP_MINUS,			WKC_NUM_MINUS),
 
	AS(SDLK_KP_PLUS,			WKC_NUM_PLUS),
 
	AS(SDLK_KP_ENTER,			WKC_NUM_ENTER),
 
	AS(SDLK_KP_PERIOD,		WKC_NUM_DECIMAL),
 
	{0, 0, 0}
 
	AS(SDLK_KP_PERIOD,		WKC_NUM_DECIMAL)
 
};
 

	
 
static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
 
{
 
	const VkMapping	*map = _vk_mapping - 1;
 
	uint from;
 
	uint key = sym->sym;
 
	for(;;) {
 
		map++;
 
		from = map->vk_from;
 
		if (from == 0) {
 
			key = 0;
 
			break;
 
		}
 
		if ((uint)(key - from) <= map->vk_count) {
 
			key = key - from + map->map_to;
 
	const VkMapping	*map;
 
	uint key = 0;
 
	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
 
		if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
 
			key = sym->sym - map->vk_from + map->map_to;
 
			break;
 
		}
 
	}
 

	
 
	// check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards)
 
#if defined(WIN32)
 
	if (sym->scancode == 41) key |= WKC_BACKQUOTE;
 
#else
 
	#if defined(__APPLE__)
 
#elif defined(__APPLE__)
 
		if (sym->scancode == 10) key |= WKC_BACKQUOTE;
 
	#else
 
		#if defined(__MORPHOS__)
 
#elif defined(__MORPHOS__)
 
			if (sym->scancode == 0)  key |= WKC_BACKQUOTE;  // yes, that key is code '0' under MorphOS :)
 
		#else
 
			if (sym->scancode == 49) key |= WKC_BACKQUOTE;
 
		#endif
 
	#endif
 
#endif
 
	// META are the command keys on mac
 
	if (sym->mod & KMOD_META) key |= WKC_META;
 
	if (sym->mod & KMOD_SHIFT) key |= WKC_SHIFT;
 
	if (sym->mod & KMOD_CTRL) key |= WKC_CTRL;
 
	if (sym->mod & KMOD_ALT) key |= WKC_ALT;
 
	// these two lines really helps porting hotkey combos. Uncomment to use -- Bjarni
 
	// these two lines really help porting hotkey combos. Uncomment to use -- Bjarni
 
	//printf("scancode character pressed %d\n", sym->scancode);
 
	//printf("unicode character pressed %d\n", sym->unicode);
 
	return (key << 16) + sym->unicode;
 
}
 

	
 
static int PollEvent() {
 
static int PollEvent(void)
 
{
 
	SDL_Event ev;
 

	
 
	if (!SDL_CALL SDL_PollEvent(&ev))
 
		return -2;
 

	
 
	switch(ev.type) {
 
@@ -445,25 +436,31 @@ static int PollEvent() {
 
		break;
 

	
 
	case SDL_MOUSEBUTTONDOWN:
 
		if (_rightclick_emulate && (SDL_CALL SDL_GetModState() & (KMOD_LCTRL | KMOD_RCTRL)))
 
			ev.button.button = SDL_BUTTON_RIGHT;
 

	
 
		if (ev.button.button == SDL_BUTTON_LEFT) {
 
		switch (ev.button.button) {
 
			case SDL_BUTTON_LEFT:
 
			_left_button_down = true;
 
		} else if (ev.button.button == SDL_BUTTON_RIGHT) {
 
				break;
 
			case SDL_BUTTON_RIGHT:
 
			_right_button_down = true;
 
			_right_button_clicked = true;
 
		}
 
				break;
 
#if !defined(WIN32)
 
		 else if (ev.button.button == SDL_BUTTON_WHEELUP) {
 
			case SDL_BUTTON_WHEELUP:
 
			_cursor.wheel--;
 
		} else if (ev.button.button == SDL_BUTTON_WHEELDOWN) {
 
				break;
 
			case SDL_BUTTON_WHEELDOWN:
 
			_cursor.wheel++;
 
				break;
 
#endif
 
			default:
 
				break;
 
		}
 
#endif
 
		break;
 

	
 
	case SDL_MOUSEBUTTONUP:
 
		if (_rightclick_emulate) {
 
			_right_button_down = false;
 
			_left_button_down = false;
 
@@ -482,43 +479,39 @@ static int PollEvent() {
 
			AskExitGame();
 
		else
 
			return ML_QUIT;
 
		break;
 

	
 
	case SDL_KEYDOWN:
 
		if ((((ev.key.keysym.sym == SDLK_RETURN) || (ev.key.keysym.sym == SDLK_f)) && (ev.key.keysym.mod & KMOD_ALT)) || (((ev.key.keysym.sym == SDLK_RETURN) || (ev.key.keysym.sym == SDLK_f)) && (ev.key.keysym.mod & KMOD_META))) {
 
		if ((ev.key.keysym.mod & (KMOD_ALT | KMOD_META)) &&
 
				(ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_f)) {
 
			_fullscreen ^= true;
 
			GetVideoModes();
 
			CreateMainSurface(_screen.width, _screen.height);
 
			MarkWholeScreenDirty();
 
		} else {
 
			_pressed_key = ConvertSdlKeyIntoMy(&ev.key.keysym);
 
		}
 
		break;
 

	
 
	case SDL_VIDEORESIZE: {
 
			int w, h;
 
			w = ev.resize.w;
 
			h = ev.resize.h;
 

	
 
			w = clamp(w, 64, MAX_SCREEN_WIDTH);
 
			h = clamp(h, 64, MAX_SCREEN_HEIGHT);
 

	
 
		int w = clamp(ev.resize.w, 64, MAX_SCREEN_WIDTH);
 
		int h = clamp(ev.resize.h, 64, MAX_SCREEN_HEIGHT);
 
			ChangeResInGame(w, h);
 

	
 
			break;
 
		}
 
	}
 
	return -1;
 
}
 

	
 
static const char *SdlVideoStart(char **parm)
 
{
 
    char buf[30];
 

	
 
	{char *s;if ((s = SdlOpen(SDL_INIT_VIDEO)) != NULL) return s;}
 
	const char *s = SdlOpen(SDL_INIT_VIDEO);
 
	if (s != NULL) return s;
 

	
 
	SDL_CALL SDL_VideoDriverName(buf, 30);
 
	DEBUG(misc, 0) ("sdl: using driver '%s'", buf);
 

	
 
	GetVideoModes();
 
	CreateMainSurface(_cur_resolution[0], _cur_resolution[1]);
 
@@ -526,40 +519,43 @@ static const char *SdlVideoStart(char **
 

	
 
	SDL_CALL SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
	SDL_CALL SDL_EnableUNICODE(1);
 
	return NULL;
 
}
 

	
 
static void SdlVideoStop()
 
static void SdlVideoStop(void)
 
{
 
	SdlClose(SDL_INIT_VIDEO);
 
}
 

	
 
static int SdlVideoMainLoop()
 
static int SdlVideoMainLoop(void)
 
{
 
	uint32 next_tick = SDL_CALL SDL_GetTicks() + 30, cur_ticks, pal_tick = 0;
 
	uint32 next_tick = SDL_CALL SDL_GetTicks() + 30;
 
	uint32 cur_ticks;
 
	uint32 pal_tick = 0;
 
	int i;
 
	uint32 mod;
 
	int numkeys;
 
	Uint8 *keys;
 

	
 
	while (true) {
 
	for (;;) {
 
		InteractiveRandom(); // randomness
 

	
 
		while ((i=PollEvent()) == -1) {}
 
		if (i>=0) return i;
 

	
 
		if (_exit_game)	return ML_QUIT;
 

	
 
		mod = SDL_CALL SDL_GetModState();
 
		keys = SDL_CALL SDL_GetKeyState(&numkeys);
 
#if defined(_DEBUG)
 
		if (_shift_pressed) {
 
		if (_shift_pressed)
 
#else
 
		if (keys[SDLK_TAB]) {
 
		if (keys[SDLK_TAB])
 
#endif
 
		{
 
			if (!_networking) _fast_forward |= 2;
 
		} else if (_fast_forward&2) {
 
			_fast_forward = 0;
 
		}
 

	
 
		cur_ticks=SDL_CALL SDL_GetTicks();
 
@@ -572,15 +568,15 @@ static int SdlVideoMainLoop()
 
			_ctrl_pressed = !!(mod & (KMOD_LCTRL | KMOD_RCTRL));
 
			_shift_pressed = !!(mod & (KMOD_LSHIFT | KMOD_RSHIFT));
 
			_dbg_screen_rect = !!(mod & KMOD_CAPS);
 

	
 
			// determine which directional keys are down
 
			_dirkeys =
 
			    (keys[SDLK_LEFT] ? 1 : 0) +
 
			    (keys[SDLK_UP] ? 2 : 0) +
 
			    (keys[SDLK_RIGHT] ? 4 : 0) +
 
				(keys[SDLK_LEFT]  ? 1 : 0) |
 
				(keys[SDLK_UP]    ? 2 : 0) |
 
				(keys[SDLK_RIGHT] ? 4 : 0) |
 
			    (keys[SDLK_DOWN] ? 8 : 0);
 
			GameLoop();
 

	
 
			_screen.dst_ptr = _sdl_screen->pixels;
 
			UpdateWindows();
 
			if (++ pal_tick > 4){
 
@@ -614,42 +610,45 @@ const HalVideoDriver _sdl_video_driver =
 
	SdlVideoMainLoop,
 
	SdlVideoChangeRes,
 
};
 

	
 
static void CDECL fill_sound_buffer(void *userdata, Uint8 *stream, int len)
 
{
 
	MxMixSamples(_mixer, stream, len >> 2);
 
	MxMixSamples(_mixer, stream, len / 4);
 
}
 

	
 
static char *SdlSoundStart(char **parm)
 
{
 
	SDL_AudioSpec spec;
 

	
 
	{char *s;if ((s = SdlOpen(SDL_INIT_AUDIO)) != NULL) return s;}
 
	char *s = SdlOpen(SDL_INIT_AUDIO);
 
	if (s != NULL) return s;
 

	
 
	spec.freq = GetDriverParamInt(parm, "hz", 11025);
 
	spec.format = AUDIO_S16SYS;
 
	spec.channels = 2;
 
	spec.samples = 512;
 
	*(void**)&spec.callback = fill_sound_buffer;
 
	spec.callback = fill_sound_buffer;
 
	SDL_CALL SDL_OpenAudio(&spec, &spec);
 
	SDL_CALL SDL_PauseAudio(0);
 
	return NULL;
 
}
 

	
 
static void SdlSoundStop()
 
static void SdlSoundStop(void)
 
{
 
	SDL_CALL SDL_CloseAudio();
 
	SdlClose(SDL_INIT_AUDIO);
 
}
 

	
 
const HalSoundDriver _sdl_sound_driver = {
 
	SdlSoundStart,
 
	SdlSoundStop,
 
};
 

	
 

	
 
#if 0 /* XXX what the heck is that? */
 
#include "viewport.h"
 
void redsq_debug(int tile)
 
{
 
	_thd.redsq = tile;
 
	MarkWholeScreenDirty();
 
	_screen.dst_ptr = _sdl_screen->pixels;
 
@@ -661,7 +660,9 @@ void redsq_debug(int tile)
 

	
 
static void DbgRedraw()
 
{
 
	SdlVideoMakeDirty(0,0,_screen.width,_screen.height);
 
	DrawSurfaceToScreen();
 
}
 
#endif
 

	
 
#endif // WITH_SDL
0 comments (0 inline, 0 general)