src/video/sdl_v.cpp
author smatz
Sun, 06 Apr 2008 23:49:45 +0000
changeset 8847 426dd2d582e7
parent 8586 cb0e7e00f1d2
child 8985 6461e5c6d6e4
permissions -rw-r--r--
(svn r12599) -Codechange: force AllocateSafeRaw() to be linked to simplify compiler's decisions about inlining
2186
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2174
diff changeset
     1
/* $Id$ */
db48cf29b983 (svn r2701) Insert Id tags into all source files
tron
parents: 2174
diff changeset
     2
2189
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     3
#include "../stdafx.h"
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     4
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     5
#ifdef WITH_SDL
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     6
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     7
#include "../openttd.h"
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
     8
#include "../debug.h"
8123
ce31d2843a95 (svn r11684) -Codechange: split gfx.h in a type and functional header.
rubidium
parents: 8121
diff changeset
     9
#include "../gfx_func.h"
2189
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
    10
#include "../sdl.h"
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
    11
#include "../variables.h"
6937
40c760fcf1f6 (svn r10190) -Codechange: merged renderer and blitter to one single class API: blitter
truelight
parents: 6878
diff changeset
    12
#include "../blitter/factory.hpp"
8121
3bc6351e7369 (svn r11682) -Codechange: move some 'generic' geometry related types into a single file and do not include gfx.h everywhere to get a Point type.
rubidium
parents: 8113
diff changeset
    13
#include "../network/network.h"
8247
16e1c8db6f55 (svn r11811) -Fix: make compilation without networking work again (and thus move the debugdumpcommand stuff out of the network 'area').
rubidium
parents: 8171
diff changeset
    14
#include "../core/math_func.hpp"
8433
33899f3d6b5c (svn r12003) -Codechange: don't declare InteractiveRandom[Range] in multiple places.
rubidium
parents: 8247
diff changeset
    15
#include "../core/random_func.hpp"
2189
5cdc11ffeaa4 (svn r2704) Remove . from include path again, too much trouble. Also add some #ifdefs and #includes for the Windows build
tron
parents: 2186
diff changeset
    16
#include "sdl_v.h"
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    17
#include <SDL.h>
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    18
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
    19
static FVideoDriver_SDL iFVideoDriver_SDL;
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
    20
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    21
static SDL_Surface *_sdl_screen;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    22
static bool _all_modes;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    23
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    24
#define MAX_DIRTY_RECTS 100
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    25
static SDL_Rect _dirty_rects[MAX_DIRTY_RECTS];
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    26
static int _num_dirty_rects;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    27
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
    28
void VideoDriver_SDL::MakeDirty(int left, int top, int width, int height)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    29
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    30
	if (_num_dirty_rects < MAX_DIRTY_RECTS) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    31
		_dirty_rects[_num_dirty_rects].x = left;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    32
		_dirty_rects[_num_dirty_rects].y = top;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    33
		_dirty_rects[_num_dirty_rects].w = width;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    34
		_dirty_rects[_num_dirty_rects].h = height;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    35
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    36
	_num_dirty_rects++;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    37
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    38
2226
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    39
static void UpdatePalette(uint start, uint count)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    40
{
2226
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    41
	SDL_Color pal[256];
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    42
	uint i;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    43
2226
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    44
	for (i = 0; i != count; i++) {
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    45
		pal[i].r = _cur_palette[start + i].r;
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    46
		pal[i].g = _cur_palette[start + i].g;
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    47
		pal[i].b = _cur_palette[start + i].b;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    48
		pal[i].unused = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    49
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    50
2226
66e24b126ce0 (svn r2746) -Fix: SDL_SetColors() has the number of palette entries to change as parameter, not one beyond the last entry to change
tron
parents: 2210
diff changeset
    51
	SDL_CALL SDL_SetColors(_sdl_screen, pal, start, count);
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    52
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    53
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6231
diff changeset
    54
static void InitPalette()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    55
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    56
	UpdatePalette(0, 256);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    57
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    58
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6231
diff changeset
    59
static void CheckPaletteAnim()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    60
{
6961
8e5217fd71f4 (svn r10217) -Fix r10216: forgot to declare 'blitter' in win32 and cocoa driver (tnx glx)
truelight
parents: 6960
diff changeset
    61
	if (_pal_count_dirty != 0) {
8e5217fd71f4 (svn r10217) -Fix r10216: forgot to declare 'blitter' in win32 and cocoa driver (tnx glx)
truelight
parents: 6960
diff changeset
    62
		Blitter *blitter = BlitterFactoryBase::GetCurrentBlitter();
6960
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    63
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    64
		switch (blitter->UsePaletteAnimation()) {
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    65
			case Blitter::PALETTE_ANIMATION_VIDEO_BACKEND:
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    66
				UpdatePalette(_pal_first_dirty, _pal_count_dirty);
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    67
				break;
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    68
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    69
			case Blitter::PALETTE_ANIMATION_BLITTER:
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    70
				blitter->PaletteAnimate(_pal_first_dirty, _pal_count_dirty);
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    71
				break;
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    72
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    73
			case Blitter::PALETTE_ANIMATION_NONE:
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    74
				break;
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    75
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    76
			default:
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    77
				NOT_REACHED();
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    78
		}
356d856462b6 (svn r10216) -Fix: palette animation always redid all palette entries, where in fact only a few indexes were needed
truelight
parents: 6937
diff changeset
    79
		_pal_count_dirty = 0;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    80
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    81
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    82
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6231
diff changeset
    83
static void DrawSurfaceToScreen()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    84
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    85
	int n = _num_dirty_rects;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    86
	if (n != 0) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    87
		_num_dirty_rects = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    88
		if (n > MAX_DIRTY_RECTS)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    89
			SDL_CALL SDL_UpdateRect(_sdl_screen, 0, 0, 0, 0);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    90
		else
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    91
			SDL_CALL SDL_UpdateRects(_sdl_screen, n, _dirty_rects);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    92
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    93
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    94
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    95
static const uint16 default_resolutions[][2] = {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    96
	{ 640,  480},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    97
	{ 800,  600},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    98
	{1024,  768},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
    99
	{1152,  864},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   100
	{1280,  800},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   101
	{1280,  960},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   102
	{1280, 1024},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   103
	{1400, 1050},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   104
	{1600, 1200},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   105
	{1680, 1050},
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   106
	{1920, 1200}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   107
};
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   108
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6231
diff changeset
   109
static void GetVideoModes()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   110
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   111
	int i;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   112
	SDL_Rect **modes;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   113
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   114
	modes = SDL_CALL SDL_ListModes(NULL, SDL_SWSURFACE + (_fullscreen ? SDL_FULLSCREEN : 0));
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   115
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   116
	if (modes == NULL)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   117
		error("sdl: no modes available");
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   118
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   119
	_all_modes = (modes == (void*)-1);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   120
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   121
	if (_all_modes) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   122
		// all modes available, put some default ones here
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   123
		memcpy(_resolutions, default_resolutions, sizeof(default_resolutions));
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   124
		_num_resolutions = lengthof(default_resolutions);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   125
	} else {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   126
		int n = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   127
		for (i = 0; modes[i]; i++) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   128
			int w = modes[i]->w;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   129
			int h = modes[i]->h;
7954
57b51c69c072 (svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents: 7922
diff changeset
   130
			if (IsInsideMM(w, 640, MAX_SCREEN_WIDTH + 1) &&
57b51c69c072 (svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
skidd13
parents: 7922
diff changeset
   131
					IsInsideMM(h, 480, MAX_SCREEN_HEIGHT + 1)) {
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   132
				int j;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   133
				for (j = 0; j < n; j++) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   134
					if (_resolutions[j][0] == w && _resolutions[j][1] == h) break;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   135
				}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   136
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   137
				if (j == n) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   138
					_resolutions[j][0] = w;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   139
					_resolutions[j][1] = h;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   140
					if (++n == lengthof(_resolutions)) break;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   141
				}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   142
			}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   143
		}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   144
		_num_resolutions = n;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   145
		SortResolutions(_num_resolutions);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   146
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   147
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   148
4501
f544a0172d5c (svn r6286) Nobody cares for the return value of GetAvailableVideoMode(), therefore remove it
tron
parents: 4434
diff changeset
   149
static void GetAvailableVideoMode(int *w, int *h)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   150
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   151
	int i;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   152
	int best;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   153
	uint delta;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   154
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   155
	// all modes available?
4501
f544a0172d5c (svn r6286) Nobody cares for the return value of GetAvailableVideoMode(), therefore remove it
tron
parents: 4434
diff changeset
   156
	if (_all_modes) return;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   157
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   158
	// is the wanted mode among the available modes?
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   159
	for (i = 0; i != _num_resolutions; i++) {
4501
f544a0172d5c (svn r6286) Nobody cares for the return value of GetAvailableVideoMode(), therefore remove it
tron
parents: 4434
diff changeset
   160
		if (*w == _resolutions[i][0] && *h == _resolutions[i][1]) return;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   161
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   162
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   163
	// use the closest possible resolution
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   164
	best = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   165
	delta = abs((_resolutions[0][0] - *w) * (_resolutions[0][1] - *h));
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   166
	for (i = 1; i != _num_resolutions; ++i) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   167
		uint newdelta = abs((_resolutions[i][0] - *w) * (_resolutions[i][1] - *h));
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   168
		if (newdelta < delta) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   169
			best = i;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   170
			delta = newdelta;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   171
		}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   172
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   173
	*w = _resolutions[best][0];
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   174
	*h = _resolutions[best][1];
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   175
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   176
4256
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   177
#ifndef ICON_DIR
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   178
#define ICON_DIR "media"
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   179
#endif
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   180
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   181
#ifdef WIN32
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   182
/* Let's redefine the LoadBMP macro with because we are dynamically
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   183
 * loading SDL and need to 'SDL_CALL' all functions */
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   184
#undef SDL_LoadBMP
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   185
#define SDL_LoadBMP(file)	SDL_LoadBMP_RW(SDL_CALL SDL_RWFromFile(file, "rb"), 1)
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   186
#endif
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   187
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   188
static bool CreateMainSurface(int w, int h)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   189
{
4840
a76d40e0aea4 (svn r6766) -Codechange: Move _openttd_revision[] into the functions that use it instead of global
Darkvater
parents: 4548
diff changeset
   190
	extern const char _openttd_revision[];
4256
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   191
	SDL_Surface *newscreen, *icon;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   192
	char caption[50];
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   193
	int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth();
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   194
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   195
	GetAvailableVideoMode(&w, &h);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   196
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   197
	DEBUG(driver, 1, "SDL: using mode %dx%dx%d", w, h, bpp);
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   198
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   199
	if (bpp == 0) error("Can't use a blitter that blits 0 bpp for normal visuals");
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   200
4256
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   201
	/* Give the application an icon */
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   202
	icon = SDL_CALL SDL_LoadBMP(ICON_DIR PATHSEP "openttd.32.bmp");
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   203
	if (icon != NULL) {
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   204
		/* Get the colourkey, which will be magenta */
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   205
		uint32 rgbmap = SDL_CALL SDL_MapRGB(icon->format, 255, 0, 255);
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   206
4256
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   207
		SDL_CALL SDL_SetColorKey(icon, SDL_SRCCOLORKEY, rgbmap);
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   208
		SDL_CALL SDL_WM_SetIcon(icon, NULL);
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   209
		SDL_CALL SDL_FreeSurface(icon);
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   210
	}
5e29191a88a1 (svn r5872) - Feature: Add an icon to the SDL openttd executable.
Darkvater
parents: 4077
diff changeset
   211
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   212
	// DO NOT CHANGE TO HWSURFACE, IT DOES NOT WORK
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   213
	newscreen = SDL_CALL SDL_SetVideoMode(w, h, bpp, SDL_SWSURFACE | SDL_HWPALETTE | (_fullscreen ? SDL_FULLSCREEN : SDL_RESIZABLE));
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   214
	if (newscreen == NULL)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   215
		return false;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   216
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   217
	_screen.width = newscreen->w;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   218
	_screen.height = newscreen->h;
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   219
	_screen.pitch = newscreen->pitch / (bpp / 8);
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   220
	_sdl_screen = newscreen;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   221
	InitPalette();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   222
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   223
	snprintf(caption, sizeof(caption), "OpenTTD %s", _openttd_revision);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   224
	SDL_CALL SDL_WM_SetCaption(caption, caption);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   225
	SDL_CALL SDL_ShowCursor(0);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   226
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   227
	GameSizeChanged();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   228
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   229
	return true;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   230
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   231
6248
e4a2ed7e5613 (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents: 6247
diff changeset
   232
struct VkMapping {
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   233
	uint16 vk_from;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   234
	byte vk_count;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   235
	byte map_to;
6248
e4a2ed7e5613 (svn r9051) -Codechange: typedef [enum|struct] Y {} X; -> [enum|struct] X {};
rubidium
parents: 6247
diff changeset
   236
};
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   237
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   238
#define AS(x, z) {x, 0, z}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   239
#define AM(x, y, z, w) {x, y - x, z}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   240
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   241
static const VkMapping _vk_mapping[] = {
7311
fde7a4d92a39 (svn r10663) -Fix r10662: bad me, didn't comply with coding style, as penalty I updated the surrounding code to comply with coding style too; I will never do it again (I hope :p)
truelight
parents: 7310
diff changeset
   242
	/* Pageup stuff + up/down */
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   243
	AM(SDLK_PAGEUP, SDLK_PAGEDOWN, WKC_PAGEUP, WKC_PAGEDOWN),
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   244
	AS(SDLK_UP,     WKC_UP),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   245
	AS(SDLK_DOWN,   WKC_DOWN),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   246
	AS(SDLK_LEFT,   WKC_LEFT),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   247
	AS(SDLK_RIGHT,  WKC_RIGHT),
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   248
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   249
	AS(SDLK_HOME,   WKC_HOME),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   250
	AS(SDLK_END,    WKC_END),
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   251
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   252
	AS(SDLK_INSERT, WKC_INSERT),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   253
	AS(SDLK_DELETE, WKC_DELETE),
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   254
7311
fde7a4d92a39 (svn r10663) -Fix r10662: bad me, didn't comply with coding style, as penalty I updated the surrounding code to comply with coding style too; I will never do it again (I hope :p)
truelight
parents: 7310
diff changeset
   255
	/* Map letters & digits */
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   256
	AM(SDLK_a, SDLK_z, 'A', 'Z'),
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   257
	AM(SDLK_0, SDLK_9, '0', '9'),
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   258
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   259
	AS(SDLK_ESCAPE,    WKC_ESC),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   260
	AS(SDLK_PAUSE,     WKC_PAUSE),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   261
	AS(SDLK_BACKSPACE, WKC_BACKSPACE),
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   262
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   263
	AS(SDLK_SPACE,     WKC_SPACE),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   264
	AS(SDLK_RETURN,    WKC_RETURN),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   265
	AS(SDLK_TAB,       WKC_TAB),
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   266
7311
fde7a4d92a39 (svn r10663) -Fix r10662: bad me, didn't comply with coding style, as penalty I updated the surrounding code to comply with coding style too; I will never do it again (I hope :p)
truelight
parents: 7310
diff changeset
   267
	/* Function keys */
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   268
	AM(SDLK_F1, SDLK_F12, WKC_F1, WKC_F12),
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   269
7311
fde7a4d92a39 (svn r10663) -Fix r10662: bad me, didn't comply with coding style, as penalty I updated the surrounding code to comply with coding style too; I will never do it again (I hope :p)
truelight
parents: 7310
diff changeset
   270
	/* Numeric part. */
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   271
	AM(SDLK_KP0, SDLK_KP9, WKC_NUM_0, WKC_NUM_9),
4434
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   272
	AS(SDLK_KP_DIVIDE,   WKC_NUM_DIV),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   273
	AS(SDLK_KP_MULTIPLY, WKC_NUM_MUL),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   274
	AS(SDLK_KP_MINUS,    WKC_NUM_MINUS),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   275
	AS(SDLK_KP_PLUS,     WKC_NUM_PLUS),
a08cb4b5c179 (svn r6204) -Cleanup: replace non-indentation with spaces; like '}<TAB>else {' -> '} else {', tabs between code and comment, etc.
rubidium
parents: 4300
diff changeset
   276
	AS(SDLK_KP_ENTER,    WKC_NUM_ENTER),
7310
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   277
	AS(SDLK_KP_PERIOD,   WKC_NUM_DECIMAL),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   278
7311
fde7a4d92a39 (svn r10663) -Fix r10662: bad me, didn't comply with coding style, as penalty I updated the surrounding code to comply with coding style too; I will never do it again (I hope :p)
truelight
parents: 7310
diff changeset
   279
	/* Other non-letter keys */
7310
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   280
	AS(SDLK_SLASH,        WKC_SLASH),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   281
	AS(SDLK_SEMICOLON,    WKC_SEMICOLON),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   282
	AS(SDLK_EQUALS,       WKC_EQUALS),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   283
	AS(SDLK_LEFTBRACKET,  WKC_L_BRACKET),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   284
	AS(SDLK_BACKSLASH,    WKC_BACKSLASH),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   285
	AS(SDLK_RIGHTBRACKET, WKC_R_BRACKET),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   286
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   287
	AS(SDLK_QUOTE,   WKC_SINGLEQUOTE),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   288
	AS(SDLK_COMMA,   WKC_COMMA),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   289
	AS(SDLK_MINUS,   WKC_MINUS),
eed5036fee1f (svn r10662) -Add: added 'V' as new shortcut for new viewport (bilbo)
truelight
parents: 7170
diff changeset
   290
	AS(SDLK_PERIOD,  WKC_PERIOD)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   291
};
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   292
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   293
static uint32 ConvertSdlKeyIntoMy(SDL_keysym *sym)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   294
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   295
	const VkMapping *map;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   296
	uint key = 0;
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   297
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   298
	for (map = _vk_mapping; map != endof(_vk_mapping); ++map) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   299
		if ((uint)(sym->sym - map->vk_from) <= map->vk_count) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   300
			key = sym->sym - map->vk_from + map->map_to;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   301
			break;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   302
		}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   303
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   304
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   305
	// check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   306
#if defined(WIN32) || defined(__OS2__)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   307
	if (sym->scancode == 41) key = WKC_BACKQUOTE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   308
#elif defined(__APPLE__)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   309
	if (sym->scancode == 10) key = WKC_BACKQUOTE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   310
#elif defined(__MORPHOS__)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   311
	if (sym->scancode == 0)  key = WKC_BACKQUOTE;  // yes, that key is code '0' under MorphOS :)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   312
#elif defined(__BEOS__)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   313
	if (sym->scancode == 17) key = WKC_BACKQUOTE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   314
#elif defined(__SVR4) && defined(__sun)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   315
	if (sym->scancode == 60) key = WKC_BACKQUOTE;
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   316
	if (sym->scancode == 49) key = WKC_BACKSPACE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   317
#elif defined(__sgi__)
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   318
	if (sym->scancode == 22) key = WKC_BACKQUOTE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   319
#else
5099
d62e259c4afe (svn r7170) -Fix: [sdl] Non-working console toggle for some keyboard layouts. Do not OR the backquote
Darkvater
parents: 5090
diff changeset
   320
	if (sym->scancode == 49) key = WKC_BACKQUOTE;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   321
#endif
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   322
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   323
	// META are the command keys on mac
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   324
	if (sym->mod & KMOD_META)  key |= WKC_META;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   325
	if (sym->mod & KMOD_SHIFT) key |= WKC_SHIFT;
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   326
	if (sym->mod & KMOD_CTRL)  key |= WKC_CTRL;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   327
	if (sym->mod & KMOD_ALT)   key |= WKC_ALT;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   328
	// these two lines really help porting hotkey combos. Uncomment to use -- Bjarni
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   329
#if 0
5380
8ea58542b6e0 (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents: 5217
diff changeset
   330
	DEBUG(driver, 0, "Scancode character pressed %u", sym->scancode);
8ea58542b6e0 (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents: 5217
diff changeset
   331
	DEBUG(driver, 0, "Unicode character pressed %u", sym->unicode);
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   332
#endif
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   333
	return (key << 16) + sym->unicode;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   334
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   335
6247
7d81e3a5d803 (svn r9050) -Codechange: Foo(void) -> Foo()
rubidium
parents: 6231
diff changeset
   336
static int PollEvent()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   337
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   338
	SDL_Event ev;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   339
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   340
	if (!SDL_CALL SDL_PollEvent(&ev)) return -2;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   341
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   342
	switch (ev.type) {
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   343
		case SDL_MOUSEMOTION:
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   344
			if (_cursor.fix_at) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   345
				int dx = ev.motion.x - _cursor.pos.x;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   346
				int dy = ev.motion.y - _cursor.pos.y;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   347
				if (dx != 0 || dy != 0) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   348
					_cursor.delta.x += dx;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   349
					_cursor.delta.y += dy;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   350
					SDL_CALL SDL_WarpMouse(_cursor.pos.x, _cursor.pos.y);
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   351
				}
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   352
			} else {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   353
				_cursor.delta.x = ev.motion.x - _cursor.pos.x;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   354
				_cursor.delta.y = ev.motion.y - _cursor.pos.y;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   355
				_cursor.pos.x = ev.motion.x;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   356
				_cursor.pos.y = ev.motion.y;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   357
				_cursor.dirty = true;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   358
			}
5090
67446a4104f7 (svn r7157) -Fix [FS#221, SF1168820]: Some mouse events possibly lost under high CPU load, handle
Darkvater
parents: 5089
diff changeset
   359
			HandleMouseEvents();
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   360
			break;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   361
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   362
		case SDL_MOUSEBUTTONDOWN:
4508
0e626ba2a59a (svn r6293) -Codechange: Simply use KMOD_CTRL instead of KMOD_LCTRL | KMOD_RCTRL, same for KMOD_SHIFT
tron
parents: 4507
diff changeset
   363
			if (_rightclick_emulate && SDL_CALL SDL_GetModState() & KMOD_CTRL) {
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   364
				ev.button.button = SDL_BUTTON_RIGHT;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   365
			}
3312
d28f88dc5587 (svn r4075) - Feature: Undraw the mouse when it leaves the window and Draw it again when it enters. Added both for WIN32 and SDL. Since Win95 has troubles with TrackMouseEvent(), this function was just simply rewritten which was the easiest. Based on a patch by DmitryKo.
Darkvater
parents: 2952
diff changeset
   366
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   367
			switch (ev.button.button) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   368
				case SDL_BUTTON_LEFT:
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   369
					_left_button_down = true;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   370
					break;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   371
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   372
				case SDL_BUTTON_RIGHT:
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   373
					_right_button_down = true;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   374
					_right_button_clicked = true;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   375
					break;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   376
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   377
				case SDL_BUTTON_WHEELUP:   _cursor.wheel--; break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   378
				case SDL_BUTTON_WHEELDOWN: _cursor.wheel++; break;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   379
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   380
				default: break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   381
			}
5090
67446a4104f7 (svn r7157) -Fix [FS#221, SF1168820]: Some mouse events possibly lost under high CPU load, handle
Darkvater
parents: 5089
diff changeset
   382
			HandleMouseEvents();
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   383
			break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   384
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   385
		case SDL_MOUSEBUTTONUP:
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   386
			if (_rightclick_emulate) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   387
				_right_button_down = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   388
				_left_button_down = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   389
				_left_button_clicked = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   390
			} else if (ev.button.button == SDL_BUTTON_LEFT) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   391
				_left_button_down = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   392
				_left_button_clicked = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   393
			} else if (ev.button.button == SDL_BUTTON_RIGHT) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   394
				_right_button_down = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   395
			}
5090
67446a4104f7 (svn r7157) -Fix [FS#221, SF1168820]: Some mouse events possibly lost under high CPU load, handle
Darkvater
parents: 5089
diff changeset
   396
			HandleMouseEvents();
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   397
			break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   398
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   399
		case SDL_ACTIVEEVENT:
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   400
			if (!(ev.active.state & SDL_APPMOUSEFOCUS)) break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   401
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   402
			if (ev.active.gain) { // mouse entered the window, enable cursor
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   403
				_cursor.in_window = true;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   404
			} else {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   405
				UndrawMouseCursor(); // mouse left the window, undraw cursor
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   406
				_cursor.in_window = false;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   407
			}
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   408
			break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   409
4548
6165e12570bf (svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents: 4536
diff changeset
   410
		case SDL_QUIT: HandleExitGameRequest(); break;
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   411
4548
6165e12570bf (svn r6380) -Codechange: unify all ways to quit OTTD.
rubidium
parents: 4536
diff changeset
   412
		case SDL_KEYDOWN: /* Toggle full-screen on ALT + ENTER/F */
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   413
			if ((ev.key.keysym.mod & (KMOD_ALT | KMOD_META)) &&
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   414
					(ev.key.keysym.sym == SDLK_RETURN || ev.key.keysym.sym == SDLK_f)) {
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   415
				ToggleFullScreen(!_fullscreen);
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   416
			} else {
5086
386ba9fe0621 (svn r7153) -Fix [FS#279]: Some keyboard events possibly lost under high CPU load, handle
Darkvater
parents: 5015
diff changeset
   417
				HandleKeypress(ConvertSdlKeyIntoMy(&ev.key.keysym));
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   418
			}
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   419
			break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   420
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   421
		case SDL_VIDEORESIZE: {
7922
a7e266f966d9 (svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents: 7454
diff changeset
   422
			int w = Clamp(ev.resize.w, 64, MAX_SCREEN_WIDTH);
a7e266f966d9 (svn r11475) -Codechange: rename clamp and clampu to Clamp and ClampU to fit with the coding style
skidd13
parents: 7454
diff changeset
   423
			int h = Clamp(ev.resize.h, 64, MAX_SCREEN_HEIGHT);
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   424
			ChangeResInGame(w, h);
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   425
			break;
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   426
		}
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   427
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   428
	return -1;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   429
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   430
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   431
const char *VideoDriver_SDL::Start(const char * const *parm)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   432
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   433
	char buf[30];
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   434
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   435
	const char *s = SdlOpen(SDL_INIT_VIDEO);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   436
	if (s != NULL) return s;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   437
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   438
	SDL_CALL SDL_VideoDriverName(buf, 30);
5380
8ea58542b6e0 (svn r7565) -Codechange: Rework DEBUG functionality. Look for appropiate debugging levels to
Darkvater
parents: 5217
diff changeset
   439
	DEBUG(driver, 1, "SDL: using driver '%s'", buf);
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   440
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   441
	GetVideoModes();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   442
	CreateMainSurface(_cur_resolution[0], _cur_resolution[1]);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   443
	MarkWholeScreenDirty();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   444
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   445
	SDL_CALL SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   446
	SDL_CALL SDL_EnableUNICODE(1);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   447
	return NULL;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   448
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   449
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   450
void VideoDriver_SDL::Stop()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   451
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   452
	SdlClose(SDL_INIT_VIDEO);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   453
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   454
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   455
void VideoDriver_SDL::MainLoop()
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   456
{
5581
cf2b8ba6556b (svn r8028) -Fix: overflow of ticks was not handled properly, possibly resulting a non-reacting gameserver/gameclient.
rubidium
parents: 5475
diff changeset
   457
	uint32 cur_ticks = SDL_CALL SDL_GetTicks();
7018
71e174292e42 (svn r10276) -Codechange: made a counter based on milliseconds and independent of the game-state to base double-click and TGP Generation Process on
truelight
parents: 6999
diff changeset
   458
	uint32 last_cur_ticks = cur_ticks;
5581
cf2b8ba6556b (svn r8028) -Fix: overflow of ticks was not handled properly, possibly resulting a non-reacting gameserver/gameclient.
rubidium
parents: 5475
diff changeset
   459
	uint32 next_tick = cur_ticks + 30;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   460
	uint32 pal_tick = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   461
	uint32 mod;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   462
	int numkeys;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   463
	Uint8 *keys;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   464
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   465
	for (;;) {
5581
cf2b8ba6556b (svn r8028) -Fix: overflow of ticks was not handled properly, possibly resulting a non-reacting gameserver/gameclient.
rubidium
parents: 5475
diff changeset
   466
		uint32 prev_cur_ticks = cur_ticks; // to check for wrapping
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   467
		InteractiveRandom(); // randomness
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   468
5089
67c761427921 (svn r7156) -Codechange: Remove obsolete variable, localize global variable, use GB and change logic
Darkvater
parents: 5086
diff changeset
   469
		while (PollEvent() == -1) {}
2228
93cdde0f85ba (svn r2748) Remove unused cruft from the main loop
tron
parents: 2226
diff changeset
   470
		if (_exit_game) return;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   471
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   472
		mod = SDL_CALL SDL_GetModState();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   473
		keys = SDL_CALL SDL_GetKeyState(&numkeys);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   474
#if defined(_DEBUG)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   475
		if (_shift_pressed)
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   476
#else
5461
f056fa8bf44c (svn r7727) -Fix (FS#498): sometimes ALT-TAB could trigger the fast forward.
rubidium
parents: 5380
diff changeset
   477
		/* Speedup when pressing tab, except when using ALT+TAB
f056fa8bf44c (svn r7727) -Fix (FS#498): sometimes ALT-TAB could trigger the fast forward.
rubidium
parents: 5380
diff changeset
   478
		 * to switch to another application */
f056fa8bf44c (svn r7727) -Fix (FS#498): sometimes ALT-TAB could trigger the fast forward.
rubidium
parents: 5380
diff changeset
   479
		if (keys[SDLK_TAB] && (mod & KMOD_ALT) == 0)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   480
#endif
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   481
		{
4536
d532b2611952 (svn r6365) -Cleanup: remove IsGeneratingWorld calls that are either not called or have no effect.
rubidium
parents: 4508
diff changeset
   482
			if (!_networking && _game_mode != GM_MENU) _fast_forward |= 2;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   483
		} else if (_fast_forward & 2) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   484
			_fast_forward = 0;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   485
		}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   486
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   487
		cur_ticks = SDL_CALL SDL_GetTicks();
6231
ff7454d35935 (svn r9034) -Codechange: renamed _pause to _pause_game, as some targets already have
truelight
parents: 5988
diff changeset
   488
		if (cur_ticks >= next_tick || (_fast_forward && !_pause_game) || cur_ticks < prev_cur_ticks) {
7019
09e090048a59 (svn r10278) -Fix r10276: make the _realtime_tick less demanding on the CPU
truelight
parents: 7018
diff changeset
   489
			_realtime_tick += cur_ticks - last_cur_ticks;
09e090048a59 (svn r10278) -Fix r10276: make the _realtime_tick less demanding on the CPU
truelight
parents: 7018
diff changeset
   490
			last_cur_ticks = cur_ticks;
5581
cf2b8ba6556b (svn r8028) -Fix: overflow of ticks was not handled properly, possibly resulting a non-reacting gameserver/gameclient.
rubidium
parents: 5475
diff changeset
   491
			next_tick = cur_ticks + 30;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   492
8586
cb0e7e00f1d2 (svn r12167) -Feature(tte): change colour of autorail and autoroad selection when Ctrl is pressed
smatz
parents: 8433
diff changeset
   493
			bool old_ctrl_pressed = _ctrl_pressed;
cb0e7e00f1d2 (svn r12167) -Feature(tte): change colour of autorail and autoroad selection when Ctrl is pressed
smatz
parents: 8433
diff changeset
   494
4508
0e626ba2a59a (svn r6293) -Codechange: Simply use KMOD_CTRL instead of KMOD_LCTRL | KMOD_RCTRL, same for KMOD_SHIFT
tron
parents: 4507
diff changeset
   495
			_ctrl_pressed  = !!(mod & KMOD_CTRL);
0e626ba2a59a (svn r6293) -Codechange: Simply use KMOD_CTRL instead of KMOD_LCTRL | KMOD_RCTRL, same for KMOD_SHIFT
tron
parents: 4507
diff changeset
   496
			_shift_pressed = !!(mod & KMOD_SHIFT);
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   497
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   498
			// determine which directional keys are down
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   499
			_dirkeys =
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   500
				(keys[SDLK_LEFT]  ? 1 : 0) |
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   501
				(keys[SDLK_UP]    ? 2 : 0) |
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   502
				(keys[SDLK_RIGHT] ? 4 : 0) |
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   503
				(keys[SDLK_DOWN]  ? 8 : 0);
8586
cb0e7e00f1d2 (svn r12167) -Feature(tte): change colour of autorail and autoroad selection when Ctrl is pressed
smatz
parents: 8433
diff changeset
   504
cb0e7e00f1d2 (svn r12167) -Feature(tte): change colour of autorail and autoroad selection when Ctrl is pressed
smatz
parents: 8433
diff changeset
   505
			if (old_ctrl_pressed != _ctrl_pressed) HandleCtrlChanged();
cb0e7e00f1d2 (svn r12167) -Feature(tte): change colour of autorail and autoroad selection when Ctrl is pressed
smatz
parents: 8433
diff changeset
   506
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   507
			GameLoop();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   508
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   509
			_screen.dst_ptr = _sdl_screen->pixels;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   510
			UpdateWindows();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   511
			if (++pal_tick > 4) {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   512
				CheckPaletteAnim();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   513
				pal_tick = 1;
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   514
			}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   515
			DrawSurfaceToScreen();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   516
		} else {
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   517
			SDL_CALL SDL_Delay(1);
6878
5cefd3ac59c7 (svn r10121) -Codechange: split renderer from rest of code; no longer any code directly accesses the video-buffer
truelight
parents: 6615
diff changeset
   518
			_screen.dst_ptr = _sdl_screen->pixels;
7454
e55eea8c05c7 (svn r10932) -Codechange: replace "text" with "chat" for the chat related function and variables.
rubidium
parents: 7311
diff changeset
   519
			DrawChatMessage();
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   520
			DrawMouseCursor();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   521
			DrawSurfaceToScreen();
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   522
		}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   523
	}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   524
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   525
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   526
bool VideoDriver_SDL::ChangeResolution(int w, int h)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   527
{
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   528
	return CreateMainSurface(w, h);
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   529
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   530
8171
3fb9d1f8ac3b (svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents: 8131
diff changeset
   531
bool VideoDriver_SDL::ToggleFullscreen(bool fullscreen)
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   532
{
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   533
	_fullscreen = fullscreen;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   534
	GetVideoModes(); // get the list of available video modes
7170
923946ec324f (svn r10444) -Codechange: switch to c++ classes and inheritance for sound/music/video drivers, using self-registration based on the blitter-model.
peter1138
parents: 7019
diff changeset
   535
	if (_num_resolutions == 0 || !this->ChangeResolution(_cur_resolution[0], _cur_resolution[1])) {
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   536
		// switching resolution failed, put back full_screen to original status
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   537
		_fullscreen ^= true;
8171
3fb9d1f8ac3b (svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents: 8131
diff changeset
   538
		return false;
4507
8db2d47a6527 (svn r6292) -Cleanup: Indentation, bracing, etc.
tron
parents: 4501
diff changeset
   539
	}
8171
3fb9d1f8ac3b (svn r11734) -Change: Allow ToggleFullScreen to return the result of the operation' attempt. Previously, only visual clues were available.
belugas
parents: 8131
diff changeset
   540
	return true;
2174
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   541
}
24d868f1c576 (svn r2688) MSVC and Watcom can't handle identical file names in different directories, oh my...
tron
parents:
diff changeset
   542
5988
1aabf94612c6 (svn r8691) -Cleanup: Some proper #endif comments for sound/music/video files, and a little elimination of magic numbers in Win32SoundStart
Darkvater
parents: 5587
diff changeset
   543
#endif /* WITH_SDL */