mirror of https://github.com/OpenTTD/OpenTTD
(svn r6274) Clean up a bit
tron
parent
d5e21c2dc3
commit
c4fb78a708
|
|
@ -20,8 +20,10 @@ static struct {
|
|||
Pixel *buffer_bits;
|
||||
Pixel *alloced_bits;
|
||||
HPALETTE gdi_palette;
|
||||
int width,height;
|
||||
int width_org, height_org;
|
||||
int width;
|
||||
int height;
|
||||
int width_org;
|
||||
int height_org;
|
||||
bool fullscreen;
|
||||
bool double_size;
|
||||
bool has_focus;
|
||||
|
|
@ -52,8 +54,7 @@ static void MakePalette(void)
|
|||
|
||||
}
|
||||
_wnd.gdi_palette = CreatePalette(pal);
|
||||
if (_wnd.gdi_palette == NULL)
|
||||
error("CreatePalette failed!\n");
|
||||
if (_wnd.gdi_palette == NULL) error("CreatePalette failed!\n");
|
||||
}
|
||||
|
||||
static void UpdatePalette(HDC dc, uint start, uint count)
|
||||
|
|
@ -220,6 +221,7 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
HDC dc,dc2;
|
||||
HBITMAP old_bmp;
|
||||
HPALETTE old_palette;
|
||||
|
||||
BeginPaint(hwnd, &ps);
|
||||
dc = ps.hdc;
|
||||
dc2 = CreateCompatibleDC(dc);
|
||||
|
|
@ -236,17 +238,18 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
SelectObject(dc2, old_bmp);
|
||||
DeleteDC(dc2);
|
||||
EndPaint(hwnd, &ps);
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
case WM_PALETTECHANGED:
|
||||
if ((HWND)wParam == hwnd)
|
||||
return 0;
|
||||
// FALL THROUGH
|
||||
if ((HWND)wParam == hwnd) return 0;
|
||||
/* FALLTHROUGH */
|
||||
|
||||
case WM_QUERYNEWPALETTE: {
|
||||
HDC hDC = GetWindowDC(hwnd);
|
||||
HPALETTE hOldPalette = SelectPalette(hDC, _wnd.gdi_palette, FALSE);
|
||||
UINT nChanged = RealizePalette(hDC);
|
||||
|
||||
SelectPalette(hDC, hOldPalette, TRUE);
|
||||
ReleaseDC(hwnd, hDC);
|
||||
if (nChanged) InvalidateRect(hwnd, NULL, FALSE);
|
||||
|
|
@ -348,20 +351,19 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
case WM_KEYDOWN: {
|
||||
// this is the rewritten ascii input function
|
||||
// it disables windows deadkey handling --> more linux like :D
|
||||
unsigned short w = 0;
|
||||
int r = 0;
|
||||
WORD w = 0;
|
||||
byte ks[256];
|
||||
unsigned int scan = 0;
|
||||
uint16 scancode = (( lParam & 0xFF0000 ) >> 16 );
|
||||
uint scancode;
|
||||
|
||||
GetKeyboardState(ks);
|
||||
r = ToAscii(wParam, scan, ks, &w, 0);
|
||||
if (r == 0) w = 0; // no translation was possible
|
||||
if (ToAscii(wParam, 0, ks, &w, 0) == 0) {
|
||||
w = 0; // no translation was possible
|
||||
}
|
||||
|
||||
_pressed_key = w | MapWindowsKey(wParam) << 16;
|
||||
|
||||
if (scancode == 41)
|
||||
_pressed_key = w | WKC_BACKQUOTE << 16;
|
||||
scancode = GB(lParam, 16, 8);
|
||||
if (scancode == 41) _pressed_key = w | WKC_BACKQUOTE << 16;
|
||||
|
||||
if ((_pressed_key >> 16) == ('D' | WKC_CTRL) && !_wnd.fullscreen) {
|
||||
_double_size ^= 1;
|
||||
|
|
@ -369,33 +371,39 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
ClientSizeChanged(_wnd.width, _wnd.height);
|
||||
MarkWholeScreenDirty();
|
||||
}
|
||||
} break;
|
||||
break;
|
||||
}
|
||||
|
||||
case WM_SYSKEYDOWN: /* user presses F10 or Alt, both activating the title-menu */
|
||||
switch (wParam) {
|
||||
case VK_RETURN: case 0x46: /* Full Screen on ALT + ENTER/F(VK_F) */
|
||||
case VK_RETURN:
|
||||
case 'F': /* Full Screen on ALT + ENTER/F */
|
||||
ToggleFullScreen(!_wnd.fullscreen);
|
||||
return 0;
|
||||
|
||||
case VK_MENU: /* Just ALT */
|
||||
return 0; // do nothing
|
||||
|
||||
case VK_F10: /* F10, ignore activation of menu */
|
||||
_pressed_key = MapWindowsKey(wParam) << 16;
|
||||
return 0;
|
||||
|
||||
default: /* ALT in combination with something else */
|
||||
_pressed_key = MapWindowsKey(wParam) << 16;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case WM_NCMOUSEMOVE:
|
||||
MyShowCursor(true);
|
||||
return 0;
|
||||
|
||||
case WM_SIZE: {
|
||||
case WM_SIZE:
|
||||
if (wParam != SIZE_MINIMIZED) {
|
||||
ClientSizeChanged(LOWORD(lParam), HIWORD(lParam));
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
case WM_SIZING: {
|
||||
RECT* r = (RECT*)lParam;
|
||||
RECT r2;
|
||||
|
|
@ -426,27 +434,34 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
case WMSZ_BOTTOM:
|
||||
r->bottom = r->top + h;
|
||||
break;
|
||||
|
||||
case WMSZ_BOTTOMLEFT:
|
||||
r->bottom = r->top + h;
|
||||
r->left = r->right - w;
|
||||
break;
|
||||
|
||||
case WMSZ_BOTTOMRIGHT:
|
||||
r->bottom = r->top + h;
|
||||
r->right = r->left + w;
|
||||
break;
|
||||
|
||||
case WMSZ_LEFT:
|
||||
r->left = r->right - w;
|
||||
break;
|
||||
|
||||
case WMSZ_RIGHT:
|
||||
r->right = r->left + w;
|
||||
break;
|
||||
|
||||
case WMSZ_TOP:
|
||||
r->top = r->bottom - h;
|
||||
break;
|
||||
|
||||
case WMSZ_TOPLEFT:
|
||||
r->top = r->bottom - h;
|
||||
r->left = r->right - w;
|
||||
break;
|
||||
|
||||
case WMSZ_TOPRIGHT:
|
||||
r->top = r->bottom - h;
|
||||
r->right = r->left + w;
|
||||
|
|
@ -483,7 +498,8 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
|
|||
|
||||
static void RegisterWndClass(void)
|
||||
{
|
||||
static bool registered;
|
||||
static bool registered = false;
|
||||
|
||||
if (!registered) {
|
||||
HINSTANCE hinst = GetModuleHandle(NULL);
|
||||
WNDCLASS wnd = {
|
||||
|
|
@ -498,9 +514,9 @@ static void RegisterWndClass(void)
|
|||
0,
|
||||
"OTTD"
|
||||
};
|
||||
|
||||
registered = true;
|
||||
if (!RegisterClass(&wnd))
|
||||
error("RegisterClass failed");
|
||||
if (!RegisterClass(&wnd)) error("RegisterClass failed");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -520,19 +536,19 @@ static void MakeWindow(bool full_screen)
|
|||
|
||||
if (full_screen) {
|
||||
DEVMODE settings;
|
||||
memset(&settings, 0, sizeof(DEVMODE));
|
||||
settings.dmSize = sizeof(DEVMODE);
|
||||
settings.dmFields = DM_PELSWIDTH | DM_PELSHEIGHT;
|
||||
|
||||
if (_fullscreen_bpp) {
|
||||
memset(&settings, 0, sizeof(settings));
|
||||
settings.dmSize = sizeof(settings);
|
||||
settings.dmFields =
|
||||
(_fullscreen_bpp != 0 ? DM_BITSPERPEL : 0) |
|
||||
DM_PELSWIDTH |
|
||||
DM_PELSHEIGHT |
|
||||
(_display_hz != 0 ? DM_DISPLAYFREQUENCY : 0);
|
||||
settings.dmBitsPerPel = _fullscreen_bpp;
|
||||
settings.dmFields |= DM_BITSPERPEL;
|
||||
}
|
||||
settings.dmPelsWidth = _wnd.width_org;
|
||||
settings.dmPelsHeight = _wnd.height_org;
|
||||
settings.dmDisplayFrequency = _display_hz;
|
||||
if (settings.dmDisplayFrequency != 0)
|
||||
settings.dmFields |= DM_DISPLAYFREQUENCY;
|
||||
|
||||
if (ChangeDisplaySettings(&settings, CDS_FULLSCREEN) != DISP_CHANGE_SUCCESSFUL) {
|
||||
MakeWindow(false);
|
||||
return;
|
||||
|
|
@ -621,17 +637,14 @@ static bool AllocateDibSection(int w, int h)
|
|||
bi->bmiHeader.biBitCount = 8;
|
||||
bi->bmiHeader.biCompression = BI_RGB;
|
||||
|
||||
if (_wnd.dib_sect)
|
||||
DeleteObject(_wnd.dib_sect);
|
||||
if (_wnd.dib_sect) DeleteObject(_wnd.dib_sect);
|
||||
|
||||
dc = GetDC(0);
|
||||
_wnd.dib_sect = CreateDIBSection(dc, bi, DIB_RGB_COLORS, (void**)&_wnd.bitmap_bits, NULL, 0);
|
||||
if (_wnd.dib_sect == NULL)
|
||||
error("CreateDIBSection failed");
|
||||
_wnd.dib_sect = CreateDIBSection(dc, bi, DIB_RGB_COLORS, (VOID**)&_wnd.bitmap_bits, NULL, 0);
|
||||
if (_wnd.dib_sect == NULL) error("CreateDIBSection failed");
|
||||
ReleaseDC(0, dc);
|
||||
|
||||
if (!_wnd.double_size)
|
||||
_wnd.buffer_bits = _wnd.bitmap_bits;
|
||||
if (!_wnd.double_size) _wnd.buffer_bits = _wnd.bitmap_bits;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
|
@ -846,7 +859,10 @@ static bool Win32GdiChangeRes(int w, int h)
|
|||
return true;
|
||||
}
|
||||
|
||||
static void Win32GdiFullScreen(bool full_screen) {MakeWindow(full_screen);}
|
||||
static void Win32GdiFullScreen(bool full_screen)
|
||||
{
|
||||
MakeWindow(full_screen);
|
||||
}
|
||||
|
||||
const HalVideoDriver _win32_video_driver = {
|
||||
Win32GdiStart,
|
||||
|
|
|
|||
Loading…
Reference in New Issue