Fixed bug #925
Changed "win32" to "windows" --HG-- rename : include/SDL_config_win32.h => include/SDL_config_windows.h rename : src/events/scancodes_win32.h => src/events/scancodes_windows.h rename : src/haptic/win32/SDL_syshaptic.c => src/haptic/windows/SDL_syshaptic.c rename : src/joystick/win32/SDL_dxjoystick.c => src/joystick/windows/SDL_dxjoystick.c rename : src/joystick/win32/SDL_dxjoystick_c.h => src/joystick/windows/SDL_dxjoystick_c.h rename : src/joystick/win32/SDL_mmjoystick.c => src/joystick/windows/SDL_mmjoystick.c rename : src/loadso/win32/SDL_sysloadso.c => src/loadso/windows/SDL_sysloadso.c rename : src/main/win32/SDL_win32_main.c => src/main/windows/SDL_windows_main.c rename : src/main/win32/version.rc => src/main/windows/version.rc rename : src/thread/win32/SDL_sysmutex.c => src/thread/windows/SDL_sysmutex.c rename : src/thread/win32/SDL_syssem.c => src/thread/windows/SDL_syssem.c rename : src/thread/win32/SDL_systhread.c => src/thread/windows/SDL_systhread.c rename : src/thread/win32/SDL_systhread_c.h => src/thread/windows/SDL_systhread_c.h rename : src/thread/win32/win_ce_semaphore.c => src/thread/windows/win_ce_semaphore.c rename : src/thread/win32/win_ce_semaphore.h => src/thread/windows/win_ce_semaphore.h rename : src/timer/win32/SDL_systimer.c => src/timer/windows/SDL_systimer.c rename : src/video/win32/SDL_ceddrawrender.c => src/video/windows/SDL_ceddrawrender.c rename : src/video/win32/SDL_ceddrawrender.h => src/video/windows/SDL_ceddrawrender.h rename : src/video/win32/SDL_d3drender.c => src/video/windows/SDL_d3drender.c rename : src/video/win32/SDL_d3drender.h => src/video/windows/SDL_d3drender.h rename : src/video/win32/SDL_gapirender.c => src/video/windows/SDL_gapirender.c rename : src/video/win32/SDL_gapirender.h => src/video/windows/SDL_gapirender.h rename : src/video/win32/SDL_gapirender_c.h => src/video/windows/SDL_gapirender_c.h rename : src/video/win32/SDL_gdirender.c => src/video/windows/SDL_gdirender.c rename : src/video/win32/SDL_gdirender.h => src/video/windows/SDL_gdirender.h rename : src/video/win32/SDL_msctf.h => src/video/windows/SDL_msctf.h rename : src/video/win32/SDL_vkeys.h => src/video/windows/SDL_vkeys.h rename : src/video/win32/SDL_win32clipboard.c => src/video/windows/SDL_windowsclipboard.c rename : src/video/win32/SDL_win32clipboard.h => src/video/windows/SDL_windowsclipboard.h rename : src/video/win32/SDL_win32events.c => src/video/windows/SDL_windowsevents.c rename : src/video/win32/SDL_win32events.h => src/video/windows/SDL_windowsevents.h rename : src/video/win32/SDL_win32gamma.c => src/video/windows/SDL_windowsgamma.c rename : src/video/win32/SDL_win32gamma.h => src/video/windows/SDL_windowsgamma.h rename : src/video/win32/SDL_win32keyboard.c => src/video/windows/SDL_windowskeyboard.c rename : src/video/win32/SDL_win32keyboard.h => src/video/windows/SDL_windowskeyboard.h rename : src/video/win32/SDL_win32modes.c => src/video/windows/SDL_windowsmodes.c rename : src/video/win32/SDL_win32modes.h => src/video/windows/SDL_windowsmodes.h rename : src/video/win32/SDL_win32mouse.c => src/video/windows/SDL_windowsmouse.c rename : src/video/win32/SDL_win32mouse.h => src/video/windows/SDL_windowsmouse.h rename : src/video/win32/SDL_win32opengl.c => src/video/windows/SDL_windowsopengl.c rename : src/video/win32/SDL_win32opengl.h => src/video/windows/SDL_windowsopengl.h rename : src/video/win32/SDL_win32shape.c => src/video/windows/SDL_windowsshape.c rename : src/video/win32/SDL_win32shape.h => src/video/windows/SDL_windowsshape.h rename : src/video/win32/SDL_win32video.c => src/video/windows/SDL_windowsvideo.c rename : src/video/win32/SDL_win32video.h => src/video/windows/SDL_windowsvideo.h rename : src/video/win32/SDL_win32window.c => src/video/windows/SDL_windowswindow.c rename : src/video/win32/SDL_win32window.h => src/video/windows/SDL_windowswindow.h rename : src/video/win32/wmmsg.h => src/video/windows/wmmsg.h
This commit is contained in:
parent
ee1f71dd63
commit
9d25ba272a
82 changed files with 382 additions and 375 deletions
|
@ -1,287 +0,0 @@
|
|||
/*
|
||||
SDL - Simple DirectMedia Layer
|
||||
Copyright (C) 1997-2010 Sam Lantinga
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Lesser General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2.1 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Lesser General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Lesser General Public
|
||||
License along with this library; if not, write to the Free Software
|
||||
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
|
||||
Sam Lantinga
|
||||
slouken@libsdl.org
|
||||
*/
|
||||
#include "SDL_config.h"
|
||||
|
||||
#include "SDL_win32video.h"
|
||||
|
||||
|
||||
static SDL_bool
|
||||
WIN_GetDisplayMode(LPCTSTR deviceName, DWORD index, SDL_DisplayMode * mode)
|
||||
{
|
||||
SDL_DisplayModeData *data;
|
||||
DEVMODE devmode;
|
||||
HDC hdc;
|
||||
|
||||
devmode.dmSize = sizeof(devmode);
|
||||
devmode.dmDriverExtra = 0;
|
||||
if (!EnumDisplaySettings(deviceName, index, &devmode)) {
|
||||
return SDL_FALSE;
|
||||
}
|
||||
|
||||
data = (SDL_DisplayModeData *) SDL_malloc(sizeof(*data));
|
||||
if (!data) {
|
||||
return SDL_FALSE;
|
||||
}
|
||||
data->DeviceMode = devmode;
|
||||
data->DeviceMode.dmFields =
|
||||
(DM_BITSPERPEL | DM_PELSWIDTH | DM_PELSHEIGHT | DM_DISPLAYFREQUENCY |
|
||||
DM_DISPLAYFLAGS);
|
||||
|
||||
/* Fill in the mode information */
|
||||
mode->format = SDL_PIXELFORMAT_UNKNOWN;
|
||||
mode->w = devmode.dmPelsWidth;
|
||||
mode->h = devmode.dmPelsHeight;
|
||||
mode->refresh_rate = devmode.dmDisplayFrequency;
|
||||
mode->driverdata = data;
|
||||
#ifdef _WIN32_WCE
|
||||
/* In WinCE EnumDisplaySettings(ENUM_CURRENT_SETTINGS) doesn't take the user defined orientation
|
||||
into account but GetSystemMetrics does. */
|
||||
if (index == ENUM_CURRENT_SETTINGS) {
|
||||
mode->w = GetSystemMetrics(SM_CXSCREEN);
|
||||
mode->h = GetSystemMetrics(SM_CYSCREEN);
|
||||
}
|
||||
#endif
|
||||
|
||||
/* WinCE has no GetDIBits, therefore we can't use it to get the display format */
|
||||
#ifndef _WIN32_WCE
|
||||
if (index == ENUM_CURRENT_SETTINGS
|
||||
&& (hdc = CreateDC(deviceName, NULL, NULL, NULL)) != NULL) {
|
||||
char bmi_data[sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)];
|
||||
LPBITMAPINFO bmi;
|
||||
HBITMAP hbm;
|
||||
|
||||
SDL_zero(bmi_data);
|
||||
bmi = (LPBITMAPINFO) bmi_data;
|
||||
bmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER);
|
||||
|
||||
hbm = CreateCompatibleBitmap(hdc, 1, 1);
|
||||
GetDIBits(hdc, hbm, 0, 1, NULL, bmi, DIB_RGB_COLORS);
|
||||
GetDIBits(hdc, hbm, 0, 1, NULL, bmi, DIB_RGB_COLORS);
|
||||
DeleteObject(hbm);
|
||||
DeleteDC(hdc);
|
||||
if (bmi->bmiHeader.biCompression == BI_BITFIELDS) {
|
||||
switch (*(Uint32 *) bmi->bmiColors) {
|
||||
case 0x00FF0000:
|
||||
mode->format = SDL_PIXELFORMAT_RGB888;
|
||||
break;
|
||||
case 0x000000FF:
|
||||
mode->format = SDL_PIXELFORMAT_BGR888;
|
||||
break;
|
||||
case 0xF800:
|
||||
mode->format = SDL_PIXELFORMAT_RGB565;
|
||||
break;
|
||||
case 0x7C00:
|
||||
mode->format = SDL_PIXELFORMAT_RGB555;
|
||||
break;
|
||||
}
|
||||
} else if (bmi->bmiHeader.biBitCount == 8) {
|
||||
mode->format = SDL_PIXELFORMAT_INDEX8;
|
||||
} else if (bmi->bmiHeader.biBitCount == 4) {
|
||||
mode->format = SDL_PIXELFORMAT_INDEX4LSB;
|
||||
}
|
||||
} else
|
||||
#endif /* _WIN32_WCE */
|
||||
{
|
||||
/* FIXME: Can we tell what this will be? */
|
||||
if ((devmode.dmFields & DM_BITSPERPEL) == DM_BITSPERPEL) {
|
||||
switch (devmode.dmBitsPerPel) {
|
||||
case 32:
|
||||
mode->format = SDL_PIXELFORMAT_RGB888;
|
||||
break;
|
||||
case 24:
|
||||
mode->format = SDL_PIXELFORMAT_RGB24;
|
||||
break;
|
||||
case 16:
|
||||
mode->format = SDL_PIXELFORMAT_RGB565;
|
||||
break;
|
||||
case 15:
|
||||
mode->format = SDL_PIXELFORMAT_RGB555;
|
||||
break;
|
||||
case 8:
|
||||
mode->format = SDL_PIXELFORMAT_INDEX8;
|
||||
break;
|
||||
case 4:
|
||||
mode->format = SDL_PIXELFORMAT_INDEX4LSB;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
return SDL_TRUE;
|
||||
}
|
||||
|
||||
static SDL_bool
|
||||
WIN_AddDisplay(LPTSTR DeviceName)
|
||||
{
|
||||
SDL_VideoDisplay display;
|
||||
SDL_DisplayData *displaydata;
|
||||
SDL_DisplayMode mode;
|
||||
|
||||
#ifdef DEBUG_MODES
|
||||
printf("Display: %s\n", WIN_StringToUTF8(DeviceName));
|
||||
#endif
|
||||
if (!WIN_GetDisplayMode(DeviceName, ENUM_CURRENT_SETTINGS, &mode)) {
|
||||
return SDL_FALSE;
|
||||
}
|
||||
|
||||
displaydata = (SDL_DisplayData *) SDL_malloc(sizeof(*displaydata));
|
||||
if (!displaydata) {
|
||||
return SDL_FALSE;
|
||||
}
|
||||
SDL_memcpy(displaydata->DeviceName, DeviceName,
|
||||
sizeof(displaydata->DeviceName));
|
||||
|
||||
SDL_zero(display);
|
||||
display.desktop_mode = mode;
|
||||
display.current_mode = mode;
|
||||
display.driverdata = displaydata;
|
||||
SDL_AddVideoDisplay(&display);
|
||||
return SDL_TRUE;
|
||||
}
|
||||
|
||||
int
|
||||
WIN_InitModes(_THIS)
|
||||
{
|
||||
DWORD i, j, count;
|
||||
DISPLAY_DEVICE device;
|
||||
|
||||
device.cb = sizeof(device);
|
||||
for (i = 0;; ++i) {
|
||||
TCHAR DeviceName[32];
|
||||
|
||||
if (!EnumDisplayDevices(NULL, i, &device, 0)) {
|
||||
break;
|
||||
}
|
||||
if (!(device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) {
|
||||
continue;
|
||||
}
|
||||
SDL_memcpy(DeviceName, device.DeviceName, sizeof(DeviceName));
|
||||
#ifdef DEBUG_MODES
|
||||
printf("Device: %s\n", WIN_StringToUTF8(DeviceName));
|
||||
#endif
|
||||
count = 0;
|
||||
for (j = 0;; ++j) {
|
||||
if (!EnumDisplayDevices(DeviceName, j, &device, 0)) {
|
||||
break;
|
||||
}
|
||||
if (!(device.StateFlags & DISPLAY_DEVICE_ATTACHED_TO_DESKTOP)) {
|
||||
continue;
|
||||
}
|
||||
count += WIN_AddDisplay(device.DeviceName);
|
||||
}
|
||||
if (count == 0) {
|
||||
WIN_AddDisplay(DeviceName);
|
||||
}
|
||||
}
|
||||
if (_this->num_displays == 0) {
|
||||
SDL_SetError("No displays available");
|
||||
return -1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int
|
||||
WIN_GetDisplayBounds(_THIS, SDL_VideoDisplay * display, SDL_Rect * rect)
|
||||
{
|
||||
SDL_DisplayModeData *data = (SDL_DisplayModeData *) display->desktop_mode.driverdata;
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
// WINCE: DEVMODE.dmPosition not found, or may be mingw32ce bug
|
||||
rect->x = 0;
|
||||
rect->y = 0;
|
||||
rect->w = display->windows->w;
|
||||
rect->h = display->windows->h;
|
||||
#else
|
||||
rect->x = (int)data->DeviceMode.dmPosition.x;
|
||||
rect->y = (int)data->DeviceMode.dmPosition.y;
|
||||
rect->w = data->DeviceMode.dmPelsWidth;
|
||||
rect->h = data->DeviceMode.dmPelsHeight;
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
|
||||
void
|
||||
WIN_GetDisplayModes(_THIS, SDL_VideoDisplay * display)
|
||||
{
|
||||
SDL_DisplayData *data = (SDL_DisplayData *) display->driverdata;
|
||||
DWORD i;
|
||||
SDL_DisplayMode mode;
|
||||
|
||||
for (i = 0;; ++i) {
|
||||
if (!WIN_GetDisplayMode(data->DeviceName, i, &mode)) {
|
||||
break;
|
||||
}
|
||||
if (mode.format != SDL_PIXELFORMAT_UNKNOWN) {
|
||||
if (!SDL_AddDisplayMode(display, &mode)) {
|
||||
SDL_free(mode.driverdata);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
int
|
||||
WIN_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
|
||||
{
|
||||
SDL_DisplayData *displaydata = (SDL_DisplayData *) display->driverdata;
|
||||
SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
|
||||
LONG status;
|
||||
|
||||
#ifdef _WIN32_WCE
|
||||
/* TODO: implement correctly.
|
||||
On my Asus MyPAL, if I execute the code below
|
||||
I get DISP_CHANGE_BADFLAGS and the Titlebar of the fullscreen window stays
|
||||
visible ... (SDL_RaiseWindow() would fix that one) */
|
||||
return 0;
|
||||
#endif
|
||||
|
||||
status =
|
||||
ChangeDisplaySettingsEx(displaydata->DeviceName, &data->DeviceMode,
|
||||
NULL, CDS_FULLSCREEN, NULL);
|
||||
if (status == DISP_CHANGE_SUCCESSFUL) {
|
||||
return 0;
|
||||
} else {
|
||||
const char *reason = "Unknown reason";
|
||||
switch (status) {
|
||||
case DISP_CHANGE_BADFLAGS:
|
||||
reason = "DISP_CHANGE_BADFLAGS";
|
||||
break;
|
||||
case DISP_CHANGE_BADMODE:
|
||||
reason = "DISP_CHANGE_BADMODE";
|
||||
break;
|
||||
case DISP_CHANGE_BADPARAM:
|
||||
reason = "DISP_CHANGE_BADPARAM";
|
||||
break;
|
||||
case DISP_CHANGE_FAILED:
|
||||
reason = "DISP_CHANGE_FAILED";
|
||||
break;
|
||||
}
|
||||
SDL_SetError("ChangeDisplaySettingsEx() failed: %s", reason);
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
WIN_QuitModes(_THIS)
|
||||
{
|
||||
ChangeDisplaySettingsEx(NULL, NULL, NULL, 0, NULL);
|
||||
}
|
||||
|
||||
/* vi: set ts=4 sw=4 expandtab: */
|
Loading…
Add table
Add a link
Reference in a new issue