sdl-ios-xcode: src/video/win32/SDL_win32window.c annotate

annotate src/video/win32/SDL_win32window.c @ 4897:c3eb55210a90

SDL_DestroyWindow is setting window->magic to NULL too early. - window->magic is also checked in SDL_DestroyRenderer. All cleanup code like freeing the renderer and textures is not executed. The patch moves window_magic = NULL behind the SDL_DestroyRenderer call. Kind regards, André

author	Sam Lantinga <slouken@libsdl.org>
date	Mon, 27 Sep 2010 00:49:34 -0700
parents	518d1679d2d0
children	69d9db65f248

rev	line source
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	22
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	23 /* we need to define it, so that raw input is included */
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	24
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	25 #if (_WIN32_WINNT < 0x0501)
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	26 #undef _WIN32_WINNT
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	27 #define _WIN32_WINNT 0x0501
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	28 #endif
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	29
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #include "SDL_config.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	32 #include "../SDL_sysvideo.h"
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	33 #include "../SDL_pixels_c.h"
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 #include "../../events/SDL_keyboard_c.h"
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 #include "SDL_win32video.h"
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	37 #include "SDL_win32window.h"
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 /* This is included after SDL_win32video.h, which includes windows.h */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 #include "SDL_syswm.h"
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	41 #include "SDL_gapirender.h"
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	42
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	43
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	44 /* Fake window to help with DirectInput events. */
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	45 HWND SDL_HelperWindow = NULL;
2714 1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	46 static WCHAR *SDL_HelperWindowClassName = TEXT("SDLHelperWindowInputCatcher");
1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	47 static WCHAR *SDL_HelperWindowName = TEXT("SDLHelperWindowInputMsgWindow");
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	48 static ATOM SDL_HelperWindowClass = 0;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	49
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	50 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	51 SetupWindowData(_THIS, SDL_Window * window, HWND hwnd, SDL_bool created)
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	52 {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	53 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3566 diff changeset	54 SDL_VideoDisplay *display = window->display;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 SDL_WindowData *data;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	56
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 /* Allocate the window data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58 data = (SDL_WindowData ) SDL_malloc(sizeof(data));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 if (!data) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 SDL_OutOfMemory();
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3566 diff changeset	63 data->window = window;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 data->hwnd = hwnd;
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	65 data->hdc = GetDC(hwnd);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 data->created = created;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 data->mouse_pressed = SDL_FALSE;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	68 data->videodata = videodata;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 /* Associate the data with the window */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 if (!SetProp(hwnd, TEXT("SDL_WindowData"), data)) {
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	72 ReleaseDC(hwnd, data->hdc);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 SDL_free(data);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 WIN_SetError("SetProp() failed");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	75 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 /* Set up the window proc function */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	79 data->wndproc = (WNDPROC) GetWindowLongPtr(hwnd, GWLP_WNDPROC);
4733 983eb9d5ed31 Change SDL to not use DefWindowProc as the window class' window procedure. dewyatt parents: 3697 diff changeset	80 if (data->wndproc == WIN_WindowProc) {
3566 07c8339c95c6 Fixed bug #905 Sam Lantinga <slouken@libsdl.org> parents: 3530 diff changeset	81 data->wndproc = NULL;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 }
4735 8568ebdb5f1f Added else to make things clear. dewyatt parents: 4733 diff changeset	83 else {
8568ebdb5f1f Added else to make things clear. dewyatt parents: 4733 diff changeset	84 SetWindowLongPtr(hwnd, GWLP_WNDPROC, (LONG_PTR) WIN_WindowProc);
8568ebdb5f1f Added else to make things clear. dewyatt parents: 4733 diff changeset	85 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 /* Fill in the SDL window with the window data */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 POINT point;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 point.x = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 point.y = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 if (ClientToScreen(hwnd, &point)) {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	93 SDL_Rect bounds;
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	94 WIN_GetDisplayBounds(_this, display, &bounds);
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	95 window->x = point.x - bounds.x;
e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	96 window->y = point.y - bounds.y;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	98 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	99 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	100 RECT rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	101 if (GetClientRect(hwnd, &rect)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	102 window->w = rect.right;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 window->h = rect.bottom;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 DWORD style = GetWindowLong(hwnd, GWL_STYLE);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 if (style & WS_VISIBLE) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 window->flags \|= SDL_WINDOW_SHOWN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	110 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	111 window->flags &= ~SDL_WINDOW_SHOWN;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	112 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 if (style & (WS_BORDER \| WS_THICKFRAME)) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 window->flags &= ~SDL_WINDOW_BORDERLESS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 window->flags \|= SDL_WINDOW_BORDERLESS;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 if (style & WS_THICKFRAME) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 window->flags \|= SDL_WINDOW_RESIZABLE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 window->flags &= ~SDL_WINDOW_RESIZABLE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 if (style & WS_MAXIMIZE) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 window->flags \|= SDL_WINDOW_MAXIMIZED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 window->flags &= ~SDL_WINDOW_MAXIMIZED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 if (style & WS_MINIMIZE) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 window->flags \|= SDL_WINDOW_MINIMIZED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 window->flags &= ~SDL_WINDOW_MINIMIZED;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 if (GetFocus() == hwnd) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 window->flags \|= SDL_WINDOW_INPUT_FOCUS;
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	136 SDL_SetKeyboardFocus(data->window);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 RECT rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 GetClientRect(hwnd, &rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 ClientToScreen(hwnd, (LPPOINT) & rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 ClientToScreen(hwnd, (LPPOINT) & rect + 1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 ClipCursor(&rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 /* All done! */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 window->driverdata = data;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 WIN_CreateWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3566 diff changeset	155 SDL_VideoDisplay *display = window->display;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 HWND hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157 RECT rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	158 SDL_Rect bounds;
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	159 DWORD style = (WS_CLIPSIBLINGS \| WS_CLIPCHILDREN);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 int x, y;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 int w, h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	163 if (window->flags & (SDL_WINDOW_BORDERLESS \| SDL_WINDOW_FULLSCREEN)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 style \|= WS_POPUP;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 style \|= (WS_OVERLAPPED \| WS_CAPTION \| WS_SYSMENU \| WS_MINIMIZEBOX);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	168 if ((window->flags & SDL_WINDOW_RESIZABLE)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	169 && !(window->flags & SDL_WINDOW_FULLSCREEN)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 style \|= (WS_THICKFRAME \| WS_MAXIMIZEBOX);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 /* Figure out what the window area will be */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 rect.left = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 rect.top = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176 rect.right = window->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 rect.bottom = window->h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 AdjustWindowRectEx(&rect, style, FALSE, 0);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 w = (rect.right - rect.left);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 h = (rect.bottom - rect.top);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	182 WIN_GetDisplayBounds(_this, display, &bounds);
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	183 if (window->flags & SDL_WINDOW_FULLSCREEN) {
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	184 /* The bounds when this window is visible is the fullscreen mode */
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	185 SDL_DisplayMode fullscreen_mode;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	186 if (SDL_GetWindowDisplayMode(window, &fullscreen_mode) == 0) {
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	187 bounds.w = fullscreen_mode.w;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	188 bounds.h = fullscreen_mode.h;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	189 }
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	190 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	191 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	192 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	193 x = bounds.x + (bounds.w - w) / 2;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	195 if (bounds.x == 0) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	196 x = CW_USEDEFAULT;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	197 } else {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	198 x = bounds.x;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	199 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	201 x = bounds.x + window->x + rect.left;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	203 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	204 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	205 y = bounds.y + (bounds.h - h) / 2;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	206 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	207 if (bounds.x == 0) {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	208 y = CW_USEDEFAULT;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	209 } else {
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	210 y = bounds.y;
59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	211 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	213 y = bounds.y + window->y + rect.top;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	216 hwnd =
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	217 CreateWindow(SDL_Appname, TEXT(""), style, x, y, w, h, NULL, NULL,
ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	218 SDL_Instance, NULL);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 if (!hwnd) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 WIN_SetError("Couldn't create window");
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 }
4650 7ad7a473b086 More fixes for windows. Disabled tablet code. jimtla parents: 3697 diff changeset	223 //RegisterTouchWindow(hwnd, 0);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	225 WIN_PumpEvents(_this);
44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	226
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	227 if (SetupWindowData(_this, window, hwnd, SDL_TRUE) < 0) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 DestroyWindow(hwnd);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 }
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	231 #ifdef SDL_VIDEO_OPENGL_WGL
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	232 if (window->flags & SDL_WINDOW_OPENGL) {
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	233 if (WIN_GL_SetupWindow(_this, window) < 0) {
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	234 WIN_DestroyWindow(_this, window);
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	235 return -1;
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	236 }
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	237 }
83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	238 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 int
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 WIN_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 HWND hwnd = (HWND) data;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246 LPTSTR title;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 int titleLen;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 /* Query the title from the existing window */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 titleLen = GetWindowTextLength(hwnd);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 title = SDL_stack_alloc(TCHAR, titleLen + 1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 if (title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253 titleLen = GetWindowText(hwnd, title, titleLen);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 titleLen = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 if (titleLen > 0) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 window->title = WIN_StringToUTF8(title);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 if (title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 SDL_stack_free(title);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: 1913 diff changeset	264 if (SetupWindowData(_this, window, hwnd, SDL_FALSE) < 0) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 return -1;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 return 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 WIN_SetWindowTitle(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 LPTSTR title;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 if (window->title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277 title = WIN_UTF8ToString(window->title);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 title = NULL;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	280 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 SetWindowText(hwnd, title ? title : TEXT(""));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282 if (title) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 SDL_free(title);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	285 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 void
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	288 WIN_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	289 {
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	290 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	291 HICON hicon = NULL;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	292
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	293 if (icon) {
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	294 BYTE *icon_bmp;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	295 int icon_len;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	296 SDL_RWops *dst;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	297 SDL_PixelFormat format;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	298 SDL_Surface *surface;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	299
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	300 /* Create temporary bitmap buffer */
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	301 icon_len = 40 + icon->h * icon->w * 4;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	302 icon_bmp = SDL_stack_alloc(BYTE, icon_len);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	303 dst = SDL_RWFromMem(icon_bmp, icon_len);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	304 if (!dst) {
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	305 SDL_stack_free(icon_bmp);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	306 return;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	307 }
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	308
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	309 /* Write the BITMAPINFO header */
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	310 SDL_WriteLE32(dst, 40);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	311 SDL_WriteLE32(dst, icon->w);
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	312 SDL_WriteLE32(dst, icon->h * 2);
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	313 SDL_WriteLE16(dst, 1);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	314 SDL_WriteLE16(dst, 32);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	315 SDL_WriteLE32(dst, BI_RGB);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	316 SDL_WriteLE32(dst, icon->h * icon->w * 4);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	317 SDL_WriteLE32(dst, 0);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	318 SDL_WriteLE32(dst, 0);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	319 SDL_WriteLE32(dst, 0);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	320 SDL_WriteLE32(dst, 0);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	321
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	322 /* Convert the icon to a 32-bit surface with alpha channel */
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	323 SDL_InitFormat(&format, 32,
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	324 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	325 surface = SDL_ConvertSurface(icon, &format, 0);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	326 if (surface) {
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	327 /* Write the pixels upside down into the bitmap buffer */
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	328 int y = surface->h;
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	329 while (y--) {
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	330 Uint8 src = (Uint8 ) surface->pixels + y * surface->pitch;
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	331 SDL_RWwrite(dst, src, surface->pitch, 1);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	332 }
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	333 SDL_FreeSurface(surface);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	334
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	335 /* TODO: create the icon in WinCE (CreateIconFromResource isn't available) */
0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	336 #ifndef _WIN32_WCE
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	337 hicon =
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	338 CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	339 #endif
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	340 }
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	341 SDL_RWclose(dst);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	342 SDL_stack_free(icon_bmp);
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	343 }
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	344
2971 a3012c6652ff Should we also set the icon in the task manager? Sam Lantinga <slouken@libsdl.org> parents: 2970 diff changeset	345 /* Set the icon for the window */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	346 SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) hicon);
2971 a3012c6652ff Should we also set the icon in the task manager? Sam Lantinga <slouken@libsdl.org> parents: 2970 diff changeset	347
a3012c6652ff Should we also set the icon in the task manager? Sam Lantinga <slouken@libsdl.org> parents: 2970 diff changeset	348 /* Set the icon in the task manager (should we do this?) */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2971 diff changeset	349 SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM) hicon);
2970 94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	350 }
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	351
94b634c56455 Added support for translucent icons on Windows Sam Lantinga <slouken@libsdl.org> parents: 2968 diff changeset	352 void
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	353 WIN_SetWindowPosition(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	354 {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3566 diff changeset	355 SDL_VideoDisplay *display = window->display;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	357 RECT rect;
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	358 SDL_Rect bounds;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 DWORD style;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 HWND top;
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	361 BOOL menu;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 int x, y;
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	363 int w, h;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 /* Figure out what the window area will be */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 if (window->flags & SDL_WINDOW_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 top = HWND_TOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 top = HWND_NOTOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 style = GetWindowLong(hwnd, GWL_STYLE);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 rect.left = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373 rect.top = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 rect.right = window->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375 rect.bottom = window->h;
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	376 #ifdef _WIN32_WCE
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	377 menu = FALSE;
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	378 #else
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	379 menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	380 #endif
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	381 AdjustWindowRectEx(&rect, style, menu, 0);
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	382 w = (rect.right - rect.left);
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	383 h = (rect.bottom - rect.top);
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2865 diff changeset	384
3528 59ff7a2beb57 Added an API function to query geometry of multiple monitors: Sam Lantinga <slouken@libsdl.org> parents: 3196 diff changeset	385 WIN_GetDisplayBounds(_this, display, &bounds);
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	386 if (window->flags & SDL_WINDOW_FULLSCREEN) {
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	387 /* The bounds when this window is visible is the fullscreen mode */
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	388 SDL_DisplayMode fullscreen_mode;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	389 if (SDL_GetWindowDisplayMode(window, &fullscreen_mode) == 0) {
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	390 bounds.w = fullscreen_mode.w;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	391 bounds.h = fullscreen_mode.h;
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	392 }
237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	393 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	394 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	395 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	396 x = bounds.x + (bounds.w - w) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2865 diff changeset	397 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	398 x = bounds.x + window->x + rect.left;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2865 diff changeset	399 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	400 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	401 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
4486 237b1eb53e4d Fixed fullscreen window position Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	402 y = bounds.y + (bounds.h - h) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2865 diff changeset	403 } else {
3530 e96be66e3673 The window position is display relative, at least for now... Sam Lantinga <slouken@libsdl.org> parents: 3528 diff changeset	404 y = bounds.y + window->y + rect.top;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2865 diff changeset	405 }
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	406
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	407 SetWindowPos(hwnd, top, x, y, 0, 0, (SWP_NOCOPYBITS \| SWP_NOSIZE));
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411 WIN_SetWindowSize(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	412 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	413 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	414 RECT rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	415 DWORD style;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	416 HWND top;
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	417 BOOL menu;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	418 int w, h;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	419
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	420 /* Figure out what the window area will be */
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	421 if (window->flags & SDL_WINDOW_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	422 top = HWND_TOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	423 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	424 top = HWND_NOTOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	425 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	426 style = GetWindowLong(hwnd, GWL_STYLE);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	427 rect.left = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	428 rect.top = 0;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	429 rect.right = window->w;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	430 rect.bottom = window->h;
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	431 #ifdef _WIN32_WCE
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	432 menu = FALSE;
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	433 #else
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	434 menu = (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != NULL);
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	435 #endif
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	436 AdjustWindowRectEx(&rect, style, menu, 0);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	437 w = (rect.right - rect.left);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	438 h = (rect.bottom - rect.top);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	439
2968 efe4d0ce2e97 Date: Fri, 02 Jan 2009 23:22:39 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	440 SetWindowPos(hwnd, top, 0, 0, w, h, (SWP_NOCOPYBITS \| SWP_NOMOVE));
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	442
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	444 WIN_ShowWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	445 {
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	446 #ifdef _WIN32_WCE
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	447 WINCE_ShowWindow(_this, window, 1);
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	448 #else
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	449 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 ShowWindow(hwnd, SW_SHOW);
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	451 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 WIN_HideWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 {
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	457 #ifdef _WIN32_WCE
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	458 WINCE_ShowWindow(_this, window, 0);
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	459 #else
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 ShowWindow(hwnd, SW_HIDE);
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	462 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	463 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 WIN_RaiseWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	469 HWND top;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 if (window->flags & SDL_WINDOW_FULLSCREEN) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 top = HWND_TOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 top = HWND_NOTOPMOST;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	475 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476 SetWindowPos(hwnd, top, 0, 0, 0, 0, (SWP_NOMOVE \| SWP_NOSIZE));
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	478
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 WIN_MaximizeWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	483 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	484
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	485 #ifdef _WIN32_WCE
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	486 if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen)
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	487 videodata->SHFullScreen(hwnd, SHFS_HIDETASKBAR \| SHFS_HIDESTARTICON \| SHFS_HIDESIPBUTTON);
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	488 #endif
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	489
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	490 ShowWindow(hwnd, SW_MAXIMIZE);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	491 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 WIN_MinimizeWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	495 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	497 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	498
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	499 ShowWindow(hwnd, SW_MINIMIZE);
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	500
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	501 #ifdef _WIN32_WCE
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	502 if((window->flags & SDL_WINDOW_FULLSCREEN) && videodata->SHFullScreen)
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	503 videodata->SHFullScreen(hwnd, SHFS_SHOWTASKBAR \| SHFS_SHOWSTARTICON \| SHFS_SHOWSIPBUTTON);
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	504 #endif
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	506
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	507 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	508 WIN_RestoreWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	509 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 ShowWindow(hwnd, SW_RESTORE);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 WIN_SetWindowGrab(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	520 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED \| SDL_WINDOW_FULLSCREEN))
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	521 && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	522 RECT rect;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	523 GetClientRect(hwnd, &rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	524 ClientToScreen(hwnd, (LPPOINT) & rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	525 ClientToScreen(hwnd, (LPPOINT) & rect + 1);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	526 ClipCursor(&rect);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	527 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	528 ClipCursor(NULL);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	529 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	530 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	531
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	532 void
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	533 WIN_DestroyWindow(_THIS, SDL_Window * window)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	534 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	537 if (data) {
4569 e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	538 #ifdef _WIN32_WCE
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	539 WINCE_ShowWindow(_this, window, 0);
e1664f94f026 Andrey A. Sam Lantinga <slouken@libsdl.org> parents: 4500 diff changeset	540 #endif
1913 83420da906a5 Implemented Windows OpenGL support Sam Lantinga <slouken@libsdl.org> parents: 1895 diff changeset	541 ReleaseDC(data->hwnd, data->hdc);
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	542 if (data->created) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 DestroyWindow(data->hwnd);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	544 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	545 SDL_free(data);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549 SDL_bool
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 WIN_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 if (info->version.major <= SDL_MAJOR_VERSION) {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 info->window = hwnd;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 return SDL_TRUE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 } else {
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557 SDL_SetError("Application not compiled with SDL %d.%d\n",
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559 return SDL_FALSE;
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 }
c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	563
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	564 /*
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	565 * Creates a HelperWindow used for DirectInput events.
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	566 */
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	567 int
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	568 SDL_HelperWindowCreate(void)
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	569 {
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	570 HINSTANCE hInstance = GetModuleHandle(NULL);
0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	571 WNDCLASS wce;
3196 413672b09bb3 Fixed some compile errors and warnings under Visual C++ Sam Lantinga <slouken@libsdl.org> parents: 3168 diff changeset	572 HWND hWndParent = NULL;
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	573
3045 9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	574 /* Make sure window isn't created twice. */
9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	575 if (SDL_HelperWindow != NULL) {
9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	576 return 0;
9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	577 }
9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	578
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	579 /* Create the class. */
2714 1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	580 SDL_zero(wce);
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	581 wce.lpfnWndProc = DefWindowProc;
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	582 wce.lpszClassName = (LPCWSTR) SDL_HelperWindowClassName;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	583 wce.hInstance = hInstance;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	584
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	585 /* Register the class. */
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	586 SDL_HelperWindowClass = RegisterClass(&wce);
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	587 if (SDL_HelperWindowClass == 0) {
4500 eff4e88cc1e8 Added Windows clipboard support Sam Lantinga <slouken@libsdl.org> parents: 4486 diff changeset	588 WIN_SetError("Unable to create Helper Window Class");
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	589 return -1;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	590 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	591
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	592 #ifndef _WIN32_WCE
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	593 /* WinCE doesn't have HWND_MESSAGE */
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	594 hWndParent = HWND_MESSAGE;
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	595 #endif
6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	596
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	597 /* Create the window. */
2714 1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	598 SDL_HelperWindow = CreateWindowEx(0, SDL_HelperWindowClassName,
1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	599 SDL_HelperWindowName,
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	600 WS_OVERLAPPED, CW_USEDEFAULT,
2714 1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	601 CW_USEDEFAULT, CW_USEDEFAULT,
3168 6338b7f2d024 Hi, Sam Lantinga <slouken@libsdl.org> parents: 3139 diff changeset	602 CW_USEDEFAULT, hWndParent, NULL,
2714 1d1be6137875 Merged last minute fixes from force feedback branch (r4031, r4033, r4034) Sam Lantinga <slouken@libsdl.org> parents: 2713 diff changeset	603 hInstance, NULL);
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	604 if (SDL_HelperWindow == NULL) {
3045 9acb9f0f7f0d Some more safety around the SDL_HelperWindow stuff to avoid double creations. Edgar Simo <bobbens@gmail.com> parents: 2990 diff changeset	605 UnregisterClass(SDL_HelperWindowClassName, hInstance);
4500 eff4e88cc1e8 Added Windows clipboard support Sam Lantinga <slouken@libsdl.org> parents: 4486 diff changeset	606 WIN_SetError("Unable to create Helper Window");
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	607 return -1;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	608 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	609
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	610 return 0;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	611 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	612
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	613
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	614 /*
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	615 * Destroys the HelperWindow previously created with SDL_HelperWindowCreate.
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	616 */
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	617 void
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	618 SDL_HelperWindowDestroy(void)
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	619 {
3097 0d12e8f1de3c Date: Thu, 05 Feb 2009 18:07:35 +0100 Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	620 HINSTANCE hInstance = GetModuleHandle(NULL);
2863 b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	621
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	622 /* Destroy the window. */
2863 b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	623 if (SDL_HelperWindow != NULL) {
b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	624 if (DestroyWindow(SDL_HelperWindow) == 0) {
4500 eff4e88cc1e8 Added Windows clipboard support Sam Lantinga <slouken@libsdl.org> parents: 4486 diff changeset	625 WIN_SetError("Unable to destroy Helper Window");
2865 09adf4854163 indent Sam Lantinga <slouken@libsdl.org> parents: 2863 diff changeset	626 return;
2863 b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	627 }
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	628 SDL_HelperWindow = NULL;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	629 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	630
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	631 /* Unregister the class. */
2863 b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	632 if (SDL_HelperWindowClass != 0) {
b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	633 if ((UnregisterClass(SDL_HelperWindowClassName, hInstance)) == 0) {
4500 eff4e88cc1e8 Added Windows clipboard support Sam Lantinga <slouken@libsdl.org> parents: 4486 diff changeset	634 WIN_SetError("Unable to destroy Helper Window Class");
2865 09adf4854163 indent Sam Lantinga <slouken@libsdl.org> parents: 2863 diff changeset	635 return;
2863 b632927c28c8 Some error checking when destroying the HelperWindow. Edgar Simo <bobbens@gmail.com> parents: 2859 diff changeset	636 }
2713 0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	637 SDL_HelperWindowClass = 0;
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	638 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	639 }
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	640
0906692aa6a4 Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	641
1895 c121d94672cb SDL 1.2 is moving to a branch, and SDL 1.3 is becoming the head. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/win32/SDL_win32window.c @ 4897:c3eb55210a90