Skip to content

L
libSDL
Commit 67861b22 authored by Sam Lantinga's avatar Sam Lantinga
Browse files
Options

indent 

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%403338
parent c0775dd4
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 24 deletions
src/video/SDL_video.c
View file @ 67861b22
...@@ -123,7 +123,7 @@ static VideoBootStrap *bootstrap[] = { ...@@ -123,7 +123,7 @@ static VideoBootStrap *bootstrap[] = {
static SDL_VideoDevice *_this = NULL; static SDL_VideoDevice *_this = NULL;
/* Various local functions */ /* Various local functions */
static void SDL_UpdateWindowGrab(SDL_Window *window); static void SDL_UpdateWindowGrab(SDL_Window * window);
static int static int
cmpmodes(const void *A, const void *B) cmpmodes(const void *A, const void *B)
...@@ -1210,7 +1210,7 @@ SDL_SetWindowGrab(SDL_WindowID windowID, int mode) ...@@ -1210,7 +1210,7 @@ SDL_SetWindowGrab(SDL_WindowID windowID, int mode)
} }
static void static void
SDL_UpdateWindowGrab(SDL_Window *window) SDL_UpdateWindowGrab(SDL_Window * window)
{ {
if ((window->flags & SDL_WINDOW_INPUT_FOCUS) && _this->SetWindowGrab) { if ((window->flags & SDL_WINDOW_INPUT_FOCUS) && _this->SetWindowGrab) {
_this->SetWindowGrab(_this, window); _this->SetWindowGrab(_this, window);
...@@ -1265,7 +1265,8 @@ SDL_OnWindowFocusGained(SDL_Window * window) ...@@ -1265,7 +1265,8 @@ SDL_OnWindowFocusGained(SDL_Window * window)
if (display->gamma && _this->SetDisplayGammaRamp) { if (display->gamma && _this->SetDisplayGammaRamp) {
_this->SetDisplayGammaRamp(_this, display->gamma); _this->SetDisplayGammaRamp(_this, display->gamma);
} }
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && _this->SetWindowGrab) { if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
&& _this->SetWindowGrab) {
_this->SetWindowGrab(_this, window); _this->SetWindowGrab(_this, window);
} }
} }
...@@ -1282,7 +1283,8 @@ SDL_OnWindowFocusLost(SDL_Window * window) ...@@ -1282,7 +1283,8 @@ SDL_OnWindowFocusLost(SDL_Window * window)
if (display->gamma && _this->SetDisplayGammaRamp) { if (display->gamma && _this->SetDisplayGammaRamp) {
_this->SetDisplayGammaRamp(_this, display->saved_gamma); _this->SetDisplayGammaRamp(_this, display->saved_gamma);
} }
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && _this->SetWindowGrab) { if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
&& _this->SetWindowGrab) {
_this->SetWindowGrab(_this, window); _this->SetWindowGrab(_this, window);
} }
} }
......
src/video/win32/SDL_win32window.c
View file @ 67861b22
...@@ -159,12 +159,13 @@ WIN_CreateWindow(_THIS, SDL_Window * window) ...@@ -159,12 +159,13 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
int x, y; int x, y;
int w, h; int w, h;
if (window->flags & (SDL_WINDOW_BORDERLESS|SDL_WINDOW_FULLSCREEN)) { if (window->flags & (SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN)) {
style |= WS_POPUP; style |= WS_POPUP;
} else { } else {
style |= (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX); style |= (WS_OVERLAPPED | WS_CAPTION | WS_SYSMENU | WS_MINIMIZEBOX);
} }
if ((window->flags & SDL_WINDOW_RESIZABLE) && !(window->flags & SDL_WINDOW_FULLSCREEN)) { if ((window->flags & SDL_WINDOW_RESIZABLE)
&& !(window->flags & SDL_WINDOW_FULLSCREEN)) {
style |= (WS_THICKFRAME | WS_MAXIMIZEBOX); style |= (WS_THICKFRAME | WS_MAXIMIZEBOX);
} }
...@@ -182,14 +183,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window) ...@@ -182,14 +183,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window)
w = (rect.right - rect.left); w = (rect.right - rect.left);
h = (rect.bottom - rect.top); h = (rect.bottom - rect.top);
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->x == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->x == SDL_WINDOWPOS_CENTERED) {
x = (GetSystemMetrics(SM_CXSCREEN) - w) / 2; x = (GetSystemMetrics(SM_CXSCREEN) - w) / 2;
} else if (window->x == SDL_WINDOWPOS_UNDEFINED) { } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
x = CW_USEDEFAULT; x = CW_USEDEFAULT;
} else { } else {
x = window->x + rect.left; x = window->x + rect.left;
} }
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->y == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
y = (GetSystemMetrics(SM_CYSCREEN) - h) / 2; y = (GetSystemMetrics(SM_CYSCREEN) - h) / 2;
} else if (window->y == SDL_WINDOWPOS_UNDEFINED) { } else if (window->y == SDL_WINDOWPOS_UNDEFINED) {
y = CW_USEDEFAULT; y = CW_USEDEFAULT;
...@@ -332,12 +335,14 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window) ...@@ -332,12 +335,14 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window)
(style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) !=
NULL), 0); NULL), 0);
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->x == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->x == SDL_WINDOWPOS_CENTERED) {
x = (GetSystemMetrics(SM_CXSCREEN) - window->w) / 2; x = (GetSystemMetrics(SM_CXSCREEN) - window->w) / 2;
} else { } else {
x = window->x + rect.left; x = window->x + rect.left;
} }
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->y == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
y = (GetSystemMetrics(SM_CYSCREEN) - window->h) / 2; y = (GetSystemMetrics(SM_CYSCREEN) - window->h) / 2;
} else { } else {
y = window->y + rect.top; y = window->y + rect.top;
...@@ -434,8 +439,8 @@ WIN_SetWindowGrab(_THIS, SDL_Window * window) ...@@ -434,8 +439,8 @@ WIN_SetWindowGrab(_THIS, SDL_Window * window)
{ {
HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
(window->flags & SDL_WINDOW_INPUT_FOCUS)) { && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
RECT rect; RECT rect;
GetClientRect(hwnd, &rect); GetClientRect(hwnd, &rect);
ClientToScreen(hwnd, (LPPOINT) & rect); ClientToScreen(hwnd, (LPPOINT) & rect);
......
src/video/x11/SDL_x11window.c
View file @ 67861b22
...@@ -287,7 +287,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -287,7 +287,8 @@ X11_CreateWindow(_THIS, SDL_Window * window)
visual, AllocNone); visual, AllocNone);
} }
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->x == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->x == SDL_WINDOWPOS_CENTERED) {
x = (DisplayWidth(data->display, displaydata->screen) - x = (DisplayWidth(data->display, displaydata->screen) -
window->w) / 2; window->w) / 2;
} else if (window->x == SDL_WINDOWPOS_UNDEFINED) { } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
...@@ -295,7 +296,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -295,7 +296,8 @@ X11_CreateWindow(_THIS, SDL_Window * window)
} else { } else {
x = window->x; x = window->x;
} }
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->y == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
y = (DisplayHeight(data->display, displaydata->screen) - y = (DisplayHeight(data->display, displaydata->screen) -
window->h) / 2; window->h) / 2;
} else if (window->y == SDL_WINDOWPOS_UNDEFINED) { } else if (window->y == SDL_WINDOWPOS_UNDEFINED) {
...@@ -321,7 +323,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -321,7 +323,8 @@ X11_CreateWindow(_THIS, SDL_Window * window)
sizehints = XAllocSizeHints(); sizehints = XAllocSizeHints();
if (sizehints) { if (sizehints) {
if ((window->flags & SDL_WINDOW_RESIZABLE) && !(window->flags & SDL_WINDOW_FULLSCREEN)) { if ((window->flags & SDL_WINDOW_RESIZABLE)
&& !(window->flags & SDL_WINDOW_FULLSCREEN)) {
sizehints->min_width = 32; sizehints->min_width = 32;
sizehints->min_height = 32; sizehints->min_height = 32;
sizehints->max_height = 4096; sizehints->max_height = 4096;
...@@ -342,7 +345,7 @@ X11_CreateWindow(_THIS, SDL_Window * window) ...@@ -342,7 +345,7 @@ X11_CreateWindow(_THIS, SDL_Window * window)
XFree(sizehints); XFree(sizehints);
} }
if (window->flags & (SDL_WINDOW_BORDERLESS|SDL_WINDOW_FULLSCREEN)) { if (window->flags & (SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN)) {
SDL_bool set; SDL_bool set;
Atom WM_HINTS; Atom WM_HINTS;
...@@ -603,12 +606,14 @@ X11_SetWindowPosition(_THIS, SDL_Window * window) ...@@ -603,12 +606,14 @@ X11_SetWindowPosition(_THIS, SDL_Window * window)
Display *display = data->videodata->display; Display *display = data->videodata->display;
int x, y; int x, y;
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->x == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->x == SDL_WINDOWPOS_CENTERED) {
x = (DisplayWidth(display, displaydata->screen) - window->w) / 2; x = (DisplayWidth(display, displaydata->screen) - window->w) / 2;
} else { } else {
x = window->x; x = window->x;
} }
if ((window->flags & SDL_WINDOW_FULLSCREEN) || window->y == SDL_WINDOWPOS_CENTERED) { if ((window->flags & SDL_WINDOW_FULLSCREEN)
|| window->y == SDL_WINDOWPOS_CENTERED) {
y = (DisplayHeight(display, displaydata->screen) - window->h) / 2; y = (DisplayHeight(display, displaydata->screen) - window->h) / 2;
} else { } else {
y = window->y; y = window->y;
...@@ -676,12 +681,14 @@ X11_SetWindowGrab(_THIS, SDL_Window * window) ...@@ -676,12 +681,14 @@ X11_SetWindowGrab(_THIS, SDL_Window * window)
SDL_WindowData *data = (SDL_WindowData *) window->driverdata; SDL_WindowData *data = (SDL_WindowData *) window->driverdata;
Display *display = data->videodata->display; Display *display = data->videodata->display;
if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN))
(window->flags & SDL_WINDOW_INPUT_FOCUS)) { && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
/* Try to grab the mouse */ /* Try to grab the mouse */
for ( ; ; ) { for (;;) {
int result = XGrabPointer(display, data->window, True, 0, GrabModeAsync, GrabModeAsync, data->window, None, CurrentTime); int result =
if ( result == GrabSuccess ) { XGrabPointer(display, data->window, True, 0, GrabModeAsync,
GrabModeAsync, data->window, None, CurrentTime);
if (result == GrabSuccess) {
break; break;
} }
SDL_Delay(100); SDL_Delay(100);
...@@ -691,7 +698,8 @@ X11_SetWindowGrab(_THIS, SDL_Window * window) ...@@ -691,7 +698,8 @@ X11_SetWindowGrab(_THIS, SDL_Window * window)
XRaiseWindow(display, data->window); XRaiseWindow(display, data->window);
/* Now grab the keyboard */ /* Now grab the keyboard */
XGrabKeyboard(display, data->window, True, GrabModeAsync, GrabModeAsync, CurrentTime); XGrabKeyboard(display, data->window, True, GrabModeAsync,
GrabModeAsync, CurrentTime);
} else { } else {
XUngrabPointer(display, CurrentTime); XUngrabPointer(display, CurrentTime);
XUngrabKeyboard(display, CurrentTime); XUngrabKeyboard(display, CurrentTime);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment