From dc17b38c36ec764bd570d72c960bd44939369d6f Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 17 Dec 2008 07:19:55 +0000 Subject: [PATCH] indent --- src/video/SDL_video.c | 10 ++++++---- src/video/win32/SDL_win32window.c | 21 ++++++++++++-------- src/video/x11/SDL_x11window.c | 32 +++++++++++++++++++------------ 3 files changed, 39 insertions(+), 24 deletions(-) diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c index 6c57daddf..45ebe4b83 100644 --- a/src/video/SDL_video.c +++ b/src/video/SDL_video.c @@ -123,7 +123,7 @@ static VideoBootStrap *bootstrap[] = { static SDL_VideoDevice *_this = NULL; /* Various local functions */ -static void SDL_UpdateWindowGrab(SDL_Window *window); +static void SDL_UpdateWindowGrab(SDL_Window * window); static int cmpmodes(const void *A, const void *B) @@ -1210,7 +1210,7 @@ SDL_SetWindowGrab(SDL_WindowID windowID, int mode) } static void -SDL_UpdateWindowGrab(SDL_Window *window) +SDL_UpdateWindowGrab(SDL_Window * window) { if ((window->flags & SDL_WINDOW_INPUT_FOCUS) && _this->SetWindowGrab) { _this->SetWindowGrab(_this, window); @@ -1265,7 +1265,8 @@ SDL_OnWindowFocusGained(SDL_Window * window) if (display->gamma && _this->SetDisplayGammaRamp) { _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); } } @@ -1282,7 +1283,8 @@ SDL_OnWindowFocusLost(SDL_Window * window) if (display->gamma && _this->SetDisplayGammaRamp) { _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); } } diff --git a/src/video/win32/SDL_win32window.c b/src/video/win32/SDL_win32window.c index aee25423a..fbd216faa 100644 --- a/src/video/win32/SDL_win32window.c +++ b/src/video/win32/SDL_win32window.c @@ -159,12 +159,13 @@ WIN_CreateWindow(_THIS, SDL_Window * window) int x, y; int w, h; - if (window->flags & (SDL_WINDOW_BORDERLESS|SDL_WINDOW_FULLSCREEN)) { + if (window->flags & (SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN)) { style |= WS_POPUP; } else { 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); } @@ -182,14 +183,16 @@ WIN_CreateWindow(_THIS, SDL_Window * window) w = (rect.right - rect.left); 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; } else if (window->x == SDL_WINDOWPOS_UNDEFINED) { x = CW_USEDEFAULT; } else { 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; } else if (window->y == SDL_WINDOWPOS_UNDEFINED) { y = CW_USEDEFAULT; @@ -332,12 +335,14 @@ WIN_SetWindowPosition(_THIS, SDL_Window * window) (style & WS_CHILDWINDOW) ? FALSE : (GetMenu(hwnd) != 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; } else { 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; } else { y = window->y + rect.top; @@ -434,8 +439,8 @@ WIN_SetWindowGrab(_THIS, SDL_Window * window) { HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd; - if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && - (window->flags & SDL_WINDOW_INPUT_FOCUS)) { + if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) + && (window->flags & SDL_WINDOW_INPUT_FOCUS)) { RECT rect; GetClientRect(hwnd, &rect); ClientToScreen(hwnd, (LPPOINT) & rect); diff --git a/src/video/x11/SDL_x11window.c b/src/video/x11/SDL_x11window.c index 9510f9829..7044504fc 100644 --- a/src/video/x11/SDL_x11window.c +++ b/src/video/x11/SDL_x11window.c @@ -287,7 +287,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) 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) - window->w) / 2; } else if (window->x == SDL_WINDOWPOS_UNDEFINED) { @@ -295,7 +296,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) } else { 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) - window->h) / 2; } else if (window->y == SDL_WINDOWPOS_UNDEFINED) { @@ -321,7 +323,8 @@ X11_CreateWindow(_THIS, SDL_Window * window) sizehints = XAllocSizeHints(); 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_height = 32; sizehints->max_height = 4096; @@ -342,7 +345,7 @@ X11_CreateWindow(_THIS, SDL_Window * window) XFree(sizehints); } - if (window->flags & (SDL_WINDOW_BORDERLESS|SDL_WINDOW_FULLSCREEN)) { + if (window->flags & (SDL_WINDOW_BORDERLESS | SDL_WINDOW_FULLSCREEN)) { SDL_bool set; Atom WM_HINTS; @@ -603,12 +606,14 @@ X11_SetWindowPosition(_THIS, SDL_Window * window) Display *display = data->videodata->display; 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; } else { 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; } else { y = window->y; @@ -676,12 +681,14 @@ X11_SetWindowGrab(_THIS, SDL_Window * window) SDL_WindowData *data = (SDL_WindowData *) window->driverdata; Display *display = data->videodata->display; - if ((window->flags & (SDL_WINDOW_INPUT_GRABBED|SDL_WINDOW_FULLSCREEN)) && - (window->flags & SDL_WINDOW_INPUT_FOCUS)) { + if ((window->flags & (SDL_WINDOW_INPUT_GRABBED | SDL_WINDOW_FULLSCREEN)) + && (window->flags & SDL_WINDOW_INPUT_FOCUS)) { /* Try to grab the mouse */ - for ( ; ; ) { - int result = XGrabPointer(display, data->window, True, 0, GrabModeAsync, GrabModeAsync, data->window, None, CurrentTime); - if ( result == GrabSuccess ) { + for (;;) { + int result = + XGrabPointer(display, data->window, True, 0, GrabModeAsync, + GrabModeAsync, data->window, None, CurrentTime); + if (result == GrabSuccess) { break; } SDL_Delay(100); @@ -691,7 +698,8 @@ X11_SetWindowGrab(_THIS, SDL_Window * window) XRaiseWindow(display, data->window); /* Now grab the keyboard */ - XGrabKeyboard(display, data->window, True, GrabModeAsync, GrabModeAsync, CurrentTime); + XGrabKeyboard(display, data->window, True, GrabModeAsync, + GrabModeAsync, CurrentTime); } else { XUngrabPointer(display, CurrentTime); XUngrabKeyboard(display, CurrentTime);