Mercurial > sdl-ios-xcode

changeset 2990:502adab079a4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
indent
author Sam Lantinga <slouken@libsdl.org>
date Sun, 04 Jan 2009 17:14:27 +0000
parents aba5a5cc2e63
children f4d14219c2aa
files include/SDL_video.h src/events/SDL_keyboard.c src/video/SDL_bmp.c src/video/SDL_pixels.c src/video/SDL_pixels_c.h src/video/win32/SDL_d3drender.c src/video/win32/SDL_win32events.c src/video/win32/SDL_win32mouse.c src/video/win32/SDL_win32window.c src/video/x11/SDL_x11window.c
diffstat 10 files changed, 83 insertions(+), 58 deletions(-) [+]
line wrap: on
line diff
--- a/include/SDL_video.h	Sun Jan 04 17:10:04 2009 +0000
+++ b/include/SDL_video.h	Sun Jan 04 17:14:27 2009 +0000
@@ -597,7 +597,8 @@
  *
  * \param icon The icon for the window
  */
-extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_WindowID windowID, SDL_Surface * icon);
+extern DECLSPEC void SDLCALL SDL_SetWindowIcon(SDL_WindowID windowID,
+                                               SDL_Surface * icon);
 
 /**
  * \fn void SDL_SetWindowData(SDL_WindowID windowID, void *userdata)
--- a/src/events/SDL_keyboard.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/events/SDL_keyboard.c	Sun Jan 04 17:14:27 2009 +0000
@@ -975,17 +975,17 @@
 
     switch (key) {
     case SDLK_RETURN:
-            return SDL_GetScancodeName(SDL_SCANCODE_RETURN);
+        return SDL_GetScancodeName(SDL_SCANCODE_RETURN);
     case SDLK_ESCAPE:
-            return SDL_GetScancodeName(SDL_SCANCODE_ESCAPE);
+        return SDL_GetScancodeName(SDL_SCANCODE_ESCAPE);
     case SDLK_BACKSPACE:
-            return SDL_GetScancodeName(SDL_SCANCODE_BACKSPACE);
+        return SDL_GetScancodeName(SDL_SCANCODE_BACKSPACE);
     case SDLK_TAB:
-            return SDL_GetScancodeName(SDL_SCANCODE_TAB);
+        return SDL_GetScancodeName(SDL_SCANCODE_TAB);
     case SDLK_SPACE:
-            return SDL_GetScancodeName(SDL_SCANCODE_SPACE);
+        return SDL_GetScancodeName(SDL_SCANCODE_SPACE);
     case SDLK_DELETE:
-            return SDL_GetScancodeName(SDL_SCANCODE_DELETE);
+        return SDL_GetScancodeName(SDL_SCANCODE_DELETE);
     default:
         /* Unaccented letter keys on latin keyboards are normally
            labeled in upper case (and probably on others like Greek or
--- a/src/video/SDL_bmp.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/SDL_bmp.c	Sun Jan 04 17:14:27 2009 +0000
@@ -412,7 +412,8 @@
                32-bit BMP with alpha channel, otherwise save a 24-bit BMP. */
             if (save32bit) {
                 SDL_InitFormat(&format, 32,
-                               0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
+                               0x00FF0000, 0x0000FF00, 0x000000FF,
+                               0xFF000000);
             } else {
                 SDL_InitFormat(&format, 24,
 #if SDL_BYTEORDER == SDL_LIL_ENDIAN
@@ -424,7 +425,8 @@
             }
             surface = SDL_ConvertSurface(saveme, &format, 0);
             if (!surface) {
-                SDL_SetError("Couldn't convert image to %d bpp", format.BitsPerPixel);
+                SDL_SetError("Couldn't convert image to %d bpp",
+                             format.BitsPerPixel);
             }
         }
     }
--- a/src/video/SDL_pixels.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/SDL_pixels.c	Sun Jan 04 17:14:27 2009 +0000
@@ -360,7 +360,8 @@
 }
 
 SDL_PixelFormat *
-SDL_InitFormat(SDL_PixelFormat *format, int bpp, Uint32 Rmask, Uint32 Gmask, Uint32 Bmask, Uint32 Amask)
+SDL_InitFormat(SDL_PixelFormat * format, int bpp, Uint32 Rmask, Uint32 Gmask,
+               Uint32 Bmask, Uint32 Amask)
 {
     Uint32 mask;
 
--- a/src/video/SDL_pixels_c.h	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/SDL_pixels_c.h	Sun Jan 04 17:14:27 2009 +0000
@@ -29,9 +29,9 @@
 extern SDL_PixelFormat *SDL_AllocFormat(int bpp,
                                         Uint32 Rmask, Uint32 Gmask,
                                         Uint32 Bmask, Uint32 Amask);
-extern SDL_PixelFormat *SDL_InitFormat(SDL_PixelFormat *format, int bpp,
-                                        Uint32 Rmask, Uint32 Gmask,
-                                        Uint32 Bmask, Uint32 Amask);
+extern SDL_PixelFormat *SDL_InitFormat(SDL_PixelFormat * format, int bpp,
+                                       Uint32 Rmask, Uint32 Gmask,
+                                       Uint32 Bmask, Uint32 Amask);
 extern void SDL_FormatChanged(SDL_Surface * surface);
 extern void SDL_FreeFormat(SDL_PixelFormat * format);
 
--- a/src/video/win32/SDL_d3drender.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/win32/SDL_d3drender.c	Sun Jan 04 17:14:27 2009 +0000
@@ -39,7 +39,9 @@
 static SDL_Renderer *D3D_CreateRenderer(SDL_Window * window, Uint32 flags);
 static int D3D_DisplayModeChanged(SDL_Renderer * renderer);
 static int D3D_CreateTexture(SDL_Renderer * renderer, SDL_Texture * texture);
-static int D3D_QueryTexturePixels(SDL_Renderer * renderer, SDL_Texture * texture, void **pixels, int *pitch);
+static int D3D_QueryTexturePixels(SDL_Renderer * renderer,
+                                  SDL_Texture * texture, void **pixels,
+                                  int *pitch);
 static int D3D_SetTexturePalette(SDL_Renderer * renderer,
                                  SDL_Texture * texture,
                                  const SDL_Color * colors, int firstcolor,
@@ -232,17 +234,18 @@
 }
 
 static SDL_bool
-D3D_IsTextureFormatAvailable(IDirect3D9 *d3d, Uint32 display_format, Uint32 texture_format)
+D3D_IsTextureFormatAvailable(IDirect3D9 * d3d, Uint32 display_format,
+                             Uint32 texture_format)
 {
     HRESULT result;
 
-    result = IDirect3D9_CheckDeviceFormat(d3d,
-                                          D3DADAPTER_DEFAULT,        /* FIXME */
+    result = IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT,      /* FIXME */
                                           D3DDEVTYPE_HAL,
                                           PixelFormatToD3DFMT(display_format),
                                           0,
                                           D3DRTYPE_TEXTURE,
-                                          PixelFormatToD3DFMT(texture_format));
+                                          PixelFormatToD3DFMT
+                                          (texture_format));
     return FAILED(result) ? SDL_FALSE : SDL_TRUE;
 }
 
@@ -260,7 +263,8 @@
     d3drect.top = 0;
     d3drect.bottom = texture->h;
 
-    result = IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect, 0);
+    result =
+        IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect, 0);
     if (FAILED(result)) {
         return;
     }
@@ -285,28 +289,35 @@
     if (data->d3d) {
         int i;
         int formats[] = {
-          SDL_PIXELFORMAT_INDEX8,
-          SDL_PIXELFORMAT_RGB332,
-          SDL_PIXELFORMAT_RGB444,
-          SDL_PIXELFORMAT_RGB555,
-          SDL_PIXELFORMAT_ARGB4444,
-          SDL_PIXELFORMAT_ARGB1555,
-          SDL_PIXELFORMAT_RGB565,
-          SDL_PIXELFORMAT_RGB888,
-          SDL_PIXELFORMAT_ARGB8888,
-          SDL_PIXELFORMAT_ARGB2101010,
+            SDL_PIXELFORMAT_INDEX8,
+            SDL_PIXELFORMAT_RGB332,
+            SDL_PIXELFORMAT_RGB444,
+            SDL_PIXELFORMAT_RGB555,
+            SDL_PIXELFORMAT_ARGB4444,
+            SDL_PIXELFORMAT_ARGB1555,
+            SDL_PIXELFORMAT_RGB565,
+            SDL_PIXELFORMAT_RGB888,
+            SDL_PIXELFORMAT_ARGB8888,
+            SDL_PIXELFORMAT_ARGB2101010,
         };
 
         for (i = 0; i < SDL_arraysize(formats); ++i) {
-            if (D3D_IsTextureFormatAvailable(data->d3d, mode->format, formats[i])) {
-                info->texture_formats[info->num_texture_formats++] = formats[i];
+            if (D3D_IsTextureFormatAvailable
+                (data->d3d, mode->format, formats[i])) {
+                info->texture_formats[info->num_texture_formats++] =
+                    formats[i];
             }
         }
-        info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YV12;
-        info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_IYUV;
-        info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YUY2;
-        info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_UYVY;
-        info->texture_formats[info->num_texture_formats++] = SDL_PIXELFORMAT_YVYU;
+        info->texture_formats[info->num_texture_formats++] =
+            SDL_PIXELFORMAT_YV12;
+        info->texture_formats[info->num_texture_formats++] =
+            SDL_PIXELFORMAT_IYUV;
+        info->texture_formats[info->num_texture_formats++] =
+            SDL_PIXELFORMAT_YUY2;
+        info->texture_formats[info->num_texture_formats++] =
+            SDL_PIXELFORMAT_UYVY;
+        info->texture_formats[info->num_texture_formats++] =
+            SDL_PIXELFORMAT_YVYU;
 
         SDL_AddRenderDriver(0, &D3D_RenderDriver);
     }
@@ -549,9 +560,11 @@
 
     if (SDL_ISPIXELFORMAT_FOURCC(texture->format) &&
         (texture->format != SDL_PIXELFORMAT_YUY2 ||
-         !D3D_IsTextureFormatAvailable(renderdata->d3d, display_format, texture->format)) &&
-        (texture->format != SDL_PIXELFORMAT_YVYU ||
-         !D3D_IsTextureFormatAvailable(renderdata->d3d, display_format, texture->format))) {
+         !D3D_IsTextureFormatAvailable(renderdata->d3d, display_format,
+                                       texture->format))
+        && (texture->format != SDL_PIXELFORMAT_YVYU
+            || !D3D_IsTextureFormatAvailable(renderdata->d3d, display_format,
+                                             texture->format))) {
         data->yuv =
             SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
         if (!data->yuv) {
@@ -680,7 +693,8 @@
         result =
             IDirect3DDevice9_CreateTexture(renderdata->device, texture->w,
                                            texture->h, 1, 0,
-                                           PixelFormatToD3DFMT(texture->format),
+                                           PixelFormatToD3DFMT(texture->
+                                                               format),
                                            D3DPOOL_SYSTEMMEM, &temp, NULL);
         if (FAILED(result)) {
             D3D_SetError("CreateTexture()", result);
@@ -733,7 +747,8 @@
         d3drect.bottom = rect->y + rect->h;
 
         result =
-            IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect, 0);
+            IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect,
+                                       0);
         if (FAILED(result)) {
             D3D_SetError("LockRect()", result);
             return -1;
@@ -776,7 +791,8 @@
 
         result =
             IDirect3DTexture9_LockRect(data->texture, 0, &locked, &d3drect,
-                                       markDirty ? 0 : D3DLOCK_NO_DIRTY_UPDATE);
+                                       markDirty ? 0 :
+                                       D3DLOCK_NO_DIRTY_UPDATE);
         if (FAILED(result)) {
             D3D_SetError("LockRect()", result);
             return -1;
--- a/src/video/win32/SDL_win32events.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/win32/SDL_win32events.c	Sun Jan 04 17:14:27 2009 +0000
@@ -287,7 +287,7 @@
             }
             if (flags & RI_MOUSE_WHEEL) {
                 SDL_SendMouseWheel(index, 0,
-                                   (short)raw->data.mouse.usButtonData);
+                                   (short) raw->data.mouse.usButtonData);
             }
             SDL_stack_free(lpb);
         }
--- a/src/video/win32/SDL_win32mouse.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/win32/SDL_win32mouse.c	Sun Jan 04 17:14:27 2009 +0000
@@ -85,7 +85,8 @@
             continue;
         }
         buffer = SDL_malloc((tmp + 1) * sizeof(char));
-        key_name = SDL_malloc((tmp + SDL_strlen(reg_key_root) + 1) * sizeof(char));
+        key_name =
+            SDL_malloc((tmp + SDL_strlen(reg_key_root) + 1) * sizeof(char));
 
         /* we're getting the device registry path and polishing it to get it's name,
            surely there must be an easier way, but we haven't found it yet */
@@ -126,7 +127,7 @@
             }
         }
 
-		buffer -= 4;
+        buffer -= 4;
 
         if (is_rdp == 1) {
             SDL_free(buffer);
@@ -178,7 +179,8 @@
             int cursors;
             data->WTInfoA(WTI_DEVICES, DVC_NPRESSURE, &pressure);
             data->WTInfoA(WTI_DEVICES, DVC_NCSRTYPES, &cursors);
-            SDL_AddMouse(&mouse, device_name, pressure.axMax, pressure.axMin, cursors);
+            SDL_AddMouse(&mouse, device_name, pressure.axMax, pressure.axMin,
+                         cursors);
         } else {
             SDL_AddMouse(&mouse, device_name, 0, 0, 1);
         }
--- a/src/video/win32/SDL_win32window.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/win32/SDL_win32window.c	Sun Jan 04 17:14:27 2009 +0000
@@ -318,7 +318,7 @@
     HWND hwnd = ((SDL_WindowData *) window->driverdata)->hwnd;
     HICON hicon = NULL;
 
-    if(icon) {
+    if (icon) {
         BYTE *icon_bmp;
         int icon_len;
         SDL_RWops *dst;
@@ -337,7 +337,7 @@
         /* Write the BITMAPINFO header */
         SDL_WriteLE32(dst, 40);
         SDL_WriteLE32(dst, icon->w);
-        SDL_WriteLE32(dst, icon->h*2);
+        SDL_WriteLE32(dst, icon->h * 2);
         SDL_WriteLE16(dst, 1);
         SDL_WriteLE16(dst, 32);
         SDL_WriteLE32(dst, BI_RGB);
@@ -355,22 +355,23 @@
             /* Write the pixels upside down into the bitmap buffer */
             int y = surface->h;
             while (y--) {
-                Uint8 *src = (Uint8 *)surface->pixels + y * surface->pitch;
+                Uint8 *src = (Uint8 *) surface->pixels + y * surface->pitch;
                 SDL_RWwrite(dst, src, surface->pitch, 1);
             }
             SDL_FreeSurface(surface);
 
-            hicon = CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
+            hicon =
+                CreateIconFromResource(icon_bmp, icon_len, TRUE, 0x00030000);
         }
         SDL_RWclose(dst);
         SDL_stack_free(icon_bmp);
     }
 
     /* Set the icon for the window */
-    SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM)hicon);
+    SendMessage(hwnd, WM_SETICON, ICON_SMALL, (LPARAM) hicon);
 
     /* Set the icon in the task manager (should we do this?) */
-    SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)hicon);
+    SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM) hicon);
 }
 
 void
--- a/src/video/x11/SDL_x11window.c	Sun Jan 04 17:10:04 2009 +0000
+++ b/src/video/x11/SDL_x11window.c	Sun Jan 04 17:14:27 2009 +0000
@@ -659,22 +659,24 @@
         Uint32 *propdata;
 
         /* Convert the icon to ARGB for modern window managers */
-        SDL_InitFormat(&format, 32, 0x00FF0000, 0x0000FF00, 0x000000FF, 0xFF000000);
+        SDL_InitFormat(&format, 32, 0x00FF0000, 0x0000FF00, 0x000000FF,
+                       0xFF000000);
         surface = SDL_ConvertSurface(icon, &format, 0);
         if (!surface) {
             return;
         }
 
         /* Set the _NET_WM_ICON property */
-        propsize = 2+(icon->w*icon->h);
+        propsize = 2 + (icon->w * icon->h);
         propdata = SDL_malloc(propsize * sizeof(Uint32));
         if (propdata) {
             propdata[0] = icon->w;
             propdata[1] = icon->h;
-            SDL_memcpy(&propdata[2], surface->pixels, surface->h*surface->pitch);
-            XChangeProperty(display, data->window, _NET_WM_ICON, 
-                            XA_CARDINAL, 32, PropModeReplace,
-                            (unsigned char *) propdata, propsize);
+            SDL_memcpy(&propdata[2], surface->pixels,
+                       surface->h * surface->pitch);
+            XChangeProperty(display, data->window, _NET_WM_ICON, XA_CARDINAL,
+                            32, PropModeReplace, (unsigned char *) propdata,
+                            propsize);
         }
         SDL_FreeSurface(surface);
     } else {