File style cleanup for the SDL 2.0 release
authorSam Lantinga <slouken@libsdl.org>
Sat, 18 May 2013 14:17:52 -0700
changeset 719175360622e65f
parent 7190 11612d544fcd
child 7192 4d862d2ab3bf
File style cleanup for the SDL 2.0 release
Xcode-iOS/Demos/src/accelerometer.c
Xcode-iOS/Demos/src/common.c
Xcode-iOS/Demos/src/common.h
Xcode-iOS/Demos/src/fireworks.c
Xcode-iOS/Demos/src/happy.c
Xcode-iOS/Demos/src/keyboard.c
Xcode-iOS/Demos/src/mixer.c
Xcode-iOS/Demos/src/rectangles.c
Xcode-iOS/Demos/src/touch.c
Xcode-iOS/Template/SDL iOS Application/main.c
Xcode/TemplatesForXcodeLeopard/SDL Application/main.c
Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c
Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c
Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c
Xcode/TemplatesForXcodeSnowLeopard/SDL Application/main.c
Xcode/TemplatesForXcodeSnowLeopard/SDL Cocoa Application/main.c
Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/atlantis/atlantis.c
Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/main.c
Xcode/TemplatesForXcodeTiger/SDL Application/main.c
Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/main.c
Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/atlantis/atlantis.c
Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/main.c
include/SDL.h
include/SDL_assert.h
include/SDL_atomic.h
include/SDL_audio.h
include/SDL_bits.h
include/SDL_blendmode.h
include/SDL_clipboard.h
include/SDL_config.h
include/SDL_config_android.h
include/SDL_config_iphoneos.h
include/SDL_config_macosx.h
include/SDL_config_minimal.h
include/SDL_config_pandora.h
include/SDL_config_psp.h
include/SDL_config_windows.h
include/SDL_config_wiz.h
include/SDL_cpuinfo.h
include/SDL_endian.h
include/SDL_error.h
include/SDL_events.h
include/SDL_gamecontroller.h
include/SDL_gesture.h
include/SDL_haptic.h
include/SDL_hints.h
include/SDL_joystick.h
include/SDL_keyboard.h
include/SDL_keycode.h
include/SDL_loadso.h
include/SDL_log.h
include/SDL_main.h
include/SDL_messagebox.h
include/SDL_mouse.h
include/SDL_mutex.h
include/SDL_name.h
include/SDL_opengl.h
include/SDL_opengles.h
include/SDL_opengles2.h
include/SDL_pixels.h
include/SDL_platform.h
include/SDL_power.h
include/SDL_quit.h
include/SDL_rect.h
include/SDL_render.h
include/SDL_rwops.h
include/SDL_scancode.h
include/SDL_shape.h
include/SDL_stdinc.h
include/SDL_surface.h
include/SDL_system.h
include/SDL_syswm.h
include/SDL_test.h
include/SDL_test_assert.h
include/SDL_test_common.h
include/SDL_test_compare.h
include/SDL_test_crc32.h
include/SDL_test_font.h
include/SDL_test_fuzzer.h
include/SDL_test_harness.h
include/SDL_test_images.h
include/SDL_test_log.h
include/SDL_test_md5.h
include/SDL_test_random.h
include/SDL_thread.h
include/SDL_timer.h
include/SDL_touch.h
include/SDL_types.h
include/SDL_version.h
include/SDL_video.h
include/begin_code.h
include/close_code.h
src/SDL.c
src/SDL_error.c
src/SDL_error_c.h
src/SDL_hints.c
src/SDL_hints_c.h
src/SDL_log.c
src/atomic/SDL_atomic.c
src/atomic/SDL_spinlock.c
src/audio/SDL_audiocvt.c
src/audio/SDL_audiodev.c
src/audio/SDL_audiomem.h
src/audio/SDL_mixer.c
src/audio/SDL_sysaudio.h
src/audio/SDL_wave.h
src/audio/alsa/SDL_alsa_audio.c
src/audio/alsa/SDL_alsa_audio.h
src/audio/android/SDL_androidaudio.c
src/audio/android/SDL_androidaudio.h
src/audio/arts/SDL_artsaudio.h
src/audio/baudio/SDL_beaudio.h
src/audio/bsd/SDL_bsdaudio.h
src/audio/coreaudio/SDL_coreaudio.c
src/audio/coreaudio/SDL_coreaudio.h
src/audio/directsound/SDL_directsound.h
src/audio/directsound/directx.h
src/audio/disk/SDL_diskaudio.h
src/audio/dsp/SDL_dspaudio.c
src/audio/dsp/SDL_dspaudio.h
src/audio/dummy/SDL_dummyaudio.h
src/audio/esd/SDL_esdaudio.c
src/audio/esd/SDL_esdaudio.h
src/audio/fusionsound/SDL_fsaudio.c
src/audio/fusionsound/SDL_fsaudio.h
src/audio/nas/SDL_nasaudio.h
src/audio/paudio/SDL_paudio.c
src/audio/paudio/SDL_paudio.h
src/audio/psp/SDL_pspaudio.c
src/audio/psp/SDL_pspaudio.h
src/audio/pulseaudio/SDL_pulseaudio.c
src/audio/sun/SDL_sunaudio.c
src/audio/sun/SDL_sunaudio.h
src/audio/winmm/SDL_winmm.h
src/audio/xaudio2/SDL_xaudio2.c
src/core/android/SDL_android.cpp
src/events/SDL_events.c
src/events/SDL_gesture.c
src/events/SDL_keyboard.c
src/events/SDL_mouse.c
src/events/SDL_mouse_c.h
src/events/SDL_touch.c
src/events/SDL_touch_c.h
src/events/SDL_windowevents.c
src/events/blank_cursor.h
src/events/default_cursor.h
src/file/SDL_rwops.c
src/file/cocoa/SDL_rwopsbundlesupport.m
src/haptic/SDL_syshaptic.h
src/haptic/darwin/SDL_syshaptic.c
src/haptic/linux/SDL_syshaptic.c
src/haptic/windows/SDL_syshaptic.c
src/joystick/SDL_gamecontroller.c
src/joystick/SDL_joystick.c
src/joystick/SDL_joystick_c.h
src/joystick/android/SDL_sysjoystick.c
src/joystick/beos/SDL_bejoystick.cc
src/joystick/bsd/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick.c
src/joystick/darwin/SDL_sysjoystick_c.h
src/joystick/dummy/SDL_sysjoystick.c
src/joystick/iphoneos/SDLUIAccelerationDelegate.m
src/joystick/iphoneos/SDL_sysjoystick.m
src/joystick/linux/SDL_sysjoystick.c
src/joystick/psp/SDL_sysjoystick.c
src/joystick/windows/SDL_dxjoystick.c
src/joystick/windows/SDL_dxjoystick_c.h
src/joystick/windows/SDL_mmjoystick.c
src/main/beos/SDL_BApp.h
src/main/psp/SDL_psp_main.c
src/power/beos/SDL_syspower.c
src/power/linux/SDL_syspower.c
src/power/psp/SDL_syspower.c
src/power/uikit/SDL_syspower.m
src/render/SDL_render.c
src/render/SDL_yuv_mmx.c
src/render/SDL_yuv_sw.c
src/render/direct3d/SDL_render_d3d.c
src/render/opengl/SDL_render_gl.c
src/render/opengl/SDL_shaders_gl.c
src/render/opengles/SDL_render_gles.c
src/render/opengles2/SDL_render_gles2.c
src/render/opengles2/SDL_shaders_gles2.c
src/render/psp/SDL_render_psp.c
src/render/software/SDL_drawline.c
src/render/software/SDL_rotate.c
src/stdlib/SDL_malloc.c
src/test/SDL_test_assert.c
src/test/SDL_test_common.c
src/test/SDL_test_compare.c
src/test/SDL_test_crc32.c
src/test/SDL_test_font.c
src/test/SDL_test_fuzzer.c
src/test/SDL_test_harness.c
src/test/SDL_test_imageBlit.c
src/test/SDL_test_imageBlitBlend.c
src/test/SDL_test_imageFace.c
src/test/SDL_test_imagePrimitives.c
src/test/SDL_test_imagePrimitivesBlend.c
src/test/SDL_test_log.c
src/test/SDL_test_md5.c
src/test/SDL_test_random.c
src/thread/SDL_thread.c
src/thread/psp/SDL_syssem.c
src/thread/psp/SDL_systhread.c
src/thread/pthread/SDL_systhread.c
src/thread/windows/SDL_systhread.c
src/timer/SDL_timer.c
src/timer/SDL_timer_c.h
src/timer/psp/SDL_systimer.c
src/timer/unix/SDL_systimer.c
src/timer/windows/SDL_systimer.c
src/video/SDL_RLEaccel.c
src/video/SDL_blit.h
src/video/SDL_bmp.c
src/video/SDL_pixels.c
src/video/SDL_rect.c
src/video/SDL_shape.c
src/video/SDL_surface.c
src/video/SDL_sysvideo.h
src/video/SDL_video.c
src/video/android/SDL_androidkeyboard.c
src/video/android/SDL_androidtouch.c
src/video/android/SDL_androidvideo.c
src/video/android/SDL_androidwindow.c
src/video/bwindow/SDL_BWin.h
src/video/bwindow/SDL_bevents.h
src/video/bwindow/SDL_bmodes.cc
src/video/bwindow/SDL_bmodes.h
src/video/bwindow/SDL_bopengl.h
src/video/cocoa/SDL_cocoaclipboard.m
src/video/cocoa/SDL_cocoaevents.m
src/video/cocoa/SDL_cocoakeyboard.m
src/video/cocoa/SDL_cocoamodes.m
src/video/cocoa/SDL_cocoamouse.m
src/video/cocoa/SDL_cocoashape.h
src/video/cocoa/SDL_cocoashape.m
src/video/cocoa/SDL_cocoavideo.m
src/video/cocoa/SDL_cocoawindow.m
src/video/directfb/SDL_DirectFB_WM.c
src/video/directfb/SDL_DirectFB_dyn.c
src/video/directfb/SDL_DirectFB_dyn.h
src/video/directfb/SDL_DirectFB_events.c
src/video/directfb/SDL_DirectFB_modes.c
src/video/directfb/SDL_DirectFB_modes.h
src/video/directfb/SDL_DirectFB_mouse.c
src/video/directfb/SDL_DirectFB_mouse.h
src/video/directfb/SDL_DirectFB_opengl.c
src/video/directfb/SDL_DirectFB_opengl.h
src/video/directfb/SDL_DirectFB_render.c
src/video/directfb/SDL_DirectFB_shape.c
src/video/directfb/SDL_DirectFB_shape.h
src/video/directfb/SDL_DirectFB_video.c
src/video/directfb/SDL_DirectFB_video.h
src/video/directfb/SDL_DirectFB_window.c
src/video/directfb/SDL_DirectFB_window.h
src/video/pandora/SDL_pandora.c
src/video/psp/SDL_pspevents.c
src/video/psp/SDL_pspevents_c.h
src/video/psp/SDL_pspgl.c
src/video/psp/SDL_pspgl_c.h
src/video/psp/SDL_pspmouse.c
src/video/psp/SDL_pspvideo.c
src/video/psp/SDL_pspvideo.h
src/video/uikit/SDL_uikitappdelegate.m
src/video/uikit/SDL_uikitmessagebox.m
src/video/uikit/SDL_uikitmodes.m
src/video/uikit/SDL_uikitopengles.m
src/video/uikit/SDL_uikitopenglview.m
src/video/uikit/SDL_uikitvideo.h
src/video/uikit/SDL_uikitview.m
src/video/uikit/SDL_uikitviewcontroller.m
src/video/uikit/SDL_uikitwindow.m
src/video/windows/SDL_vkeys.h
src/video/windows/SDL_windowsclipboard.c
src/video/windows/SDL_windowsevents.c
src/video/windows/SDL_windowsframebuffer.c
src/video/windows/SDL_windowskeyboard.c
src/video/windows/SDL_windowsmessagebox.c
src/video/windows/SDL_windowsmouse.c
src/video/windows/SDL_windowsopengl.c
src/video/windows/SDL_windowsshape.c
src/video/windows/SDL_windowsshape.h
src/video/windows/SDL_windowsvideo.c
src/video/windows/SDL_windowsvideo.h
src/video/windows/SDL_windowswindow.c
src/video/windows/wmmsg.h
src/video/x11/SDL_x11clipboard.c
src/video/x11/SDL_x11dyn.c
src/video/x11/SDL_x11events.c
src/video/x11/SDL_x11framebuffer.c
src/video/x11/SDL_x11messagebox.c
src/video/x11/SDL_x11modes.c
src/video/x11/SDL_x11mouse.c
src/video/x11/SDL_x11opengl.c
src/video/x11/SDL_x11opengles.c
src/video/x11/SDL_x11shape.c
src/video/x11/SDL_x11shape.h
src/video/x11/SDL_x11video.c
src/video/x11/SDL_x11video.h
src/video/x11/SDL_x11window.c
src/video/x11/SDL_x11xinput2.c
src/video/x11/SDL_x11xinput2.h
test/automated/common/common.h
test/automated/rwops/TestSupportRWops_Cocoa.m
test/automated/rwops/TestSupportRWops_Generic.c
test/automated/surface/surface.c
test/checkkeys.c
test/loopwave.c
test/test-automation/include/SDL_test.h
test/test-automation/src/libSDLtest/SDL_test.c
test/test-automation/src/libSDLtest/common/common.h
test/test-automation/src/libSDLtest/fuzzer/fuzzer.c
test/test-automation/src/libSDLtest/fuzzer/fuzzer.h
test/test-automation/src/libSDLtest/fuzzer/utl_crc32.c
test/test-automation/src/libSDLtest/fuzzer/utl_crc32.h
test/test-automation/src/libSDLtest/fuzzer/utl_md5.c
test/test-automation/src/libSDLtest/fuzzer/utl_md5.h
test/test-automation/src/libSDLtest/fuzzer/utl_random.c
test/test-automation/src/libSDLtest/fuzzer/utl_random.h
test/test-automation/src/libSDLtest/logger_helpers.c
test/test-automation/src/libSDLtest/plain_logger.c
test/test-automation/src/libSDLtest/plain_logger.h
test/test-automation/src/libSDLtest/xml.c
test/test-automation/src/libSDLtest/xml.h
test/test-automation/src/libSDLtest/xml_logger.c
test/test-automation/src/libSDLtest/xml_logger.h
test/test-automation/src/runner/logger.h
test/test-automation/src/runner/runner.c
test/test-automation/src/runner/support.c
test/test-automation/tests/testaudio/testaudio.c
test/test-automation/tests/testclipboard/testclipboard.c
test/test-automation/tests/testdummy/testdummy.c
test/test-automation/tests/testevents/testevents.c
test/test-automation/tests/testkeyboard/testkeyboard.c
test/test-automation/tests/testplatform/testplatform.c
test/test-automation/tests/testrect/testrect.c
test/test-automation/tests/testrender/testrender.c
test/test-automation/tests/testrwops/testrwops.c
test/test-automation/tests/testsurface/testsurface.c
test/test-automation/tests/testsyswm/testsyswm.c
test/test-automation/tests/testvideo/testvideo.c
test/testatomic.c
test/testautomation.c
test/testautomation_audio.c
test/testautomation_clipboard.c
test/testautomation_events.c
test/testautomation_keyboard.c
test/testautomation_main.c
test/testautomation_mouse.c
test/testautomation_pixels.c
test/testautomation_platform.c
test/testautomation_rect.c
test/testautomation_render.c
test/testautomation_rwops.c
test/testautomation_sdltest.c
test/testautomation_suites.h
test/testautomation_surface.c
test/testautomation_syswm.c
test/testautomation_timer.c
test/testautomation_video.c
test/testdraw2.c
test/testfile.c
test/testgamecontroller.c
test/testgesture.c
test/testime.c
test/testintersections.c
test/testjoystick.c
test/testlock.c
test/testnative.c
test/testrelative.c
test/testsem.c
test/testshader.c
test/testshape.c
test/testtimer.c
test/testwm2.c
     1.1 --- a/Xcode-iOS/Demos/src/accelerometer.c	Sat May 18 12:48:50 2013 -0700
     1.2 +++ b/Xcode-iOS/Demos/src/accelerometer.c	Sat May 18 14:17:52 2013 -0700
     1.3 @@ -1,7 +1,7 @@
     1.4  /*
     1.5 - *	accelerometer.c
     1.6 - *	written by Holmes Futrell
     1.7 - *	use however you want
     1.8 + *  accelerometer.c
     1.9 + *  written by Holmes Futrell
    1.10 + *  use however you want
    1.11   */
    1.12  
    1.13  #include "SDL.h"
    1.14 @@ -13,7 +13,7 @@
    1.15  #define FRICTION 0.0008f        /* coefficient of acceleration that opposes direction of motion */
    1.16  #define GRAVITY_CONSTANT 0.004f /* how sensitive the ship is to the accelerometer */
    1.17  
    1.18 -/*	If we aren't on an iPhone, then this definition ought to yield reasonable behavior */
    1.19 +/*  If we aren't on an iPhone, then this definition ought to yield reasonable behavior */
    1.20  #ifndef SDL_IPHONE_MAX_GFORCE
    1.21  #define SDL_IPHONE_MAX_GFORCE 5.0f
    1.22  #endif
    1.23 @@ -48,7 +48,7 @@
    1.24  #define SINT16_MAX ((float)(0x7FFF))
    1.25  
    1.26      /* update velocity from accelerometer
    1.27 -       the factor SDL_IPHONE_MAX_G_FORCE / SINT16_MAX converts between 
    1.28 +       the factor SDL_IPHONE_MAX_G_FORCE / SINT16_MAX converts between
    1.29         SDL's units reported from the joytick, and units of g-force, as reported by the accelerometer
    1.30       */
    1.31      shipData.vx +=
    1.32 @@ -159,7 +159,7 @@
    1.33  {
    1.34  
    1.35      SDL_Window *window;         /* main window */
    1.36 -	SDL_Renderer *renderer;
    1.37 +    SDL_Renderer *renderer;
    1.38      Uint32 startFrame;          /* time frame began to process */
    1.39      Uint32 endFrame;            /* time frame ended processing */
    1.40      Uint32 delay;               /* time to pause waiting to draw next frame */
     2.1 --- a/Xcode-iOS/Demos/src/common.c	Sat May 18 12:48:50 2013 -0700
     2.2 +++ b/Xcode-iOS/Demos/src/common.c	Sat May 18 14:17:52 2013 -0700
     2.3 @@ -1,7 +1,7 @@
     2.4  /*
     2.5 - *	common.c
     2.6 - *	written by Holmes Futrell
     2.7 - *	use however you want
     2.8 + *  common.c
     2.9 + *  written by Holmes Futrell
    2.10 + *  use however you want
    2.11   */
    2.12  
    2.13  #include "common.h"
    2.14 @@ -9,8 +9,8 @@
    2.15  #include <stdlib.h>
    2.16  
    2.17  /*
    2.18 -	Produces a random int x, min <= x <= max 
    2.19 -	following a uniform distribution
    2.20 +    Produces a random int x, min <= x <= max
    2.21 +    following a uniform distribution
    2.22  */
    2.23  int
    2.24  randomInt(int min, int max)
    2.25 @@ -19,8 +19,8 @@
    2.26  }
    2.27  
    2.28  /*
    2.29 -	Produces a random float x, min <= x <= max 
    2.30 -	following a uniform distribution
    2.31 +    Produces a random float x, min <= x <= max
    2.32 +    following a uniform distribution
    2.33   */
    2.34  float
    2.35  randomFloat(float min, float max)
     3.1 --- a/Xcode-iOS/Demos/src/common.h	Sat May 18 12:48:50 2013 -0700
     3.2 +++ b/Xcode-iOS/Demos/src/common.h	Sat May 18 14:17:52 2013 -0700
     3.3 @@ -1,7 +1,7 @@
     3.4  /*
     3.5 - *	common.h
     3.6 - *	written by Holmes Futrell
     3.7 - *	use however you want
     3.8 + *  common.h
     3.9 + *  written by Holmes Futrell
    3.10 + *  use however you want
    3.11   */
    3.12  
    3.13  #define SCREEN_WIDTH 320
     4.1 --- a/Xcode-iOS/Demos/src/fireworks.c	Sat May 18 12:48:50 2013 -0700
     4.2 +++ b/Xcode-iOS/Demos/src/fireworks.c	Sat May 18 14:17:52 2013 -0700
     4.3 @@ -1,7 +1,7 @@
     4.4  /*
     4.5 - *	fireworks.c
     4.6 - *	written by Holmes Futrell
     4.7 - *	use however you want
     4.8 + *  fireworks.c
     4.9 + *  written by Holmes Futrell
    4.10 + *  use however you want
    4.11   */
    4.12  
    4.13  #include "SDL.h"
    4.14 @@ -17,11 +17,11 @@
    4.15  
    4.16  static GLuint particleTextureID;        /* OpenGL particle texture id */
    4.17  static SDL_bool pointSizeExtensionSupported;    /* is GL_OES_point_size_array supported ? */
    4.18 -/* 
    4.19 -	used to describe what type of particle a given struct particle is.
    4.20 -	emitter - this particle flies up, shooting off trail particles, then finally explodes into dust particles.
    4.21 -	trail	- shoots off, following emitter particle
    4.22 -	dust	- radiates outwards from emitter explosion
    4.23 +/*
    4.24 +    used to describe what type of particle a given struct particle is.
    4.25 +    emitter - this particle flies up, shooting off trail particles, then finally explodes into dust particles.
    4.26 +    trail   - shoots off, following emitter particle
    4.27 +    dust    - radiates outwards from emitter explosion
    4.28  */
    4.29  enum particleType
    4.30  {
    4.31 @@ -30,7 +30,7 @@
    4.32      dust
    4.33  };
    4.34  /*
    4.35 -	struct particle is used to describe each particle displayed on screen
    4.36 +    struct particle is used to describe each particle displayed on screen
    4.37  */
    4.38  struct particle
    4.39  {
    4.40 @@ -57,8 +57,8 @@
    4.41  void drawParticles();
    4.42  void stepParticles(void);
    4.43  
    4.44 -/*	helper function (used in texture loading)
    4.45 -	returns next power of two greater than or equal to x
    4.46 +/*  helper function (used in texture loading)
    4.47 +    returns next power of two greater than or equal to x
    4.48  */
    4.49  int
    4.50  nextPowerOfTwo(int x)
    4.51 @@ -70,8 +70,8 @@
    4.52      return val;
    4.53  }
    4.54  
    4.55 -/*	
    4.56 -	steps each active particle by timestep MILLESECONDS_PER_FRAME
    4.57 +/*
    4.58 +    steps each active particle by timestep MILLESECONDS_PER_FRAME
    4.59  */
    4.60  void
    4.61  stepParticles(void)
    4.62 @@ -145,13 +145,13 @@
    4.63          curr++;
    4.64      }
    4.65      /* the number of active particles is computed as the difference between
    4.66 -       old number of active particles, where slot points, and the 
    4.67 +       old number of active particles, where slot points, and the
    4.68         new size of the array, where particles points */
    4.69      num_active_particles = slot - particles;
    4.70  }
    4.71  
    4.72  /*
    4.73 -	This draws all the particles shown on screen
    4.74 +    This draws all the particles shown on screen
    4.75  */
    4.76  void
    4.77  drawParticles()
    4.78 @@ -177,7 +177,7 @@
    4.79  }
    4.80  
    4.81  /*
    4.82 -	This causes an emitter to explode in a circular bloom of dust particles
    4.83 +    This causes an emitter to explode in a circular bloom of dust particles
    4.84  */
    4.85  void
    4.86  explodeEmitter(struct particle *emitter)
    4.87 @@ -219,7 +219,7 @@
    4.88  }
    4.89  
    4.90  /*
    4.91 -	This spawns a trail particle from an emitter
    4.92 +    This spawns a trail particle from an emitter
    4.93  */
    4.94  void
    4.95  spawnTrailFromEmitter(struct particle *emitter)
    4.96 @@ -254,7 +254,7 @@
    4.97  }
    4.98  
    4.99  /*
   4.100 -	spawns a new emitter particle at the bottom of the screen
   4.101 +    spawns a new emitter particle at the bottom of the screen
   4.102      destined for the point (x,y).
   4.103  */
   4.104  void
   4.105 @@ -313,7 +313,7 @@
   4.106  }
   4.107  
   4.108  /*
   4.109 -	loads the particle texture
   4.110 +    loads the particle texture
   4.111   */
   4.112  void
   4.113  initializeTexture()
   4.114 @@ -375,7 +375,7 @@
   4.115      }
   4.116      /* seed the random number generator */
   4.117      srand(time(NULL));
   4.118 -    /*      
   4.119 +    /*
   4.120         request some OpenGL parameters
   4.121         that may speed drawing
   4.122       */
     5.1 --- a/Xcode-iOS/Demos/src/happy.c	Sat May 18 12:48:50 2013 -0700
     5.2 +++ b/Xcode-iOS/Demos/src/happy.c	Sat May 18 14:17:52 2013 -0700
     5.3 @@ -1,7 +1,7 @@
     5.4  /*
     5.5 - *	happy.c
     5.6 - *	written by Holmes Futrell
     5.7 - *	use however you want
     5.8 + *  happy.c
     5.9 + *  written by Holmes Futrell
    5.10 + *  use however you want
    5.11   */
    5.12  
    5.13  #include "SDL.h"
    5.14 @@ -20,8 +20,8 @@
    5.15  } faces[NUM_HAPPY_FACES];
    5.16  
    5.17  /*
    5.18 -	Sets initial positions and velocities of happyfaces
    5.19 -	units of velocity are pixels per millesecond
    5.20 +    Sets initial positions and velocities of happyfaces
    5.21 +    units of velocity are pixels per millesecond
    5.22  */
    5.23  void
    5.24  initializeHappyFaces()
    5.25 @@ -94,7 +94,7 @@
    5.26  }
    5.27  
    5.28  /*
    5.29 -	loads the happyface graphic into a texture
    5.30 +    loads the happyface graphic into a texture
    5.31  */
    5.32  void
    5.33  initializeTexture(SDL_Renderer *renderer)
    5.34 @@ -125,7 +125,7 @@
    5.35  {
    5.36  
    5.37      SDL_Window *window;
    5.38 -	SDL_Renderer *renderer;
    5.39 +    SDL_Renderer *renderer;
    5.40      Uint32 startFrame;
    5.41      Uint32 endFrame;
    5.42      Uint32 delay;
     6.1 --- a/Xcode-iOS/Demos/src/keyboard.c	Sat May 18 12:48:50 2013 -0700
     6.2 +++ b/Xcode-iOS/Demos/src/keyboard.c	Sat May 18 14:17:52 2013 -0700
     6.3 @@ -1,7 +1,7 @@
     6.4  /*
     6.5 - *	keyboard.c
     6.6 - *	written by Holmes Futrell
     6.7 - *	use however you want
     6.8 + *  keyboard.c
     6.9 + *  written by Holmes Futrell
    6.10 + *  use however you want
    6.11   */
    6.12  
    6.13  #import "SDL.h"
    6.14 @@ -97,14 +97,14 @@
    6.15  };
    6.16  
    6.17  /*
    6.18 -	This function maps an SDL_KeySym to an index in the bitmap font.
    6.19 -	It does so by scanning through the font mapping table one entry
    6.20 -	at a time.
    6.21 - 
    6.22 -	If a match is found (scancode and allowed modifiers), the proper
    6.23 -	index is returned.
    6.24 - 
    6.25 -	If there is no entry for the key, -1 is returned
    6.26 +    This function maps an SDL_KeySym to an index in the bitmap font.
    6.27 +    It does so by scanning through the font mapping table one entry
    6.28 +    at a time.
    6.29 +
    6.30 +    If a match is found (scancode and allowed modifiers), the proper
    6.31 +    index is returned.
    6.32 +
    6.33 +    If there is no entry for the key, -1 is returned
    6.34  */
    6.35  int
    6.36  keyToIndex(SDL_Keysym key)
    6.37 @@ -125,8 +125,8 @@
    6.38      return index;
    6.39  }
    6.40  
    6.41 -/* 
    6.42 -	This function returns and x,y position for a given character number.
    6.43 +/*
    6.44 +    This function returns and x,y position for a given character number.
    6.45      It is used for positioning each character of text
    6.46  */
    6.47  void
     7.1 --- a/Xcode-iOS/Demos/src/mixer.c	Sat May 18 12:48:50 2013 -0700
     7.2 +++ b/Xcode-iOS/Demos/src/mixer.c	Sat May 18 14:17:52 2013 -0700
     7.3 @@ -1,7 +1,7 @@
     7.4  /*
     7.5 - *	mixer.c
     7.6 - *	written by Holmes Futrell
     7.7 - *	use however you want
     7.8 + *  mixer.c
     7.9 + *  written by Holmes Futrell
    7.10 + *  use however you want
    7.11   */
    7.12  
    7.13  #import "SDL.h"
    7.14 @@ -100,7 +100,7 @@
    7.15      if (result == -1) {
    7.16          fatalError("could not build audio CVT");
    7.17      } else if (result != 0) {
    7.18 -        /* 
    7.19 +        /*
    7.20             this happens when the .wav format differs from the output format.
    7.21             we convert the .wav buffer here
    7.22           */
    7.23 @@ -179,8 +179,8 @@
    7.24  }
    7.25  
    7.26  /*
    7.27 -	finds a sound channel in the mixer for a sound
    7.28 -	and sets it up to start playing
    7.29 +    finds a sound channel in the mixer for a sound
    7.30 +    and sets it up to start playing
    7.31  */
    7.32  int
    7.33  playSound(struct sound *s)
    7.34 @@ -225,9 +225,9 @@
    7.35      return selected_channel;
    7.36  }
    7.37  
    7.38 -/* 
    7.39 -	Called from SDL's audio system.  Supplies sound input with data by mixing together all
    7.40 -	currently playing sound effects.
    7.41 +/*
    7.42 +    Called from SDL's audio system.  Supplies sound input with data by mixing together all
    7.43 +    currently playing sound effects.
    7.44  */
    7.45  void
    7.46  audioCallback(void *userdata, Uint8 * stream, int len)
    7.47 @@ -273,7 +273,7 @@
    7.48  
    7.49      int done;                   /* has user tried to quit ? */
    7.50      SDL_Window *window;         /* main window */
    7.51 -	SDL_Renderer *renderer;
    7.52 +    SDL_Renderer *renderer;
    7.53      SDL_Event event;
    7.54      Uint32 startFrame;          /* holds when frame started processing */
    7.55      Uint32 endFrame;            /* holds when frame ended processing */
     8.1 --- a/Xcode-iOS/Demos/src/rectangles.c	Sat May 18 12:48:50 2013 -0700
     8.2 +++ b/Xcode-iOS/Demos/src/rectangles.c	Sat May 18 14:17:52 2013 -0700
     8.3 @@ -1,7 +1,7 @@
     8.4  /*
     8.5 - *	rectangles.c
     8.6 - *	written by Holmes Futrell
     8.7 - *	use however you want
     8.8 + *  rectangles.c
     8.9 + *  written by Holmes Futrell
    8.10 + *  use however you want
    8.11  */
    8.12  
    8.13  #include "SDL.h"
    8.14 @@ -39,7 +39,7 @@
    8.15  {
    8.16  
    8.17      SDL_Window *window;
    8.18 -	SDL_Renderer *renderer;
    8.19 +    SDL_Renderer *renderer;
    8.20      int done;
    8.21      SDL_Event event;
    8.22  
    8.23 @@ -59,7 +59,7 @@
    8.24          fatalError("Could not initialize Window");
    8.25      }
    8.26      renderer = SDL_CreateRenderer(window, -1, 0);
    8.27 -	if (!renderer) {
    8.28 +    if (!renderer) {
    8.29          fatalError("Could not create renderer");
    8.30      }
    8.31  
     9.1 --- a/Xcode-iOS/Demos/src/touch.c	Sat May 18 12:48:50 2013 -0700
     9.2 +++ b/Xcode-iOS/Demos/src/touch.c	Sat May 18 14:17:52 2013 -0700
     9.3 @@ -1,7 +1,7 @@
     9.4  /*
     9.5 - *	touch.c
     9.6 - *	written by Holmes Futrell
     9.7 - *	use however you want
     9.8 + *  touch.c
     9.9 + *  written by Holmes Futrell
    9.10 + *  use however you want
    9.11   */
    9.12  
    9.13  #include "SDL.h"
    9.14 @@ -14,8 +14,8 @@
    9.15  static SDL_Texture *brush = 0;       /* texture for the brush */
    9.16  
    9.17  /*
    9.18 -	draws a line from (startx, starty) to (startx + dx, starty + dy)
    9.19 -	this is accomplished by drawing several blots spaced PIXELS_PER_ITERATION apart
    9.20 +    draws a line from (startx, starty) to (startx + dx, starty + dy)
    9.21 +    this is accomplished by drawing several blots spaced PIXELS_PER_ITERATION apart
    9.22  */
    9.23  void
    9.24  drawLine(SDL_Renderer *renderer, float startx, float starty, float dx, float dy)
    9.25 @@ -48,7 +48,7 @@
    9.26  }
    9.27  
    9.28  /*
    9.29 -	loads the brush texture
    9.30 +    loads the brush texture
    9.31  */
    9.32  void
    9.33  initializeTexture(SDL_Renderer *renderer)
    9.34 @@ -78,7 +78,7 @@
    9.35      Uint8 state;                /* mouse (touch) state */
    9.36      SDL_Event event;
    9.37      SDL_Window *window;         /* main window */
    9.38 -	SDL_Renderer *renderer;
    9.39 +    SDL_Renderer *renderer;
    9.40      int done;                   /* does user want to quit? */
    9.41  
    9.42      /* initialize SDL */
    10.1 --- a/Xcode-iOS/Template/SDL iOS Application/main.c	Sat May 18 12:48:50 2013 -0700
    10.2 +++ b/Xcode-iOS/Template/SDL iOS Application/main.c	Sat May 18 14:17:52 2013 -0700
    10.3 @@ -1,7 +1,7 @@
    10.4  /*
    10.5 - *	rectangles.c
    10.6 - *	written by Holmes Futrell
    10.7 - *	use however you want
    10.8 + *  rectangles.c
    10.9 + *  written by Holmes Futrell
   10.10 + *  use however you want
   10.11   */
   10.12  
   10.13  #include "SDL.h"
    11.1 --- a/Xcode/TemplatesForXcodeLeopard/SDL Application/main.c	Sat May 18 12:48:50 2013 -0700
    11.2 +++ b/Xcode/TemplatesForXcodeLeopard/SDL Application/main.c	Sat May 18 14:17:52 2013 -0700
    11.3 @@ -4,7 +4,7 @@
    11.4     Please see the SDL documentation for details on using the SDL API:
    11.5     /Developer/Documentation/SDL/docs.html
    11.6  */
    11.7 -   
    11.8 +
    11.9  #include <stdio.h>
   11.10  #include <stdlib.h>
   11.11  #include <string.h>
   11.12 @@ -14,52 +14,52 @@
   11.13  
   11.14  int main(int argc, char *argv[])
   11.15  {
   11.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   11.17 -	SDL_Surface *screen;
   11.18 -	Uint8  video_bpp = 0;
   11.19 -	Uint32 videoflags = SDL_SWSURFACE;
   11.20 -	int    done;
   11.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   11.22 +    SDL_Surface *screen;
   11.23 +    Uint8  video_bpp = 0;
   11.24 +    Uint32 videoflags = SDL_SWSURFACE;
   11.25 +    int    done;
   11.26          SDL_Event event;
   11.27  
   11.28 -	/* Initialize the SDL library */
   11.29 -	if ( SDL_Init(initflags) < 0 ) {
   11.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   11.31 -			SDL_GetError());
   11.32 -		exit(1);
   11.33 -	}
   11.34 +    /* Initialize the SDL library */
   11.35 +    if ( SDL_Init(initflags) < 0 ) {
   11.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   11.37 +            SDL_GetError());
   11.38 +        exit(1);
   11.39 +    }
   11.40  
   11.41 -	/* Set 640x480 video mode */
   11.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   11.43 +    /* Set 640x480 video mode */
   11.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   11.45          if (screen == NULL) {
   11.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   11.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   11.48                          video_bpp, SDL_GetError());
   11.49 -		SDL_Quit();
   11.50 -		exit(2);
   11.51 -	}
   11.52 +        SDL_Quit();
   11.53 +        exit(2);
   11.54 +    }
   11.55  
   11.56 -	done = 0;
   11.57 -	while ( !done ) {
   11.58 +    done = 0;
   11.59 +    while ( !done ) {
   11.60  
   11.61 -		/* Check for events */
   11.62 -		while ( SDL_PollEvent(&event) ) {
   11.63 -			switch (event.type) {
   11.64 +        /* Check for events */
   11.65 +        while ( SDL_PollEvent(&event) ) {
   11.66 +            switch (event.type) {
   11.67  
   11.68 -				case SDL_MOUSEMOTION:
   11.69 -					break;
   11.70 -				case SDL_MOUSEBUTTONDOWN:
   11.71 -					break;
   11.72 -				case SDL_KEYDOWN:
   11.73 -					/* Any keypress quits the app... */
   11.74 -				case SDL_QUIT:
   11.75 -					done = 1;
   11.76 -					break;
   11.77 -				default:
   11.78 -					break;
   11.79 -			}
   11.80 -		}
   11.81 -	}
   11.82 -	
   11.83 -	/* Clean up the SDL library */
   11.84 -	SDL_Quit();
   11.85 -	return(0);
   11.86 +                case SDL_MOUSEMOTION:
   11.87 +                    break;
   11.88 +                case SDL_MOUSEBUTTONDOWN:
   11.89 +                    break;
   11.90 +                case SDL_KEYDOWN:
   11.91 +                    /* Any keypress quits the app... */
   11.92 +                case SDL_QUIT:
   11.93 +                    done = 1;
   11.94 +                    break;
   11.95 +                default:
   11.96 +                    break;
   11.97 +            }
   11.98 +        }
   11.99 +    }
  11.100 +
  11.101 +    /* Clean up the SDL library */
  11.102 +    SDL_Quit();
  11.103 +    return(0);
  11.104  }
    12.1 --- a/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c	Sat May 18 12:48:50 2013 -0700
    12.2 +++ b/Xcode/TemplatesForXcodeLeopard/SDL Cocoa Application/main.c	Sat May 18 14:17:52 2013 -0700
    12.3 @@ -4,7 +4,7 @@
    12.4     Please see the SDL documentation for details on using the SDL API:
    12.5     /Developer/Documentation/SDL/docs.html
    12.6  */
    12.7 -   
    12.8 +
    12.9  #include <stdio.h>
   12.10  #include <stdlib.h>
   12.11  #include <string.h>
   12.12 @@ -14,52 +14,52 @@
   12.13  
   12.14  int main(int argc, char *argv[])
   12.15  {
   12.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   12.17 -	SDL_Surface *screen;
   12.18 -	Uint8  video_bpp = 0;
   12.19 -	Uint32 videoflags = SDL_SWSURFACE;
   12.20 -	int    done;
   12.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   12.22 +    SDL_Surface *screen;
   12.23 +    Uint8  video_bpp = 0;
   12.24 +    Uint32 videoflags = SDL_SWSURFACE;
   12.25 +    int    done;
   12.26          SDL_Event event;
   12.27  
   12.28 -	/* Initialize the SDL library */
   12.29 -	if ( SDL_Init(initflags) < 0 ) {
   12.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   12.31 -			SDL_GetError());
   12.32 -		exit(1);
   12.33 -	}
   12.34 +    /* Initialize the SDL library */
   12.35 +    if ( SDL_Init(initflags) < 0 ) {
   12.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   12.37 +            SDL_GetError());
   12.38 +        exit(1);
   12.39 +    }
   12.40  
   12.41 -	/* Set 640x480 video mode */
   12.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   12.43 +    /* Set 640x480 video mode */
   12.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   12.45          if (screen == NULL) {
   12.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   12.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   12.48                          video_bpp, SDL_GetError());
   12.49 -		SDL_Quit();
   12.50 -		exit(2);
   12.51 -	}
   12.52 +        SDL_Quit();
   12.53 +        exit(2);
   12.54 +    }
   12.55  
   12.56 -	done = 0;
   12.57 -	while ( !done ) {
   12.58 +    done = 0;
   12.59 +    while ( !done ) {
   12.60  
   12.61 -		/* Check for events */
   12.62 -		while ( SDL_PollEvent(&event) ) {
   12.63 -			switch (event.type) {
   12.64 +        /* Check for events */
   12.65 +        while ( SDL_PollEvent(&event) ) {
   12.66 +            switch (event.type) {
   12.67  
   12.68 -				case SDL_MOUSEMOTION:
   12.69 -					break;
   12.70 -				case SDL_MOUSEBUTTONDOWN:
   12.71 -					break;
   12.72 -				case SDL_KEYDOWN:
   12.73 -					/* Any keypress quits the app... */
   12.74 -				case SDL_QUIT:
   12.75 -					done = 1;
   12.76 -					break;
   12.77 -				default:
   12.78 -					break;
   12.79 -			}
   12.80 -		}
   12.81 -	}
   12.82 -	
   12.83 -	/* Clean up the SDL library */
   12.84 -	SDL_Quit();
   12.85 -	return(0);
   12.86 +                case SDL_MOUSEMOTION:
   12.87 +                    break;
   12.88 +                case SDL_MOUSEBUTTONDOWN:
   12.89 +                    break;
   12.90 +                case SDL_KEYDOWN:
   12.91 +                    /* Any keypress quits the app... */
   12.92 +                case SDL_QUIT:
   12.93 +                    done = 1;
   12.94 +                    break;
   12.95 +                default:
   12.96 +                    break;
   12.97 +            }
   12.98 +        }
   12.99 +    }
  12.100 +
  12.101 +    /* Clean up the SDL library */
  12.102 +    SDL_Quit();
  12.103 +    return(0);
  12.104  }
    13.1 --- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 12:48:50 2013 -0700
    13.2 +++ b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 14:17:52 2013 -0700
    13.3 @@ -63,37 +63,37 @@
    13.4  {
    13.5     struct timeval tk_time;
    13.6     struct timezone tz;
    13.7 -   
    13.8 +
    13.9     gettimeofday(&tk_time, &tz);
   13.10 -   
   13.11 +
   13.12     return 4294.967296 * tk_time.tv_sec + 0.000001 * tk_time.tv_usec;
   13.13  }
   13.14  
   13.15  static double filter(double in, double *save)
   13.16  {
   13.17 -	static double k1 = 0.9;
   13.18 -	static double k2 = 0.05;
   13.19 +    static double k1 = 0.9;
   13.20 +    static double k2 = 0.05;
   13.21  
   13.22 -	save[3] = in;
   13.23 -	save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   13.24 +    save[3] = in;
   13.25 +    save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   13.26  
   13.27 -	save[0]=save[1];
   13.28 -	save[2]=save[3];
   13.29 +    save[0]=save[1];
   13.30 +    save[2]=save[3];
   13.31  
   13.32 -	return(save[1]);
   13.33 +    return(save[1]);
   13.34  }
   13.35  
   13.36  void DrawStr(const char *str)
   13.37  {
   13.38 -	GLint i = 0;
   13.39 -	
   13.40 -	if(!str) return;
   13.41 -        
   13.42 -	while(str[i])
   13.43 -	{
   13.44 -		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   13.45 -		i++;
   13.46 -	}
   13.47 +    GLint i = 0;
   13.48 +
   13.49 +    if(!str) return;
   13.50 +
   13.51 +    while(str[i])
   13.52 +    {
   13.53 +        glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   13.54 +        i++;
   13.55 +    }
   13.56  }
   13.57  
   13.58  void
   13.59 @@ -168,9 +168,9 @@
   13.60      InitFishs();
   13.61  
   13.62      glEnable(GL_FOG);
   13.63 -	glFogi(GL_FOG_MODE, GL_EXP);
   13.64 -	glFogf(GL_FOG_DENSITY, 0.0000025);
   13.65 -	glFogfv(GL_FOG_COLOR, fog_color);
   13.66 +    glFogi(GL_FOG_MODE, GL_EXP);
   13.67 +    glFogf(GL_FOG_DENSITY, 0.0000025);
   13.68 +    glFogfv(GL_FOG_COLOR, fog_color);
   13.69  
   13.70      glClearColor(0.0, 0.5, 0.9, 1.0);
   13.71  }
   13.72 @@ -178,9 +178,9 @@
   13.73  void
   13.74  Atlantis_Reshape(int width, int height)
   13.75  {
   13.76 -	w_win = width;
   13.77 -	h_win = height;
   13.78 -	
   13.79 +    w_win = width;
   13.80 +    h_win = height;
   13.81 +
   13.82      glViewport(0, 0, width, height);
   13.83  
   13.84      glMatrixMode(GL_PROJECTION);
   13.85 @@ -212,37 +212,37 @@
   13.86  {
   13.87      switch (key) {
   13.88      case 't':
   13.89 -    	Timing = !Timing;
   13.90 +        Timing = !Timing;
   13.91      break;
   13.92      case ' ':
   13.93 -    	switch(StrMode)
   13.94 -    	{
   13.95 -		    case GL_EXTENSIONS:
   13.96 -    			StrMode = GL_VENDOR;
   13.97 -		    break;
   13.98 -		    case GL_VENDOR:
   13.99 -		    	StrMode = GL_RENDERER;
  13.100 -		    break;
  13.101 -		    case GL_RENDERER:
  13.102 -		    	StrMode = GL_VERSION;
  13.103 -		    break;
  13.104 -		    case GL_VERSION:
  13.105 -		    	StrMode = GL_EXTENSIONS;
  13.106 -		    break;
  13.107 -		}
  13.108 -	break;
  13.109 +        switch(StrMode)
  13.110 +        {
  13.111 +            case GL_EXTENSIONS:
  13.112 +                StrMode = GL_VENDOR;
  13.113 +            break;
  13.114 +            case GL_VENDOR:
  13.115 +                StrMode = GL_RENDERER;
  13.116 +            break;
  13.117 +            case GL_RENDERER:
  13.118 +                StrMode = GL_VERSION;
  13.119 +            break;
  13.120 +            case GL_VERSION:
  13.121 +                StrMode = GL_EXTENSIONS;
  13.122 +            break;
  13.123 +        }
  13.124 +    break;
  13.125      case 27:           /* Esc will quit */
  13.126          exit(1);
  13.127      break;
  13.128 -    case 's':             		/* "s" start animation */
  13.129 +    case 's':                   /* "s" start animation */
  13.130          moving = GL_TRUE;
  13.131          //glutIdleFunc(Animate);
  13.132      break;
  13.133 -    case 'a':          			/* "a" stop animation */
  13.134 +    case 'a':                   /* "a" stop animation */
  13.135          moving = GL_FALSE;
  13.136          //glutIdleFunc(NULL);
  13.137      break;
  13.138 -    case '.':          			/* "." will advance frame */
  13.139 +    case '.':                   /* "." will advance frame */
  13.140          if (!moving) {
  13.141              Atlantis_Animate();
  13.142          }
  13.143 @@ -251,21 +251,21 @@
  13.144  /*
  13.145  void Display(void)
  13.146  {
  13.147 -	static float P123[3] = {-448.94, -203.14, 9499.60};
  13.148 -	static float P124[3] = {-442.64, -185.20, 9528.07};
  13.149 -	static float P125[3] = {-441.07, -148.05, 9528.07};
  13.150 -	static float P126[3] = {-443.43, -128.84, 9499.60};
  13.151 -	static float P127[3] = {-456.87, -146.78, 9466.67};
  13.152 -	static float P128[3] = {-453.68, -183.93, 9466.67};
  13.153 +    static float P123[3] = {-448.94, -203.14, 9499.60};
  13.154 +    static float P124[3] = {-442.64, -185.20, 9528.07};
  13.155 +    static float P125[3] = {-441.07, -148.05, 9528.07};
  13.156 +    static float P126[3] = {-443.43, -128.84, 9499.60};
  13.157 +    static float P127[3] = {-456.87, -146.78, 9466.67};
  13.158 +    static float P128[3] = {-453.68, -183.93, 9466.67};
  13.159  
  13.160 -	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  13.161 -	
  13.162 -	glPushMatrix();
  13.163 +    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  13.164 +
  13.165 +    glPushMatrix();
  13.166      FishTransform(&dolph);
  13.167      DrawDolphin(&dolph);
  13.168      glPopMatrix();
  13.169 - 
  13.170 -	glutSwapBuffers();
  13.171 +
  13.172 +    glutSwapBuffers();
  13.173  }
  13.174  */
  13.175  
  13.176 @@ -274,9 +274,9 @@
  13.177  {
  13.178      int i;
  13.179      static double th[4] = {0.0, 0.0, 0.0, 0.0};
  13.180 -	static double t1 = 0.0, t2 = 0.0, t;
  13.181 -	char num_str[128];
  13.182 -    
  13.183 +    static double t1 = 0.0, t2 = 0.0, t;
  13.184 +    char num_str[128];
  13.185 +
  13.186      t1 = t2;
  13.187  
  13.188      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  13.189 @@ -303,56 +303,56 @@
  13.190      glScalef(0.45, 0.45, 0.3);
  13.191      DrawWhale(&babyWhale);
  13.192      glPopMatrix();
  13.193 -    
  13.194 +
  13.195      if(Timing)
  13.196      {
  13.197 -		t2 = mtime();
  13.198 -		t = t2 - t1;
  13.199 -		if(t > 0.0001) t = 1.0 / t;
  13.200 -		
  13.201 -		glDisable(GL_LIGHTING);
  13.202 -		//glDisable(GL_DEPTH_TEST);
  13.203 -		
  13.204 -		glColor3f(1.0, 0.0, 0.0);
  13.205 -		
  13.206 -		glMatrixMode (GL_PROJECTION);
  13.207 -		glPushMatrix();
  13.208 -		glLoadIdentity();
  13.209 -		glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  13.210 -		
  13.211 -		glRasterPos2f(5.0, 5.0);
  13.212 -		
  13.213 -		switch(StrMode)
  13.214 -		{
  13.215 -			case GL_VENDOR:
  13.216 -				sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  13.217 -				DrawStr(num_str);
  13.218 -				DrawStr(glGetString(GL_VENDOR));
  13.219 -			break;
  13.220 -			case GL_RENDERER:
  13.221 -				sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  13.222 -				DrawStr(num_str);
  13.223 -				DrawStr(glGetString(GL_RENDERER));
  13.224 -			break;
  13.225 -			case GL_VERSION:
  13.226 -				sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  13.227 -				DrawStr(num_str);
  13.228 -				DrawStr(glGetString(GL_VERSION));
  13.229 -			break;
  13.230 -			case GL_EXTENSIONS:
  13.231 -				sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  13.232 -				DrawStr(num_str);
  13.233 -				DrawStr(glGetString(GL_EXTENSIONS));
  13.234 -			break;
  13.235 -		}
  13.236 -		
  13.237 -		glPopMatrix();
  13.238 -		glMatrixMode(GL_MODELVIEW);
  13.239 -		
  13.240 -		glEnable(GL_LIGHTING);
  13.241 -		//glEnable(GL_DEPTH_TEST);
  13.242 -	}
  13.243 -	
  13.244 +        t2 = mtime();
  13.245 +        t = t2 - t1;
  13.246 +        if(t > 0.0001) t = 1.0 / t;
  13.247 +
  13.248 +        glDisable(GL_LIGHTING);
  13.249 +        //glDisable(GL_DEPTH_TEST);
  13.250 +
  13.251 +        glColor3f(1.0, 0.0, 0.0);
  13.252 +
  13.253 +        glMatrixMode (GL_PROJECTION);
  13.254 +        glPushMatrix();
  13.255 +        glLoadIdentity();
  13.256 +        glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  13.257 +
  13.258 +        glRasterPos2f(5.0, 5.0);
  13.259 +
  13.260 +        switch(StrMode)
  13.261 +        {
  13.262 +            case GL_VENDOR:
  13.263 +                sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  13.264 +                DrawStr(num_str);
  13.265 +                DrawStr(glGetString(GL_VENDOR));
  13.266 +            break;
  13.267 +            case GL_RENDERER:
  13.268 +                sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  13.269 +                DrawStr(num_str);
  13.270 +                DrawStr(glGetString(GL_RENDERER));
  13.271 +            break;
  13.272 +            case GL_VERSION:
  13.273 +                sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  13.274 +                DrawStr(num_str);
  13.275 +                DrawStr(glGetString(GL_VERSION));
  13.276 +            break;
  13.277 +            case GL_EXTENSIONS:
  13.278 +                sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  13.279 +                DrawStr(num_str);
  13.280 +                DrawStr(glGetString(GL_EXTENSIONS));
  13.281 +            break;
  13.282 +        }
  13.283 +
  13.284 +        glPopMatrix();
  13.285 +        glMatrixMode(GL_MODELVIEW);
  13.286 +
  13.287 +        glEnable(GL_LIGHTING);
  13.288 +        //glEnable(GL_DEPTH_TEST);
  13.289 +    }
  13.290 +
  13.291      count++;
  13.292  
  13.293      glutSwapBuffers();
  13.294 @@ -377,18 +377,18 @@
  13.295  {
  13.296      switch(value)
  13.297      {
  13.298 -		case 1:
  13.299 -			StrMode = GL_VENDOR;
  13.300 -		break;
  13.301 -		case 2:
  13.302 -			StrMode = GL_RENDERER;
  13.303 -		break;
  13.304 -		case 3:
  13.305 -			StrMode = GL_VERSION;
  13.306 -		break;
  13.307 -		case 4:
  13.308 -			StrMode = GL_EXTENSIONS;
  13.309 -		break;
  13.310 +        case 1:
  13.311 +            StrMode = GL_VENDOR;
  13.312 +        break;
  13.313 +        case 2:
  13.314 +            StrMode = GL_RENDERER;
  13.315 +        break;
  13.316 +        case 3:
  13.317 +            StrMode = GL_VERSION;
  13.318 +        break;
  13.319 +        case 4:
  13.320 +            StrMode = GL_EXTENSIONS;
  13.321 +        break;
  13.322      }
  13.323  }
  13.324  
  13.325 @@ -413,24 +413,24 @@
  13.326  int
  13.327  main(int argc, char **argv)
  13.328  {
  13.329 -	GLboolean fullscreen = GL_FALSE; 
  13.330 -	GLint time_menu;
  13.331 - 	
  13.332 - 	srand(0);
  13.333 +    GLboolean fullscreen = GL_FALSE;
  13.334 +    GLint time_menu;
  13.335 +
  13.336 +    srand(0);
  13.337  
  13.338          glutInit(&argc, argv);
  13.339 -	if (argc > 1 && !strcmp(argv[1], "-w"))
  13.340 -		fullscreen = GL_FALSE;
  13.341 +    if (argc > 1 && !strcmp(argv[1], "-w"))
  13.342 +        fullscreen = GL_FALSE;
  13.343  
  13.344 -	//glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  13.345 -	glutInitDisplayString("rgba double depth=24");
  13.346 -	if (fullscreen) {
  13.347 -	  glutGameModeString("1024x768:32");
  13.348 -	  glutEnterGameMode();
  13.349 -	} else {
  13.350 -	  glutInitWindowSize(320, 240);
  13.351 -	  glutCreateWindow("Atlantis Timing");
  13.352 -	}
  13.353 +    //glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  13.354 +    glutInitDisplayString("rgba double depth=24");
  13.355 +    if (fullscreen) {
  13.356 +      glutGameModeString("1024x768:32");
  13.357 +      glutEnterGameMode();
  13.358 +    } else {
  13.359 +      glutInitWindowSize(320, 240);
  13.360 +      glutCreateWindow("Atlantis Timing");
  13.361 +    }
  13.362      Init();
  13.363      glutDisplayFunc(Display);
  13.364      glutReshapeFunc(Reshape);
  13.365 @@ -438,19 +438,19 @@
  13.366      moving = GL_TRUE;
  13.367  glutIdleFunc(Animate);
  13.368      glutVisibilityFunc(Visible);
  13.369 -    
  13.370 +
  13.371      time_menu = glutCreateMenu(timingSelect);
  13.372      glutAddMenuEntry("GL_VENDOR", 1);
  13.373      glutAddMenuEntry("GL_RENDERER", 2);
  13.374      glutAddMenuEntry("GL_VERSION", 3);
  13.375      glutAddMenuEntry("GL_EXTENSIONS", 4);
  13.376 -    
  13.377 +
  13.378      glutCreateMenu(menuSelect);
  13.379      glutAddMenuEntry("Start motion", 1);
  13.380      glutAddMenuEntry("Stop motion", 2);
  13.381      glutAddSubMenu("Timing Mode", time_menu);
  13.382      glutAddMenuEntry("Quit", 4);
  13.383 -    
  13.384 +
  13.385      //glutAttachMenu(GLUT_RIGHT_BUTTON);
  13.386      glutAttachMenu(GLUT_RIGHT_BUTTON);
  13.387      glutMainLoop();
    14.1 --- a/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c	Sat May 18 12:48:50 2013 -0700
    14.2 +++ b/Xcode/TemplatesForXcodeLeopard/SDL OpenGL Application/main.c	Sat May 18 14:17:52 2013 -0700
    14.3 @@ -4,7 +4,7 @@
    14.4     Please see the SDL documentation for details on using the SDL API:
    14.5     /Developer/Documentation/SDL/docs.html
    14.6  */
    14.7 -   
    14.8 +
    14.9  #include <stdio.h>
   14.10  #include <stdlib.h>
   14.11  #include <string.h>
   14.12 @@ -22,18 +22,18 @@
   14.13  static void initAttributes ()
   14.14  {
   14.15      // Setup attributes we want for the OpenGL context
   14.16 -    
   14.17 +
   14.18      int value;
   14.19 -    
   14.20 +
   14.21      // Don't set color bit sizes (SDL_GL_RED_SIZE, etc)
   14.22      //    Mac OS X will always use 8-8-8-8 ARGB for 32-bit screens and
   14.23      //    5-5-5 RGB for 16-bit screens
   14.24 -    
   14.25 +
   14.26      // Request a 16-bit depth buffer (without this, there is no depth buffer)
   14.27      value = 16;
   14.28      SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, value);
   14.29 -    
   14.30 -    
   14.31 +
   14.32 +
   14.33      // Request double-buffered OpenGL
   14.34      //     The fact that windows are double-buffered on Mac OS X has no effect
   14.35      //     on OpenGL double buffering.
   14.36 @@ -46,41 +46,41 @@
   14.37      // Print out attributes of the context we created
   14.38      int nAttr;
   14.39      int i;
   14.40 -    
   14.41 +
   14.42      int  attr[] = { SDL_GL_RED_SIZE, SDL_GL_BLUE_SIZE, SDL_GL_GREEN_SIZE,
   14.43                      SDL_GL_ALPHA_SIZE, SDL_GL_BUFFER_SIZE, SDL_GL_DEPTH_SIZE };
   14.44 -                    
   14.45 +
   14.46      char *desc[] = { "Red size: %d bits\n", "Blue size: %d bits\n", "Green size: %d bits\n",
   14.47 -                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n", 
   14.48 +                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n",
   14.49                       "Depth bufer size: %d bits\n" };
   14.50  
   14.51      nAttr = sizeof(attr) / sizeof(int);
   14.52 -    
   14.53 +
   14.54      for (i = 0; i < nAttr; i++) {
   14.55 -    
   14.56 +
   14.57          int value;
   14.58          SDL_GL_GetAttribute (attr[i], &value);
   14.59          printf (desc[i], value);
   14.60 -    } 
   14.61 +    }
   14.62  }
   14.63  
   14.64  static void createSurface (int fullscreen)
   14.65  {
   14.66      Uint32 flags = 0;
   14.67 -    
   14.68 +
   14.69      flags = SDL_OPENGL;
   14.70      if (fullscreen)
   14.71          flags |= SDL_FULLSCREEN;
   14.72 -    
   14.73 +
   14.74      // Create window
   14.75      gScreen = SDL_SetVideoMode (640, 480, 0, flags);
   14.76      if (gScreen == NULL) {
   14.77 -		
   14.78 +
   14.79          fprintf (stderr, "Couldn't set 640x480 OpenGL video mode: %s\n",
   14.80                   SDL_GetError());
   14.81 -		SDL_Quit();
   14.82 -		exit(2);
   14.83 -	}
   14.84 +        SDL_Quit();
   14.85 +        exit(2);
   14.86 +    }
   14.87  }
   14.88  
   14.89  static void initGL ()
   14.90 @@ -100,30 +100,30 @@
   14.91      SDL_Event event;
   14.92      int done = 0;
   14.93      int fps = 24;
   14.94 -	int delay = 1000/fps;
   14.95 +    int delay = 1000/fps;
   14.96      int thenTicks = -1;
   14.97      int nowTicks;
   14.98 -    
   14.99 +
  14.100      while ( !done ) {
  14.101  
  14.102 -		/* Check for events */
  14.103 -		while ( SDL_PollEvent (&event) ) {
  14.104 -			switch (event.type) {
  14.105 +        /* Check for events */
  14.106 +        while ( SDL_PollEvent (&event) ) {
  14.107 +            switch (event.type) {
  14.108  
  14.109 -				case SDL_MOUSEMOTION:
  14.110 -					break;
  14.111 -				case SDL_MOUSEBUTTONDOWN:
  14.112 -					break;
  14.113 -				case SDL_KEYDOWN:
  14.114 -					/* Any keypress quits the app... */
  14.115 -				case SDL_QUIT:
  14.116 -					done = 1;
  14.117 -					break;
  14.118 -				default:
  14.119 -					break;
  14.120 -			}
  14.121 -		}
  14.122 -    
  14.123 +                case SDL_MOUSEMOTION:
  14.124 +                    break;
  14.125 +                case SDL_MOUSEBUTTONDOWN:
  14.126 +                    break;
  14.127 +                case SDL_KEYDOWN:
  14.128 +                    /* Any keypress quits the app... */
  14.129 +                case SDL_QUIT:
  14.130 +                    done = 1;
  14.131 +                    break;
  14.132 +                default:
  14.133 +                    break;
  14.134 +            }
  14.135 +        }
  14.136 +
  14.137          // Draw at 24 hz
  14.138          //     This approach is not normally recommended - it is better to
  14.139          //     use time-based animation and run as fast as possible
  14.140 @@ -144,36 +144,36 @@
  14.141          }
  14.142  
  14.143          SDL_Delay (delay);
  14.144 -	}
  14.145 +    }
  14.146  }
  14.147  
  14.148  int main(int argc, char *argv[])
  14.149  {
  14.150 -	// Init SDL video subsystem
  14.151 -	if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
  14.152 -		
  14.153 +    // Init SDL video subsystem
  14.154 +    if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
  14.155 +
  14.156          fprintf(stderr, "Couldn't initialize SDL: %s\n",
  14.157 -			SDL_GetError());
  14.158 -		exit(1);
  14.159 -	}
  14.160 +            SDL_GetError());
  14.161 +        exit(1);
  14.162 +    }
  14.163  
  14.164      // Set GL context attributes
  14.165      initAttributes ();
  14.166 -    
  14.167 +
  14.168      // Create GL context
  14.169      createSurface (0);
  14.170 -    
  14.171 +
  14.172      // Get GL context attributes
  14.173      printAttributes ();
  14.174 -    
  14.175 +
  14.176      // Init GL state
  14.177      initGL ();
  14.178 -    
  14.179 +
  14.180      // Draw, get events...
  14.181      mainLoop ();
  14.182 -    
  14.183 +
  14.184      // Cleanup
  14.185 -	SDL_Quit();
  14.186 -	
  14.187 +    SDL_Quit();
  14.188 +
  14.189      return 0;
  14.190  }
    15.1 --- a/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/main.c	Sat May 18 12:48:50 2013 -0700
    15.2 +++ b/Xcode/TemplatesForXcodeSnowLeopard/SDL Application/main.c	Sat May 18 14:17:52 2013 -0700
    15.3 @@ -4,7 +4,7 @@
    15.4     Please see the SDL documentation for details on using the SDL API:
    15.5     /Developer/Documentation/SDL/docs.html
    15.6  */
    15.7 -   
    15.8 +
    15.9  #include <stdio.h>
   15.10  #include <stdlib.h>
   15.11  #include <string.h>
   15.12 @@ -14,52 +14,52 @@
   15.13  
   15.14  int main(int argc, char *argv[])
   15.15  {
   15.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   15.17 -	SDL_Surface *screen;
   15.18 -	Uint8  video_bpp = 0;
   15.19 -	Uint32 videoflags = SDL_SWSURFACE;
   15.20 -	int    done;
   15.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   15.22 +    SDL_Surface *screen;
   15.23 +    Uint8  video_bpp = 0;
   15.24 +    Uint32 videoflags = SDL_SWSURFACE;
   15.25 +    int    done;
   15.26          SDL_Event event;
   15.27  
   15.28 -	/* Initialize the SDL library */
   15.29 -	if ( SDL_Init(initflags) < 0 ) {
   15.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   15.31 -			SDL_GetError());
   15.32 -		exit(1);
   15.33 -	}
   15.34 +    /* Initialize the SDL library */
   15.35 +    if ( SDL_Init(initflags) < 0 ) {
   15.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   15.37 +            SDL_GetError());
   15.38 +        exit(1);
   15.39 +    }
   15.40  
   15.41 -	/* Set 640x480 video mode */
   15.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   15.43 +    /* Set 640x480 video mode */
   15.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   15.45          if (screen == NULL) {
   15.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   15.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   15.48                          video_bpp, SDL_GetError());
   15.49 -		SDL_Quit();
   15.50 -		exit(2);
   15.51 -	}
   15.52 +        SDL_Quit();
   15.53 +        exit(2);
   15.54 +    }
   15.55  
   15.56 -	done = 0;
   15.57 -	while ( !done ) {
   15.58 +    done = 0;
   15.59 +    while ( !done ) {
   15.60  
   15.61 -		/* Check for events */
   15.62 -		while ( SDL_PollEvent(&event) ) {
   15.63 -			switch (event.type) {
   15.64 +        /* Check for events */
   15.65 +        while ( SDL_PollEvent(&event) ) {
   15.66 +            switch (event.type) {
   15.67  
   15.68 -				case SDL_MOUSEMOTION:
   15.69 -					break;
   15.70 -				case SDL_MOUSEBUTTONDOWN:
   15.71 -					break;
   15.72 -				case SDL_KEYDOWN:
   15.73 -					/* Any keypress quits the app... */
   15.74 -				case SDL_QUIT:
   15.75 -					done = 1;
   15.76 -					break;
   15.77 -				default:
   15.78 -					break;
   15.79 -			}
   15.80 -		}
   15.81 -	}
   15.82 -	
   15.83 -	/* Clean up the SDL library */
   15.84 -	SDL_Quit();
   15.85 -	return(0);
   15.86 +                case SDL_MOUSEMOTION:
   15.87 +                    break;
   15.88 +                case SDL_MOUSEBUTTONDOWN:
   15.89 +                    break;
   15.90 +                case SDL_KEYDOWN:
   15.91 +                    /* Any keypress quits the app... */
   15.92 +                case SDL_QUIT:
   15.93 +                    done = 1;
   15.94 +                    break;
   15.95 +                default:
   15.96 +                    break;
   15.97 +            }
   15.98 +        }
   15.99 +    }
  15.100 +
  15.101 +    /* Clean up the SDL library */
  15.102 +    SDL_Quit();
  15.103 +    return(0);
  15.104  }
    16.1 --- a/Xcode/TemplatesForXcodeSnowLeopard/SDL Cocoa Application/main.c	Sat May 18 12:48:50 2013 -0700
    16.2 +++ b/Xcode/TemplatesForXcodeSnowLeopard/SDL Cocoa Application/main.c	Sat May 18 14:17:52 2013 -0700
    16.3 @@ -4,7 +4,7 @@
    16.4     Please see the SDL documentation for details on using the SDL API:
    16.5     /Developer/Documentation/SDL/docs.html
    16.6  */
    16.7 -   
    16.8 +
    16.9  #include <stdio.h>
   16.10  #include <stdlib.h>
   16.11  #include <string.h>
   16.12 @@ -14,52 +14,52 @@
   16.13  
   16.14  int main(int argc, char *argv[])
   16.15  {
   16.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   16.17 -	SDL_Surface *screen;
   16.18 -	Uint8  video_bpp = 0;
   16.19 -	Uint32 videoflags = SDL_SWSURFACE;
   16.20 -	int    done;
   16.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   16.22 +    SDL_Surface *screen;
   16.23 +    Uint8  video_bpp = 0;
   16.24 +    Uint32 videoflags = SDL_SWSURFACE;
   16.25 +    int    done;
   16.26          SDL_Event event;
   16.27  
   16.28 -	/* Initialize the SDL library */
   16.29 -	if ( SDL_Init(initflags) < 0 ) {
   16.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   16.31 -			SDL_GetError());
   16.32 -		exit(1);
   16.33 -	}
   16.34 +    /* Initialize the SDL library */
   16.35 +    if ( SDL_Init(initflags) < 0 ) {
   16.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   16.37 +            SDL_GetError());
   16.38 +        exit(1);
   16.39 +    }
   16.40  
   16.41 -	/* Set 640x480 video mode */
   16.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   16.43 +    /* Set 640x480 video mode */
   16.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   16.45          if (screen == NULL) {
   16.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   16.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   16.48                          video_bpp, SDL_GetError());
   16.49 -		SDL_Quit();
   16.50 -		exit(2);
   16.51 -	}
   16.52 +        SDL_Quit();
   16.53 +        exit(2);
   16.54 +    }
   16.55  
   16.56 -	done = 0;
   16.57 -	while ( !done ) {
   16.58 +    done = 0;
   16.59 +    while ( !done ) {
   16.60  
   16.61 -		/* Check for events */
   16.62 -		while ( SDL_PollEvent(&event) ) {
   16.63 -			switch (event.type) {
   16.64 +        /* Check for events */
   16.65 +        while ( SDL_PollEvent(&event) ) {
   16.66 +            switch (event.type) {
   16.67  
   16.68 -				case SDL_MOUSEMOTION:
   16.69 -					break;
   16.70 -				case SDL_MOUSEBUTTONDOWN:
   16.71 -					break;
   16.72 -				case SDL_KEYDOWN:
   16.73 -					/* Any keypress quits the app... */
   16.74 -				case SDL_QUIT:
   16.75 -					done = 1;
   16.76 -					break;
   16.77 -				default:
   16.78 -					break;
   16.79 -			}
   16.80 -		}
   16.81 -	}
   16.82 -	
   16.83 -	/* Clean up the SDL library */
   16.84 -	SDL_Quit();
   16.85 -	return(0);
   16.86 +                case SDL_MOUSEMOTION:
   16.87 +                    break;
   16.88 +                case SDL_MOUSEBUTTONDOWN:
   16.89 +                    break;
   16.90 +                case SDL_KEYDOWN:
   16.91 +                    /* Any keypress quits the app... */
   16.92 +                case SDL_QUIT:
   16.93 +                    done = 1;
   16.94 +                    break;
   16.95 +                default:
   16.96 +                    break;
   16.97 +            }
   16.98 +        }
   16.99 +    }
  16.100 +
  16.101 +    /* Clean up the SDL library */
  16.102 +    SDL_Quit();
  16.103 +    return(0);
  16.104  }
    17.1 --- a/Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 12:48:50 2013 -0700
    17.2 +++ b/Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 14:17:52 2013 -0700
    17.3 @@ -63,37 +63,37 @@
    17.4  {
    17.5     struct timeval tk_time;
    17.6     struct timezone tz;
    17.7 -   
    17.8 +
    17.9     gettimeofday(&tk_time, &tz);
   17.10 -   
   17.11 +
   17.12     return 4294.967296 * tk_time.tv_sec + 0.000001 * tk_time.tv_usec;
   17.13  }
   17.14  
   17.15  static double filter(double in, double *save)
   17.16  {
   17.17 -	static double k1 = 0.9;
   17.18 -	static double k2 = 0.05;
   17.19 +    static double k1 = 0.9;
   17.20 +    static double k2 = 0.05;
   17.21  
   17.22 -	save[3] = in;
   17.23 -	save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   17.24 +    save[3] = in;
   17.25 +    save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   17.26  
   17.27 -	save[0]=save[1];
   17.28 -	save[2]=save[3];
   17.29 +    save[0]=save[1];
   17.30 +    save[2]=save[3];
   17.31  
   17.32 -	return(save[1]);
   17.33 +    return(save[1]);
   17.34  }
   17.35  
   17.36  void DrawStr(const char *str)
   17.37  {
   17.38 -	GLint i = 0;
   17.39 -	
   17.40 -	if(!str) return;
   17.41 -        
   17.42 -	while(str[i])
   17.43 -	{
   17.44 -		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   17.45 -		i++;
   17.46 -	}
   17.47 +    GLint i = 0;
   17.48 +
   17.49 +    if(!str) return;
   17.50 +
   17.51 +    while(str[i])
   17.52 +    {
   17.53 +        glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   17.54 +        i++;
   17.55 +    }
   17.56  }
   17.57  
   17.58  void
   17.59 @@ -168,9 +168,9 @@
   17.60      InitFishs();
   17.61  
   17.62      glEnable(GL_FOG);
   17.63 -	glFogi(GL_FOG_MODE, GL_EXP);
   17.64 -	glFogf(GL_FOG_DENSITY, 0.0000025);
   17.65 -	glFogfv(GL_FOG_COLOR, fog_color);
   17.66 +    glFogi(GL_FOG_MODE, GL_EXP);
   17.67 +    glFogf(GL_FOG_DENSITY, 0.0000025);
   17.68 +    glFogfv(GL_FOG_COLOR, fog_color);
   17.69  
   17.70      glClearColor(0.0, 0.5, 0.9, 1.0);
   17.71  }
   17.72 @@ -178,9 +178,9 @@
   17.73  void
   17.74  Atlantis_Reshape(int width, int height)
   17.75  {
   17.76 -	w_win = width;
   17.77 -	h_win = height;
   17.78 -	
   17.79 +    w_win = width;
   17.80 +    h_win = height;
   17.81 +
   17.82      glViewport(0, 0, width, height);
   17.83  
   17.84      glMatrixMode(GL_PROJECTION);
   17.85 @@ -212,37 +212,37 @@
   17.86  {
   17.87      switch (key) {
   17.88      case 't':
   17.89 -    	Timing = !Timing;
   17.90 +        Timing = !Timing;
   17.91      break;
   17.92      case ' ':
   17.93 -    	switch(StrMode)
   17.94 -    	{
   17.95 -		    case GL_EXTENSIONS:
   17.96 -    			StrMode = GL_VENDOR;
   17.97 -		    break;
   17.98 -		    case GL_VENDOR:
   17.99 -		    	StrMode = GL_RENDERER;
  17.100 -		    break;
  17.101 -		    case GL_RENDERER:
  17.102 -		    	StrMode = GL_VERSION;
  17.103 -		    break;
  17.104 -		    case GL_VERSION:
  17.105 -		    	StrMode = GL_EXTENSIONS;
  17.106 -		    break;
  17.107 -		}
  17.108 -	break;
  17.109 +        switch(StrMode)
  17.110 +        {
  17.111 +            case GL_EXTENSIONS:
  17.112 +                StrMode = GL_VENDOR;
  17.113 +            break;
  17.114 +            case GL_VENDOR:
  17.115 +                StrMode = GL_RENDERER;
  17.116 +            break;
  17.117 +            case GL_RENDERER:
  17.118 +                StrMode = GL_VERSION;
  17.119 +            break;
  17.120 +            case GL_VERSION:
  17.121 +                StrMode = GL_EXTENSIONS;
  17.122 +            break;
  17.123 +        }
  17.124 +    break;
  17.125      case 27:           /* Esc will quit */
  17.126          exit(1);
  17.127      break;
  17.128 -    case 's':             		/* "s" start animation */
  17.129 +    case 's':                   /* "s" start animation */
  17.130          moving = GL_TRUE;
  17.131          //glutIdleFunc(Animate);
  17.132      break;
  17.133 -    case 'a':          			/* "a" stop animation */
  17.134 +    case 'a':                   /* "a" stop animation */
  17.135          moving = GL_FALSE;
  17.136          //glutIdleFunc(NULL);
  17.137      break;
  17.138 -    case '.':          			/* "." will advance frame */
  17.139 +    case '.':                   /* "." will advance frame */
  17.140          if (!moving) {
  17.141              Atlantis_Animate();
  17.142          }
  17.143 @@ -251,21 +251,21 @@
  17.144  /*
  17.145  void Display(void)
  17.146  {
  17.147 -	static float P123[3] = {-448.94, -203.14, 9499.60};
  17.148 -	static float P124[3] = {-442.64, -185.20, 9528.07};
  17.149 -	static float P125[3] = {-441.07, -148.05, 9528.07};
  17.150 -	static float P126[3] = {-443.43, -128.84, 9499.60};
  17.151 -	static float P127[3] = {-456.87, -146.78, 9466.67};
  17.152 -	static float P128[3] = {-453.68, -183.93, 9466.67};
  17.153 +    static float P123[3] = {-448.94, -203.14, 9499.60};
  17.154 +    static float P124[3] = {-442.64, -185.20, 9528.07};
  17.155 +    static float P125[3] = {-441.07, -148.05, 9528.07};
  17.156 +    static float P126[3] = {-443.43, -128.84, 9499.60};
  17.157 +    static float P127[3] = {-456.87, -146.78, 9466.67};
  17.158 +    static float P128[3] = {-453.68, -183.93, 9466.67};
  17.159  
  17.160 -	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  17.161 -	
  17.162 -	glPushMatrix();
  17.163 +    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  17.164 +
  17.165 +    glPushMatrix();
  17.166      FishTransform(&dolph);
  17.167      DrawDolphin(&dolph);
  17.168      glPopMatrix();
  17.169 - 
  17.170 -	glutSwapBuffers();
  17.171 +
  17.172 +    glutSwapBuffers();
  17.173  }
  17.174  */
  17.175  
  17.176 @@ -274,9 +274,9 @@
  17.177  {
  17.178      int i;
  17.179      static double th[4] = {0.0, 0.0, 0.0, 0.0};
  17.180 -	static double t1 = 0.0, t2 = 0.0, t;
  17.181 -	char num_str[128];
  17.182 -    
  17.183 +    static double t1 = 0.0, t2 = 0.0, t;
  17.184 +    char num_str[128];
  17.185 +
  17.186      t1 = t2;
  17.187  
  17.188      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  17.189 @@ -303,56 +303,56 @@
  17.190      glScalef(0.45, 0.45, 0.3);
  17.191      DrawWhale(&babyWhale);
  17.192      glPopMatrix();
  17.193 -    
  17.194 +
  17.195      if(Timing)
  17.196      {
  17.197 -		t2 = mtime();
  17.198 -		t = t2 - t1;
  17.199 -		if(t > 0.0001) t = 1.0 / t;
  17.200 -		
  17.201 -		glDisable(GL_LIGHTING);
  17.202 -		//glDisable(GL_DEPTH_TEST);
  17.203 -		
  17.204 -		glColor3f(1.0, 0.0, 0.0);
  17.205 -		
  17.206 -		glMatrixMode (GL_PROJECTION);
  17.207 -		glPushMatrix();
  17.208 -		glLoadIdentity();
  17.209 -		glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  17.210 -		
  17.211 -		glRasterPos2f(5.0, 5.0);
  17.212 -		
  17.213 -		switch(StrMode)
  17.214 -		{
  17.215 -			case GL_VENDOR:
  17.216 -				sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  17.217 -				DrawStr(num_str);
  17.218 -				DrawStr(glGetString(GL_VENDOR));
  17.219 -			break;
  17.220 -			case GL_RENDERER:
  17.221 -				sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  17.222 -				DrawStr(num_str);
  17.223 -				DrawStr(glGetString(GL_RENDERER));
  17.224 -			break;
  17.225 -			case GL_VERSION:
  17.226 -				sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  17.227 -				DrawStr(num_str);
  17.228 -				DrawStr(glGetString(GL_VERSION));
  17.229 -			break;
  17.230 -			case GL_EXTENSIONS:
  17.231 -				sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  17.232 -				DrawStr(num_str);
  17.233 -				DrawStr(glGetString(GL_EXTENSIONS));
  17.234 -			break;
  17.235 -		}
  17.236 -		
  17.237 -		glPopMatrix();
  17.238 -		glMatrixMode(GL_MODELVIEW);
  17.239 -		
  17.240 -		glEnable(GL_LIGHTING);
  17.241 -		//glEnable(GL_DEPTH_TEST);
  17.242 -	}
  17.243 -	
  17.244 +        t2 = mtime();
  17.245 +        t = t2 - t1;
  17.246 +        if(t > 0.0001) t = 1.0 / t;
  17.247 +
  17.248 +        glDisable(GL_LIGHTING);
  17.249 +        //glDisable(GL_DEPTH_TEST);
  17.250 +
  17.251 +        glColor3f(1.0, 0.0, 0.0);
  17.252 +
  17.253 +        glMatrixMode (GL_PROJECTION);
  17.254 +        glPushMatrix();
  17.255 +        glLoadIdentity();
  17.256 +        glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  17.257 +
  17.258 +        glRasterPos2f(5.0, 5.0);
  17.259 +
  17.260 +        switch(StrMode)
  17.261 +        {
  17.262 +            case GL_VENDOR:
  17.263 +                sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  17.264 +                DrawStr(num_str);
  17.265 +                DrawStr(glGetString(GL_VENDOR));
  17.266 +            break;
  17.267 +            case GL_RENDERER:
  17.268 +                sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  17.269 +                DrawStr(num_str);
  17.270 +                DrawStr(glGetString(GL_RENDERER));
  17.271 +            break;
  17.272 +            case GL_VERSION:
  17.273 +                sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  17.274 +                DrawStr(num_str);
  17.275 +                DrawStr(glGetString(GL_VERSION));
  17.276 +            break;
  17.277 +            case GL_EXTENSIONS:
  17.278 +                sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  17.279 +                DrawStr(num_str);
  17.280 +                DrawStr(glGetString(GL_EXTENSIONS));
  17.281 +            break;
  17.282 +        }
  17.283 +
  17.284 +        glPopMatrix();
  17.285 +        glMatrixMode(GL_MODELVIEW);
  17.286 +
  17.287 +        glEnable(GL_LIGHTING);
  17.288 +        //glEnable(GL_DEPTH_TEST);
  17.289 +    }
  17.290 +
  17.291      count++;
  17.292  
  17.293      glutSwapBuffers();
  17.294 @@ -377,18 +377,18 @@
  17.295  {
  17.296      switch(value)
  17.297      {
  17.298 -		case 1:
  17.299 -			StrMode = GL_VENDOR;
  17.300 -		break;
  17.301 -		case 2:
  17.302 -			StrMode = GL_RENDERER;
  17.303 -		break;
  17.304 -		case 3:
  17.305 -			StrMode = GL_VERSION;
  17.306 -		break;
  17.307 -		case 4:
  17.308 -			StrMode = GL_EXTENSIONS;
  17.309 -		break;
  17.310 +        case 1:
  17.311 +            StrMode = GL_VENDOR;
  17.312 +        break;
  17.313 +        case 2:
  17.314 +            StrMode = GL_RENDERER;
  17.315 +        break;
  17.316 +        case 3:
  17.317 +            StrMode = GL_VERSION;
  17.318 +        break;
  17.319 +        case 4:
  17.320 +            StrMode = GL_EXTENSIONS;
  17.321 +        break;
  17.322      }
  17.323  }
  17.324  
  17.325 @@ -413,24 +413,24 @@
  17.326  int
  17.327  main(int argc, char **argv)
  17.328  {
  17.329 -	GLboolean fullscreen = GL_FALSE; 
  17.330 -	GLint time_menu;
  17.331 - 	
  17.332 - 	srand(0);
  17.333 +    GLboolean fullscreen = GL_FALSE;
  17.334 +    GLint time_menu;
  17.335 +
  17.336 +    srand(0);
  17.337  
  17.338          glutInit(&argc, argv);
  17.339 -	if (argc > 1 && !strcmp(argv[1], "-w"))
  17.340 -		fullscreen = GL_FALSE;
  17.341 +    if (argc > 1 && !strcmp(argv[1], "-w"))
  17.342 +        fullscreen = GL_FALSE;
  17.343  
  17.344 -	//glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  17.345 -	glutInitDisplayString("rgba double depth=24");
  17.346 -	if (fullscreen) {
  17.347 -	  glutGameModeString("1024x768:32");
  17.348 -	  glutEnterGameMode();
  17.349 -	} else {
  17.350 -	  glutInitWindowSize(320, 240);
  17.351 -	  glutCreateWindow("Atlantis Timing");
  17.352 -	}
  17.353 +    //glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  17.354 +    glutInitDisplayString("rgba double depth=24");
  17.355 +    if (fullscreen) {
  17.356 +      glutGameModeString("1024x768:32");
  17.357 +      glutEnterGameMode();
  17.358 +    } else {
  17.359 +      glutInitWindowSize(320, 240);
  17.360 +      glutCreateWindow("Atlantis Timing");
  17.361 +    }
  17.362      Init();
  17.363      glutDisplayFunc(Display);
  17.364      glutReshapeFunc(Reshape);
  17.365 @@ -438,19 +438,19 @@
  17.366      moving = GL_TRUE;
  17.367  glutIdleFunc(Animate);
  17.368      glutVisibilityFunc(Visible);
  17.369 -    
  17.370 +
  17.371      time_menu = glutCreateMenu(timingSelect);
  17.372      glutAddMenuEntry("GL_VENDOR", 1);
  17.373      glutAddMenuEntry("GL_RENDERER", 2);
  17.374      glutAddMenuEntry("GL_VERSION", 3);
  17.375      glutAddMenuEntry("GL_EXTENSIONS", 4);
  17.376 -    
  17.377 +
  17.378      glutCreateMenu(menuSelect);
  17.379      glutAddMenuEntry("Start motion", 1);
  17.380      glutAddMenuEntry("Stop motion", 2);
  17.381      glutAddSubMenu("Timing Mode", time_menu);
  17.382      glutAddMenuEntry("Quit", 4);
  17.383 -    
  17.384 +
  17.385      //glutAttachMenu(GLUT_RIGHT_BUTTON);
  17.386      glutAttachMenu(GLUT_RIGHT_BUTTON);
  17.387      glutMainLoop();
    18.1 --- a/Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/main.c	Sat May 18 12:48:50 2013 -0700
    18.2 +++ b/Xcode/TemplatesForXcodeSnowLeopard/SDL OpenGL Application/main.c	Sat May 18 14:17:52 2013 -0700
    18.3 @@ -4,7 +4,7 @@
    18.4     Please see the SDL documentation for details on using the SDL API:
    18.5     /Developer/Documentation/SDL/docs.html
    18.6  */
    18.7 -   
    18.8 +
    18.9  #include <stdio.h>
   18.10  #include <stdlib.h>
   18.11  #include <string.h>
   18.12 @@ -22,18 +22,18 @@
   18.13  static void initAttributes ()
   18.14  {
   18.15      // Setup attributes we want for the OpenGL context
   18.16 -    
   18.17 +
   18.18      int value;
   18.19 -    
   18.20 +
   18.21      // Don't set color bit sizes (SDL_GL_RED_SIZE, etc)
   18.22      //    Mac OS X will always use 8-8-8-8 ARGB for 32-bit screens and
   18.23      //    5-5-5 RGB for 16-bit screens
   18.24 -    
   18.25 +
   18.26      // Request a 16-bit depth buffer (without this, there is no depth buffer)
   18.27      value = 16;
   18.28      SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, value);
   18.29 -    
   18.30 -    
   18.31 +
   18.32 +
   18.33      // Request double-buffered OpenGL
   18.34      //     The fact that windows are double-buffered on Mac OS X has no effect
   18.35      //     on OpenGL double buffering.
   18.36 @@ -46,36 +46,36 @@
   18.37      // Print out attributes of the context we created
   18.38      int nAttr;
   18.39      int i;
   18.40 -    
   18.41 +
   18.42      int  attr[] = { SDL_GL_RED_SIZE, SDL_GL_BLUE_SIZE, SDL_GL_GREEN_SIZE,
   18.43                      SDL_GL_ALPHA_SIZE, SDL_GL_BUFFER_SIZE, SDL_GL_DEPTH_SIZE };
   18.44 -                    
   18.45 +
   18.46      char *desc[] = { "Red size: %d bits\n", "Blue size: %d bits\n", "Green size: %d bits\n",
   18.47 -                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n", 
   18.48 +                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n",
   18.49                       "Depth bufer size: %d bits\n" };
   18.50  
   18.51      nAttr = sizeof(attr) / sizeof(int);
   18.52 -    
   18.53 +
   18.54      for (i = 0; i < nAttr; i++) {
   18.55 -    
   18.56 +
   18.57          int value;
   18.58          SDL_GL_GetAttribute (attr[i], &value);
   18.59          printf (desc[i], value);
   18.60 -    } 
   18.61 +    }
   18.62  }
   18.63  
   18.64  static void createSurface (int fullscreen)
   18.65  {
   18.66      Uint32 flags = 0;
   18.67 -    
   18.68 +
   18.69      flags = SDL_OPENGL;
   18.70      if (fullscreen)
   18.71          flags |= SDL_FULLSCREEN;
   18.72 -    
   18.73 +
   18.74      // Create window
   18.75      gScreen = SDL_SetVideoMode (640, 480, 0, flags);
   18.76      if (gScreen == NULL) {
   18.77 -        
   18.78 +
   18.79          fprintf (stderr, "Couldn't set 640x480 OpenGL video mode: %s\n",
   18.80                   SDL_GetError());
   18.81          SDL_Quit();
   18.82 @@ -103,7 +103,7 @@
   18.83      int delay = 1000/fps;
   18.84      int thenTicks = -1;
   18.85      int nowTicks;
   18.86 -    
   18.87 +
   18.88      while ( !done ) {
   18.89  
   18.90          /* Check for events */
   18.91 @@ -123,7 +123,7 @@
   18.92                      break;
   18.93              }
   18.94          }
   18.95 -    
   18.96 +
   18.97          // Draw at 24 hz
   18.98          //     This approach is not normally recommended - it is better to
   18.99          //     use time-based animation and run as fast as possible
  18.100 @@ -151,7 +151,7 @@
  18.101  {
  18.102      // Init SDL video subsystem
  18.103      if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
  18.104 -        
  18.105 +
  18.106          fprintf(stderr, "Couldn't initialize SDL: %s\n",
  18.107              SDL_GetError());
  18.108          exit(1);
  18.109 @@ -159,19 +159,19 @@
  18.110  
  18.111      // Set GL context attributes
  18.112      initAttributes ();
  18.113 -    
  18.114 +
  18.115      // Create GL context
  18.116      createSurface (0);
  18.117 -    
  18.118 +
  18.119      // Get GL context attributes
  18.120      printAttributes ();
  18.121 -    
  18.122 +
  18.123      // Init GL state
  18.124      initGL ();
  18.125 -    
  18.126 +
  18.127      // Draw, get events...
  18.128      mainLoop ();
  18.129 -    
  18.130 +
  18.131      // Cleanup
  18.132      SDL_Quit();
  18.133  
    19.1 --- a/Xcode/TemplatesForXcodeTiger/SDL Application/main.c	Sat May 18 12:48:50 2013 -0700
    19.2 +++ b/Xcode/TemplatesForXcodeTiger/SDL Application/main.c	Sat May 18 14:17:52 2013 -0700
    19.3 @@ -4,7 +4,7 @@
    19.4     Please see the SDL documentation for details on using the SDL API:
    19.5     /Developer/Documentation/SDL/docs.html
    19.6  */
    19.7 -   
    19.8 +
    19.9  #include <stdio.h>
   19.10  #include <stdlib.h>
   19.11  #include <string.h>
   19.12 @@ -14,52 +14,52 @@
   19.13  
   19.14  int main(int argc, char *argv[])
   19.15  {
   19.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   19.17 -	SDL_Surface *screen;
   19.18 -	Uint8  video_bpp = 0;
   19.19 -	Uint32 videoflags = SDL_SWSURFACE;
   19.20 -	int    done;
   19.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   19.22 +    SDL_Surface *screen;
   19.23 +    Uint8  video_bpp = 0;
   19.24 +    Uint32 videoflags = SDL_SWSURFACE;
   19.25 +    int    done;
   19.26          SDL_Event event;
   19.27  
   19.28 -	/* Initialize the SDL library */
   19.29 -	if ( SDL_Init(initflags) < 0 ) {
   19.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   19.31 -			SDL_GetError());
   19.32 -		exit(1);
   19.33 -	}
   19.34 +    /* Initialize the SDL library */
   19.35 +    if ( SDL_Init(initflags) < 0 ) {
   19.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   19.37 +            SDL_GetError());
   19.38 +        exit(1);
   19.39 +    }
   19.40  
   19.41 -	/* Set 640x480 video mode */
   19.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   19.43 +    /* Set 640x480 video mode */
   19.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   19.45          if (screen == NULL) {
   19.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   19.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   19.48                          video_bpp, SDL_GetError());
   19.49 -		SDL_Quit();
   19.50 -		exit(2);
   19.51 -	}
   19.52 +        SDL_Quit();
   19.53 +        exit(2);
   19.54 +    }
   19.55  
   19.56 -	done = 0;
   19.57 -	while ( !done ) {
   19.58 +    done = 0;
   19.59 +    while ( !done ) {
   19.60  
   19.61 -		/* Check for events */
   19.62 -		while ( SDL_PollEvent(&event) ) {
   19.63 -			switch (event.type) {
   19.64 +        /* Check for events */
   19.65 +        while ( SDL_PollEvent(&event) ) {
   19.66 +            switch (event.type) {
   19.67  
   19.68 -				case SDL_MOUSEMOTION:
   19.69 -					break;
   19.70 -				case SDL_MOUSEBUTTONDOWN:
   19.71 -					break;
   19.72 -				case SDL_KEYDOWN:
   19.73 -					/* Any keypress quits the app... */
   19.74 -				case SDL_QUIT:
   19.75 -					done = 1;
   19.76 -					break;
   19.77 -				default:
   19.78 -					break;
   19.79 -			}
   19.80 -		}
   19.81 -	}
   19.82 -	
   19.83 -	/* Clean up the SDL library */
   19.84 -	SDL_Quit();
   19.85 -	return(0);
   19.86 +                case SDL_MOUSEMOTION:
   19.87 +                    break;
   19.88 +                case SDL_MOUSEBUTTONDOWN:
   19.89 +                    break;
   19.90 +                case SDL_KEYDOWN:
   19.91 +                    /* Any keypress quits the app... */
   19.92 +                case SDL_QUIT:
   19.93 +                    done = 1;
   19.94 +                    break;
   19.95 +                default:
   19.96 +                    break;
   19.97 +            }
   19.98 +        }
   19.99 +    }
  19.100 +
  19.101 +    /* Clean up the SDL library */
  19.102 +    SDL_Quit();
  19.103 +    return(0);
  19.104  }
    20.1 --- a/Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/main.c	Sat May 18 12:48:50 2013 -0700
    20.2 +++ b/Xcode/TemplatesForXcodeTiger/SDL Cocoa Application/main.c	Sat May 18 14:17:52 2013 -0700
    20.3 @@ -4,7 +4,7 @@
    20.4     Please see the SDL documentation for details on using the SDL API:
    20.5     /Developer/Documentation/SDL/docs.html
    20.6  */
    20.7 -   
    20.8 +
    20.9  #include <stdio.h>
   20.10  #include <stdlib.h>
   20.11  #include <string.h>
   20.12 @@ -14,52 +14,52 @@
   20.13  
   20.14  int main(int argc, char *argv[])
   20.15  {
   20.16 -	Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   20.17 -	SDL_Surface *screen;
   20.18 -	Uint8  video_bpp = 0;
   20.19 -	Uint32 videoflags = SDL_SWSURFACE;
   20.20 -	int    done;
   20.21 +    Uint32 initflags = SDL_INIT_VIDEO;  /* See documentation for details */
   20.22 +    SDL_Surface *screen;
   20.23 +    Uint8  video_bpp = 0;
   20.24 +    Uint32 videoflags = SDL_SWSURFACE;
   20.25 +    int    done;
   20.26          SDL_Event event;
   20.27  
   20.28 -	/* Initialize the SDL library */
   20.29 -	if ( SDL_Init(initflags) < 0 ) {
   20.30 -		fprintf(stderr, "Couldn't initialize SDL: %s\n",
   20.31 -			SDL_GetError());
   20.32 -		exit(1);
   20.33 -	}
   20.34 +    /* Initialize the SDL library */
   20.35 +    if ( SDL_Init(initflags) < 0 ) {
   20.36 +        fprintf(stderr, "Couldn't initialize SDL: %s\n",
   20.37 +            SDL_GetError());
   20.38 +        exit(1);
   20.39 +    }
   20.40  
   20.41 -	/* Set 640x480 video mode */
   20.42 -	screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   20.43 +    /* Set 640x480 video mode */
   20.44 +    screen=SDL_SetVideoMode(640,480, video_bpp, videoflags);
   20.45          if (screen == NULL) {
   20.46 -		fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   20.47 +        fprintf(stderr, "Couldn't set 640x480x%d video mode: %s\n",
   20.48                          video_bpp, SDL_GetError());
   20.49 -		SDL_Quit();
   20.50 -		exit(2);
   20.51 -	}
   20.52 +        SDL_Quit();
   20.53 +        exit(2);
   20.54 +    }
   20.55  
   20.56 -	done = 0;
   20.57 -	while ( !done ) {
   20.58 +    done = 0;
   20.59 +    while ( !done ) {
   20.60  
   20.61 -		/* Check for events */
   20.62 -		while ( SDL_PollEvent(&event) ) {
   20.63 -			switch (event.type) {
   20.64 +        /* Check for events */
   20.65 +        while ( SDL_PollEvent(&event) ) {
   20.66 +            switch (event.type) {
   20.67  
   20.68 -				case SDL_MOUSEMOTION:
   20.69 -					break;
   20.70 -				case SDL_MOUSEBUTTONDOWN:
   20.71 -					break;
   20.72 -				case SDL_KEYDOWN:
   20.73 -					/* Any keypress quits the app... */
   20.74 -				case SDL_QUIT:
   20.75 -					done = 1;
   20.76 -					break;
   20.77 -				default:
   20.78 -					break;
   20.79 -			}
   20.80 -		}
   20.81 -	}
   20.82 -	
   20.83 -	/* Clean up the SDL library */
   20.84 -	SDL_Quit();
   20.85 -	return(0);
   20.86 +                case SDL_MOUSEMOTION:
   20.87 +                    break;
   20.88 +                case SDL_MOUSEBUTTONDOWN:
   20.89 +                    break;
   20.90 +                case SDL_KEYDOWN:
   20.91 +                    /* Any keypress quits the app... */
   20.92 +                case SDL_QUIT:
   20.93 +                    done = 1;
   20.94 +                    break;
   20.95 +                default:
   20.96 +                    break;
   20.97 +            }
   20.98 +        }
   20.99 +    }
  20.100 +
  20.101 +    /* Clean up the SDL library */
  20.102 +    SDL_Quit();
  20.103 +    return(0);
  20.104  }
    21.1 --- a/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 12:48:50 2013 -0700
    21.2 +++ b/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/atlantis/atlantis.c	Sat May 18 14:17:52 2013 -0700
    21.3 @@ -63,37 +63,37 @@
    21.4  {
    21.5     struct timeval tk_time;
    21.6     struct timezone tz;
    21.7 -   
    21.8 +
    21.9     gettimeofday(&tk_time, &tz);
   21.10 -   
   21.11 +
   21.12     return 4294.967296 * tk_time.tv_sec + 0.000001 * tk_time.tv_usec;
   21.13  }
   21.14  
   21.15  static double filter(double in, double *save)
   21.16  {
   21.17 -	static double k1 = 0.9;
   21.18 -	static double k2 = 0.05;
   21.19 +    static double k1 = 0.9;
   21.20 +    static double k2 = 0.05;
   21.21  
   21.22 -	save[3] = in;
   21.23 -	save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   21.24 +    save[3] = in;
   21.25 +    save[1] = save[0]*k1 + k2*(save[3] + save[2]);
   21.26  
   21.27 -	save[0]=save[1];
   21.28 -	save[2]=save[3];
   21.29 +    save[0]=save[1];
   21.30 +    save[2]=save[3];
   21.31  
   21.32 -	return(save[1]);
   21.33 +    return(save[1]);
   21.34  }
   21.35  
   21.36  void DrawStr(const char *str)
   21.37  {
   21.38 -	GLint i = 0;
   21.39 -	
   21.40 -	if(!str) return;
   21.41 -        
   21.42 -	while(str[i])
   21.43 -	{
   21.44 -		glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   21.45 -		i++;
   21.46 -	}
   21.47 +    GLint i = 0;
   21.48 +
   21.49 +    if(!str) return;
   21.50 +
   21.51 +    while(str[i])
   21.52 +    {
   21.53 +        glutBitmapCharacter(GLUT_BITMAP_HELVETICA_12, str[i]);
   21.54 +        i++;
   21.55 +    }
   21.56  }
   21.57  
   21.58  void
   21.59 @@ -168,9 +168,9 @@
   21.60      InitFishs();
   21.61  
   21.62      glEnable(GL_FOG);
   21.63 -	glFogi(GL_FOG_MODE, GL_EXP);
   21.64 -	glFogf(GL_FOG_DENSITY, 0.0000025);
   21.65 -	glFogfv(GL_FOG_COLOR, fog_color);
   21.66 +    glFogi(GL_FOG_MODE, GL_EXP);
   21.67 +    glFogf(GL_FOG_DENSITY, 0.0000025);
   21.68 +    glFogfv(GL_FOG_COLOR, fog_color);
   21.69  
   21.70      glClearColor(0.0, 0.5, 0.9, 1.0);
   21.71  }
   21.72 @@ -178,9 +178,9 @@
   21.73  void
   21.74  Atlantis_Reshape(int width, int height)
   21.75  {
   21.76 -	w_win = width;
   21.77 -	h_win = height;
   21.78 -	
   21.79 +    w_win = width;
   21.80 +    h_win = height;
   21.81 +
   21.82      glViewport(0, 0, width, height);
   21.83  
   21.84      glMatrixMode(GL_PROJECTION);
   21.85 @@ -212,37 +212,37 @@
   21.86  {
   21.87      switch (key) {
   21.88      case 't':
   21.89 -    	Timing = !Timing;
   21.90 +        Timing = !Timing;
   21.91      break;
   21.92      case ' ':
   21.93 -    	switch(StrMode)
   21.94 -    	{
   21.95 -		    case GL_EXTENSIONS:
   21.96 -    			StrMode = GL_VENDOR;
   21.97 -		    break;
   21.98 -		    case GL_VENDOR:
   21.99 -		    	StrMode = GL_RENDERER;
  21.100 -		    break;
  21.101 -		    case GL_RENDERER:
  21.102 -		    	StrMode = GL_VERSION;
  21.103 -		    break;
  21.104 -		    case GL_VERSION:
  21.105 -		    	StrMode = GL_EXTENSIONS;
  21.106 -		    break;
  21.107 -		}
  21.108 -	break;
  21.109 +        switch(StrMode)
  21.110 +        {
  21.111 +            case GL_EXTENSIONS:
  21.112 +                StrMode = GL_VENDOR;
  21.113 +            break;
  21.114 +            case GL_VENDOR:
  21.115 +                StrMode = GL_RENDERER;
  21.116 +            break;
  21.117 +            case GL_RENDERER:
  21.118 +                StrMode = GL_VERSION;
  21.119 +            break;
  21.120 +            case GL_VERSION:
  21.121 +                StrMode = GL_EXTENSIONS;
  21.122 +            break;
  21.123 +        }
  21.124 +    break;
  21.125      case 27:           /* Esc will quit */
  21.126          exit(1);
  21.127      break;
  21.128 -    case 's':             		/* "s" start animation */
  21.129 +    case 's':                   /* "s" start animation */
  21.130          moving = GL_TRUE;
  21.131          //glutIdleFunc(Animate);
  21.132      break;
  21.133 -    case 'a':          			/* "a" stop animation */
  21.134 +    case 'a':                   /* "a" stop animation */
  21.135          moving = GL_FALSE;
  21.136          //glutIdleFunc(NULL);
  21.137      break;
  21.138 -    case '.':          			/* "." will advance frame */
  21.139 +    case '.':                   /* "." will advance frame */
  21.140          if (!moving) {
  21.141              Atlantis_Animate();
  21.142          }
  21.143 @@ -251,21 +251,21 @@
  21.144  /*
  21.145  void Display(void)
  21.146  {
  21.147 -	static float P123[3] = {-448.94, -203.14, 9499.60};
  21.148 -	static float P124[3] = {-442.64, -185.20, 9528.07};
  21.149 -	static float P125[3] = {-441.07, -148.05, 9528.07};
  21.150 -	static float P126[3] = {-443.43, -128.84, 9499.60};
  21.151 -	static float P127[3] = {-456.87, -146.78, 9466.67};
  21.152 -	static float P128[3] = {-453.68, -183.93, 9466.67};
  21.153 +    static float P123[3] = {-448.94, -203.14, 9499.60};
  21.154 +    static float P124[3] = {-442.64, -185.20, 9528.07};
  21.155 +    static float P125[3] = {-441.07, -148.05, 9528.07};
  21.156 +    static float P126[3] = {-443.43, -128.84, 9499.60};
  21.157 +    static float P127[3] = {-456.87, -146.78, 9466.67};
  21.158 +    static float P128[3] = {-453.68, -183.93, 9466.67};
  21.159  
  21.160 -	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  21.161 -	
  21.162 -	glPushMatrix();
  21.163 +    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  21.164 +
  21.165 +    glPushMatrix();
  21.166      FishTransform(&dolph);
  21.167      DrawDolphin(&dolph);
  21.168      glPopMatrix();
  21.169 - 
  21.170 -	glutSwapBuffers();
  21.171 +
  21.172 +    glutSwapBuffers();
  21.173  }
  21.174  */
  21.175  
  21.176 @@ -274,9 +274,9 @@
  21.177  {
  21.178      int i;
  21.179      static double th[4] = {0.0, 0.0, 0.0, 0.0};
  21.180 -	static double t1 = 0.0, t2 = 0.0, t;
  21.181 -	char num_str[128];
  21.182 -    
  21.183 +    static double t1 = 0.0, t2 = 0.0, t;
  21.184 +    char num_str[128];
  21.185 +
  21.186      t1 = t2;
  21.187  
  21.188      glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
  21.189 @@ -303,56 +303,56 @@
  21.190      glScalef(0.45, 0.45, 0.3);
  21.191      DrawWhale(&babyWhale);
  21.192      glPopMatrix();
  21.193 -    
  21.194 +
  21.195      if(Timing)
  21.196      {
  21.197 -		t2 = mtime();
  21.198 -		t = t2 - t1;
  21.199 -		if(t > 0.0001) t = 1.0 / t;
  21.200 -		
  21.201 -		glDisable(GL_LIGHTING);
  21.202 -		//glDisable(GL_DEPTH_TEST);
  21.203 -		
  21.204 -		glColor3f(1.0, 0.0, 0.0);
  21.205 -		
  21.206 -		glMatrixMode (GL_PROJECTION);
  21.207 -		glPushMatrix();
  21.208 -		glLoadIdentity();
  21.209 -		glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  21.210 -		
  21.211 -		glRasterPos2f(5.0, 5.0);
  21.212 -		
  21.213 -		switch(StrMode)
  21.214 -		{
  21.215 -			case GL_VENDOR:
  21.216 -				sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  21.217 -				DrawStr(num_str);
  21.218 -				DrawStr(glGetString(GL_VENDOR));
  21.219 -			break;
  21.220 -			case GL_RENDERER:
  21.221 -				sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  21.222 -				DrawStr(num_str);
  21.223 -				DrawStr(glGetString(GL_RENDERER));
  21.224 -			break;
  21.225 -			case GL_VERSION:
  21.226 -				sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  21.227 -				DrawStr(num_str);
  21.228 -				DrawStr(glGetString(GL_VERSION));
  21.229 -			break;
  21.230 -			case GL_EXTENSIONS:
  21.231 -				sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  21.232 -				DrawStr(num_str);
  21.233 -				DrawStr(glGetString(GL_EXTENSIONS));
  21.234 -			break;
  21.235 -		}
  21.236 -		
  21.237 -		glPopMatrix();
  21.238 -		glMatrixMode(GL_MODELVIEW);
  21.239 -		
  21.240 -		glEnable(GL_LIGHTING);
  21.241 -		//glEnable(GL_DEPTH_TEST);
  21.242 -	}
  21.243 -	
  21.244 +        t2 = mtime();
  21.245 +        t = t2 - t1;
  21.246 +        if(t > 0.0001) t = 1.0 / t;
  21.247 +
  21.248 +        glDisable(GL_LIGHTING);
  21.249 +        //glDisable(GL_DEPTH_TEST);
  21.250 +
  21.251 +        glColor3f(1.0, 0.0, 0.0);
  21.252 +
  21.253 +        glMatrixMode (GL_PROJECTION);
  21.254 +        glPushMatrix();
  21.255 +        glLoadIdentity();
  21.256 +        glOrtho(0, w_win, 0, h_win, -10.0, 10.0);
  21.257 +
  21.258 +        glRasterPos2f(5.0, 5.0);
  21.259 +
  21.260 +        switch(StrMode)
  21.261 +        {
  21.262 +            case GL_VENDOR:
  21.263 +                sprintf(num_str, "%0.2f Hz, %dx%d, VENDOR: ", filter(t, th), w_win, h_win);
  21.264 +                DrawStr(num_str);
  21.265 +                DrawStr(glGetString(GL_VENDOR));
  21.266 +            break;
  21.267 +            case GL_RENDERER:
  21.268 +                sprintf(num_str, "%0.2f Hz, %dx%d, RENDERER: ", filter(t, th), w_win, h_win);
  21.269 +                DrawStr(num_str);
  21.270 +                DrawStr(glGetString(GL_RENDERER));
  21.271 +            break;
  21.272 +            case GL_VERSION:
  21.273 +                sprintf(num_str, "%0.2f Hz, %dx%d, VERSION: ", filter(t, th), w_win, h_win);
  21.274 +                DrawStr(num_str);
  21.275 +                DrawStr(glGetString(GL_VERSION));
  21.276 +            break;
  21.277 +            case GL_EXTENSIONS:
  21.278 +                sprintf(num_str, "%0.2f Hz, %dx%d, EXTENSIONS: ", filter(t, th), w_win, h_win);
  21.279 +                DrawStr(num_str);
  21.280 +                DrawStr(glGetString(GL_EXTENSIONS));
  21.281 +            break;
  21.282 +        }
  21.283 +
  21.284 +        glPopMatrix();
  21.285 +        glMatrixMode(GL_MODELVIEW);
  21.286 +
  21.287 +        glEnable(GL_LIGHTING);
  21.288 +        //glEnable(GL_DEPTH_TEST);
  21.289 +    }
  21.290 +
  21.291      count++;
  21.292  
  21.293      glutSwapBuffers();
  21.294 @@ -377,18 +377,18 @@
  21.295  {
  21.296      switch(value)
  21.297      {
  21.298 -		case 1:
  21.299 -			StrMode = GL_VENDOR;
  21.300 -		break;
  21.301 -		case 2:
  21.302 -			StrMode = GL_RENDERER;
  21.303 -		break;
  21.304 -		case 3:
  21.305 -			StrMode = GL_VERSION;
  21.306 -		break;
  21.307 -		case 4:
  21.308 -			StrMode = GL_EXTENSIONS;
  21.309 -		break;
  21.310 +        case 1:
  21.311 +            StrMode = GL_VENDOR;
  21.312 +        break;
  21.313 +        case 2:
  21.314 +            StrMode = GL_RENDERER;
  21.315 +        break;
  21.316 +        case 3:
  21.317 +            StrMode = GL_VERSION;
  21.318 +        break;
  21.319 +        case 4:
  21.320 +            StrMode = GL_EXTENSIONS;
  21.321 +        break;
  21.322      }
  21.323  }
  21.324  
  21.325 @@ -413,24 +413,24 @@
  21.326  int
  21.327  main(int argc, char **argv)
  21.328  {
  21.329 -	GLboolean fullscreen = GL_FALSE; 
  21.330 -	GLint time_menu;
  21.331 - 	
  21.332 - 	srand(0);
  21.333 +    GLboolean fullscreen = GL_FALSE;
  21.334 +    GLint time_menu;
  21.335 +
  21.336 +    srand(0);
  21.337  
  21.338          glutInit(&argc, argv);
  21.339 -	if (argc > 1 && !strcmp(argv[1], "-w"))
  21.340 -		fullscreen = GL_FALSE;
  21.341 +    if (argc > 1 && !strcmp(argv[1], "-w"))
  21.342 +        fullscreen = GL_FALSE;
  21.343  
  21.344 -	//glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  21.345 -	glutInitDisplayString("rgba double depth=24");
  21.346 -	if (fullscreen) {
  21.347 -	  glutGameModeString("1024x768:32");
  21.348 -	  glutEnterGameMode();
  21.349 -	} else {
  21.350 -	  glutInitWindowSize(320, 240);
  21.351 -	  glutCreateWindow("Atlantis Timing");
  21.352 -	}
  21.353 +    //glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_DEPTH);
  21.354 +    glutInitDisplayString("rgba double depth=24");
  21.355 +    if (fullscreen) {
  21.356 +      glutGameModeString("1024x768:32");
  21.357 +      glutEnterGameMode();
  21.358 +    } else {
  21.359 +      glutInitWindowSize(320, 240);
  21.360 +      glutCreateWindow("Atlantis Timing");
  21.361 +    }
  21.362      Init();
  21.363      glutDisplayFunc(Display);
  21.364      glutReshapeFunc(Reshape);
  21.365 @@ -438,19 +438,19 @@
  21.366      moving = GL_TRUE;
  21.367  glutIdleFunc(Animate);
  21.368      glutVisibilityFunc(Visible);
  21.369 -    
  21.370 +
  21.371      time_menu = glutCreateMenu(timingSelect);
  21.372      glutAddMenuEntry("GL_VENDOR", 1);
  21.373      glutAddMenuEntry("GL_RENDERER", 2);
  21.374      glutAddMenuEntry("GL_VERSION", 3);
  21.375      glutAddMenuEntry("GL_EXTENSIONS", 4);
  21.376 -    
  21.377 +
  21.378      glutCreateMenu(menuSelect);
  21.379      glutAddMenuEntry("Start motion", 1);
  21.380      glutAddMenuEntry("Stop motion", 2);
  21.381      glutAddSubMenu("Timing Mode", time_menu);
  21.382      glutAddMenuEntry("Quit", 4);
  21.383 -    
  21.384 +
  21.385      //glutAttachMenu(GLUT_RIGHT_BUTTON);
  21.386      glutAttachMenu(GLUT_RIGHT_BUTTON);
  21.387      glutMainLoop();
    22.1 --- a/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/main.c	Sat May 18 12:48:50 2013 -0700
    22.2 +++ b/Xcode/TemplatesForXcodeTiger/SDL OpenGL Application/main.c	Sat May 18 14:17:52 2013 -0700
    22.3 @@ -4,7 +4,7 @@
    22.4     Please see the SDL documentation for details on using the SDL API:
    22.5     /Developer/Documentation/SDL/docs.html
    22.6  */
    22.7 -   
    22.8 +
    22.9  #include <stdio.h>
   22.10  #include <stdlib.h>
   22.11  #include <string.h>
   22.12 @@ -22,18 +22,18 @@
   22.13  static void initAttributes ()
   22.14  {
   22.15      // Setup attributes we want for the OpenGL context
   22.16 -    
   22.17 +
   22.18      int value;
   22.19 -    
   22.20 +
   22.21      // Don't set color bit sizes (SDL_GL_RED_SIZE, etc)
   22.22      //    Mac OS X will always use 8-8-8-8 ARGB for 32-bit screens and
   22.23      //    5-5-5 RGB for 16-bit screens
   22.24 -    
   22.25 +
   22.26      // Request a 16-bit depth buffer (without this, there is no depth buffer)
   22.27      value = 16;
   22.28      SDL_GL_SetAttribute (SDL_GL_DEPTH_SIZE, value);
   22.29 -    
   22.30 -    
   22.31 +
   22.32 +
   22.33      // Request double-buffered OpenGL
   22.34      //     The fact that windows are double-buffered on Mac OS X has no effect
   22.35      //     on OpenGL double buffering.
   22.36 @@ -46,41 +46,41 @@
   22.37      // Print out attributes of the context we created
   22.38      int nAttr;
   22.39      int i;
   22.40 -    
   22.41 +
   22.42      int  attr[] = { SDL_GL_RED_SIZE, SDL_GL_BLUE_SIZE, SDL_GL_GREEN_SIZE,
   22.43                      SDL_GL_ALPHA_SIZE, SDL_GL_BUFFER_SIZE, SDL_GL_DEPTH_SIZE };
   22.44 -                    
   22.45 +
   22.46      char *desc[] = { "Red size: %d bits\n", "Blue size: %d bits\n", "Green size: %d bits\n",
   22.47 -                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n", 
   22.48 +                     "Alpha size: %d bits\n", "Color buffer size: %d bits\n",
   22.49                       "Depth bufer size: %d bits\n" };
   22.50  
   22.51      nAttr = sizeof(attr) / sizeof(int);
   22.52 -    
   22.53 +
   22.54      for (i = 0; i < nAttr; i++) {
   22.55 -    
   22.56 +
   22.57          int value;
   22.58          SDL_GL_GetAttribute (attr[i], &value);
   22.59          printf (desc[i], value);
   22.60 -    } 
   22.61 +    }
   22.62  }
   22.63  
   22.64  static void createSurface (int fullscreen)
   22.65  {
   22.66      Uint32 flags = 0;
   22.67 -    
   22.68 +
   22.69      flags = SDL_OPENGL;
   22.70      if (fullscreen)
   22.71          flags |= SDL_FULLSCREEN;
   22.72 -    
   22.73 +
   22.74      // Create window
   22.75      gScreen = SDL_SetVideoMode (640, 480, 0, flags);
   22.76      if (gScreen == NULL) {
   22.77 -		
   22.78 +
   22.79          fprintf (stderr, "Couldn't set 640x480 OpenGL video mode: %s\n",
   22.80                   SDL_GetError());
   22.81 -		SDL_Quit();
   22.82 -		exit(2);
   22.83 -	}
   22.84 +        SDL_Quit();
   22.85 +        exit(2);
   22.86 +    }
   22.87  }
   22.88  
   22.89  static void initGL ()
   22.90 @@ -100,30 +100,30 @@
   22.91      SDL_Event event;
   22.92      int done = 0;
   22.93      int fps = 24;
   22.94 -	int delay = 1000/fps;
   22.95 +    int delay = 1000/fps;
   22.96      int thenTicks = -1;
   22.97      int nowTicks;
   22.98 -    
   22.99 +
  22.100      while ( !done ) {
  22.101  
  22.102 -		/* Check for events */
  22.103 -		while ( SDL_PollEvent (&event) ) {
  22.104 -			switch (event.type) {
  22.105 +        /* Check for events */
  22.106 +        while ( SDL_PollEvent (&event) ) {
  22.107 +            switch (event.type) {
  22.108  
  22.109 -				case SDL_MOUSEMOTION:
  22.110 -					break;
  22.111 -				case SDL_MOUSEBUTTONDOWN:
  22.112 -					break;
  22.113 -				case SDL_KEYDOWN:
  22.114 -					/* Any keypress quits the app... */
  22.115 -				case SDL_QUIT:
  22.116 -					done = 1;
  22.117 -					break;
  22.118 -				default:
  22.119 -					break;
  22.120 -			}
  22.121 -		}
  22.122 -    
  22.123 +                case SDL_MOUSEMOTION:
  22.124 +                    break;
  22.125 +                case SDL_MOUSEBUTTONDOWN:
  22.126 +                    break;
  22.127 +                case SDL_KEYDOWN:
  22.128 +                    /* Any keypress quits the app... */
  22.129 +                case SDL_QUIT:
  22.130 +                    done = 1;
  22.131 +                    break;
  22.132 +                default:
  22.133 +                    break;
  22.134 +            }
  22.135 +        }
  22.136 +
  22.137          // Draw at 24 hz
  22.138          //     This approach is not normally recommended - it is better to
  22.139          //     use time-based animation and run as fast as possible
  22.140 @@ -144,36 +144,36 @@
  22.141          }
  22.142  
  22.143          SDL_Delay (delay);
  22.144 -	}
  22.145 +    }
  22.146  }
  22.147  
  22.148  int main(int argc, char *argv[])
  22.149  {
  22.150 -	// Init SDL video subsystem
  22.151 -	if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
  22.152 -		
  22.153 +    // Init SDL video subsystem
  22.154 +    if ( SDL_Init (SDL_INIT_VIDEO) < 0 ) {
  22.155 +
  22.156          fprintf(stderr, "Couldn't initialize SDL: %s\n",
  22.157 -			SDL_GetError());
  22.158 -		exit(1);
  22.159 -	}
  22.160 +            SDL_GetError());
  22.161 +        exit(1);
  22.162 +    }
  22.163  
  22.164      // Set GL context attributes
  22.165      initAttributes ();
  22.166 -    
  22.167 +
  22.168      // Create GL context
  22.169      createSurface (0);
  22.170 -    
  22.171 +
  22.172      // Get GL context attributes
  22.173      printAttributes ();
  22.174 -    
  22.175 +
  22.176      // Init GL state
  22.177      initGL ();
  22.178 -    
  22.179 +
  22.180      // Draw, get events...
  22.181      mainLoop ();
  22.182 -    
  22.183 +
  22.184      // Cleanup
  22.185 -	SDL_Quit();
  22.186 -	
  22.187 +    SDL_Quit();
  22.188 +
  22.189      return 0;
  22.190  }
    23.1 --- a/include/SDL.h	Sat May 18 12:48:50 2013 -0700
    23.2 +++ b/include/SDL.h	Sat May 18 14:17:52 2013 -0700
    23.3 @@ -21,42 +21,42 @@
    23.4  
    23.5  /**
    23.6   *  \file SDL.h
    23.7 - *  
    23.8 + *
    23.9   *  Main include header for the SDL library
   23.10   */
   23.11  
   23.12  /**
   23.13   *  \mainpage Simple DirectMedia Layer (SDL)
   23.14 - *  
   23.15 + *
   23.16   *  http://www.libsdl.org/
   23.17 - *  
   23.18 + *
   23.19   *  \section intro_sec Introduction
   23.20 - *  
   23.21 + *
   23.22   *  This is the Simple DirectMedia Layer, a general API that provides low
   23.23   *  level access to audio, keyboard, mouse, joystick, 3D hardware via OpenGL,
   23.24   *  and 2D framebuffer across multiple platforms.
   23.25 - *  
   23.26 + *
   23.27   *  SDL is written in C, but works with C++ natively, and has bindings to
   23.28   *  several other languages, including Ada, C#, Eiffel, Erlang, Euphoria,
   23.29   *  Guile, Haskell, Java, Lisp, Lua, ML, Objective C, Pascal, Perl, PHP,
   23.30   *  Pike, Pliant, Python, Ruby, and Smalltalk.
   23.31 - *  
   23.32 + *
   23.33   *  This library is distributed under the zlib license, which can be
   23.34   *  found in the file  "COPYING".  This license allows you to use SDL
   23.35   *  freely for any purpose as long as you retain the copyright notice.
   23.36 - *  
   23.37 + *
   23.38   *  The best way to learn how to use SDL is to check out the header files in
   23.39   *  the "include" subdirectory and the programs in the "test" subdirectory.
   23.40   *  The header files and test programs are well commented and always up to date.
   23.41   *  More documentation and FAQs are available online at:
   23.42 - *  	http://wiki.libsdl.org/
   23.43 - *  
   23.44 + *      http://wiki.libsdl.org/
   23.45 + *
   23.46   *  If you need help with the library, or just want to discuss SDL related
   23.47   *  issues, you can join the developers mailing list:
   23.48 - *  	http://www.libsdl.org/mailing-list.php
   23.49 - *  
   23.50 + *      http://www.libsdl.org/mailing-list.php
   23.51 + *
   23.52   *  Enjoy!
   23.53 - *  	Sam Lantinga				(slouken@libsdl.org)
   23.54 + *      Sam Lantinga                (slouken@libsdl.org)
   23.55   */
   23.56  
   23.57  #ifndef _SDL_H
   23.58 @@ -92,16 +92,14 @@
   23.59  #include "begin_code.h"
   23.60  /* Set up for C function definitions, even when using C++ */
   23.61  #ifdef __cplusplus
   23.62 -/* *INDENT-OFF* */
   23.63  extern "C" {
   23.64 -/* *INDENT-ON* */
   23.65  #endif
   23.66  
   23.67  /* As of version 0.5, SDL is loaded dynamically into the application */
   23.68  
   23.69  /**
   23.70   *  \name SDL_INIT_*
   23.71 - *  
   23.72 + *
   23.73   *  These are the flags which may be passed to SDL_Init().  You should
   23.74   *  specify the subsystems which you will be using in your application.
   23.75   */
   23.76 @@ -111,7 +109,7 @@
   23.77  #define SDL_INIT_VIDEO          0x00000020
   23.78  #define SDL_INIT_JOYSTICK       0x00000200
   23.79  #define SDL_INIT_HAPTIC         0x00001000
   23.80 -#define SDL_INIT_GAMECONTROLLER 0x00002000		/**< turn on game controller also implicitly does JOYSTICK */
   23.81 +#define SDL_INIT_GAMECONTROLLER 0x00002000      /**< turn on game controller also implicitly does JOYSTICK */
   23.82  #define SDL_INIT_NOPARACHUTE    0x00100000      /**< Don't catch fatal signals */
   23.83  #define SDL_INIT_EVERYTHING ( \
   23.84                  SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO | \
   23.85 @@ -139,7 +137,7 @@
   23.86  /**
   23.87   *  This function returns a mask of the specified subsystems which have
   23.88   *  previously been initialized.
   23.89 - *  
   23.90 + *
   23.91   *  If \c flags is 0, it returns a mask of all initialized subsystems.
   23.92   */
   23.93  extern DECLSPEC Uint32 SDLCALL SDL_WasInit(Uint32 flags);
   23.94 @@ -152,9 +150,7 @@
   23.95  
   23.96  /* Ends C function definitions when using C++ */
   23.97  #ifdef __cplusplus
   23.98 -/* *INDENT-OFF* */
   23.99  }
  23.100 -/* *INDENT-ON* */
  23.101  #endif
  23.102  #include "close_code.h"
  23.103  
    24.1 --- a/include/SDL_assert.h	Sat May 18 12:48:50 2013 -0700
    24.2 +++ b/include/SDL_assert.h	Sat May 18 14:17:52 2013 -0700
    24.3 @@ -27,9 +27,7 @@
    24.4  #include "begin_code.h"
    24.5  /* Set up for C function definitions, even when using C++ */
    24.6  #ifdef __cplusplus
    24.7 -/* *INDENT-OFF* */
    24.8  extern "C" {
    24.9 -/* *INDENT-ON* */
   24.10  #endif
   24.11  
   24.12  #ifndef SDL_ASSERT_LEVEL
   24.13 @@ -187,7 +185,7 @@
   24.14   *  This callback is NOT reset to SDL's internal handler upon SDL_Quit()!
   24.15   *
   24.16   *  \return SDL_assert_state value of how to handle the assertion failure.
   24.17 - *  
   24.18 + *
   24.19   *  \param handler Callback function, called when an assertion fails.
   24.20   *  \param userdata A pointer passed to the callback as-is.
   24.21   */
   24.22 @@ -230,9 +228,7 @@
   24.23  
   24.24  /* Ends C function definitions when using C++ */
   24.25  #ifdef __cplusplus
   24.26 -/* *INDENT-OFF* */
   24.27  }
   24.28 -/* *INDENT-ON* */
   24.29  #endif
   24.30  #include "close_code.h"
   24.31  
    25.1 --- a/include/SDL_atomic.h	Sat May 18 12:48:50 2013 -0700
    25.2 +++ b/include/SDL_atomic.h	Sat May 18 14:17:52 2013 -0700
    25.3 @@ -21,25 +21,25 @@
    25.4  
    25.5  /**
    25.6   * \file SDL_atomic.h
    25.7 - * 
    25.8 + *
    25.9   * Atomic operations.
   25.10 - * 
   25.11 + *
   25.12   * IMPORTANT:
   25.13   * If you are not an expert in concurrent lockless programming, you should
   25.14   * only be using the atomic lock and reference counting functions in this
   25.15   * file.  In all other cases you should be protecting your data structures
   25.16   * with full mutexes.
   25.17 - * 
   25.18 + *
   25.19   * The list of "safe" functions to use are:
   25.20   *  SDL_AtomicLock()
   25.21   *  SDL_AtomicUnlock()
   25.22   *  SDL_AtomicIncRef()
   25.23   *  SDL_AtomicDecRef()
   25.24 - * 
   25.25 + *
   25.26   * Seriously, here be dragons!
   25.27   * ^^^^^^^^^^^^^^^^^^^^^^^^^^^
   25.28   *
   25.29 - * You can find out a little more about lockless programming and the 
   25.30 + * You can find out a little more about lockless programming and the
   25.31   * subtle issues that can arise here:
   25.32   * http://msdn.microsoft.com/en-us/library/ee418650%28v=vs.85%29.aspx
   25.33   *
   25.34 @@ -72,14 +72,12 @@
   25.35  
   25.36  /* Set up for C function definitions, even when using C++ */
   25.37  #ifdef __cplusplus
   25.38 -/* *INDENT-OFF* */
   25.39  extern "C" {
   25.40 -/* *INDENT-ON* */
   25.41  #endif
   25.42  
   25.43  /**
   25.44   * \name SDL AtomicLock
   25.45 - * 
   25.46 + *
   25.47   * The atomic locks are efficient spinlocks using CPU instructions,
   25.48   * but are vulnerable to starvation and can spin forever if a thread
   25.49   * holding a lock has been terminated.  For this reason you should
   25.50 @@ -98,7 +96,7 @@
   25.51  
   25.52  /**
   25.53   * \brief Try to lock a spin lock by setting it to a non-zero value.
   25.54 - * 
   25.55 + *
   25.56   * \param lock Points to the lock.
   25.57   *
   25.58   * \return SDL_TRUE if the lock succeeded, SDL_FALSE if the lock is already held.
   25.59 @@ -107,7 +105,7 @@
   25.60  
   25.61  /**
   25.62   * \brief Lock a spin lock by setting it to a non-zero value.
   25.63 - * 
   25.64 + *
   25.65   * \param lock Points to the lock.
   25.66   */
   25.67  extern DECLSPEC void SDLCALL SDL_AtomicLock(SDL_SpinLock *lock);
   25.68 @@ -304,9 +302,7 @@
   25.69  
   25.70  /* Ends C function definitions when using C++ */
   25.71  #ifdef __cplusplus
   25.72 -/* *INDENT-OFF* */
   25.73  }
   25.74 -/* *INDENT-ON* */
   25.75  #endif
   25.76  
   25.77  #include "close_code.h"
    26.1 --- a/include/SDL_audio.h	Sat May 18 12:48:50 2013 -0700
    26.2 +++ b/include/SDL_audio.h	Sat May 18 14:17:52 2013 -0700
    26.3 @@ -21,7 +21,7 @@
    26.4  
    26.5  /**
    26.6   *  \file SDL_audio.h
    26.7 - *  
    26.8 + *
    26.9   *  Access to the raw audio mixing buffer for the SDL library.
   26.10   */
   26.11  
   26.12 @@ -38,17 +38,15 @@
   26.13  #include "begin_code.h"
   26.14  /* Set up for C function definitions, even when using C++ */
   26.15  #ifdef __cplusplus
   26.16 -/* *INDENT-OFF* */
   26.17  extern "C" {
   26.18 -/* *INDENT-ON* */
   26.19  #endif
   26.20  
   26.21  /**
   26.22   *  \brief Audio format flags.
   26.23 - *  
   26.24 + *
   26.25   *  These are what the 16 bits in SDL_AudioFormat currently mean...
   26.26   *  (Unspecified bits are always zero).
   26.27 - *  
   26.28 + *
   26.29   *  \verbatim
   26.30      ++-----------------------sample is signed if set
   26.31      ||
   26.32 @@ -60,7 +58,7 @@
   26.33      ||       ||          || |                     |
   26.34      15 14 13 12 11 10 09 08 07 06 05 04 03 02 01 00
   26.35      \endverbatim
   26.36 - *  
   26.37 + *
   26.38   *  There are macros in SDL 2.0 and later to query these bits.
   26.39   */
   26.40  typedef Uint16 SDL_AudioFormat;
   26.41 @@ -82,42 +80,38 @@
   26.42  #define SDL_AUDIO_ISLITTLEENDIAN(x)  (!SDL_AUDIO_ISBIGENDIAN(x))
   26.43  #define SDL_AUDIO_ISUNSIGNED(x)      (!SDL_AUDIO_ISSIGNED(x))
   26.44  
   26.45 -/** 
   26.46 +/**
   26.47   *  \name Audio format flags
   26.48   *
   26.49   *  Defaults to LSB byte order.
   26.50   */
   26.51  /*@{*/
   26.52 -#define AUDIO_U8	0x0008  /**< Unsigned 8-bit samples */
   26.53 -#define AUDIO_S8	0x8008  /**< Signed 8-bit samples */
   26.54 -#define AUDIO_U16LSB	0x0010  /**< Unsigned 16-bit samples */
   26.55 -#define AUDIO_S16LSB	0x8010  /**< Signed 16-bit samples */
   26.56 -#define AUDIO_U16MSB	0x1010  /**< As above, but big-endian byte order */
   26.57 -#define AUDIO_S16MSB	0x9010  /**< As above, but big-endian byte order */
   26.58 -#define AUDIO_U16	AUDIO_U16LSB
   26.59 -#define AUDIO_S16	AUDIO_S16LSB
   26.60 +#define AUDIO_U8        0x0008  /**< Unsigned 8-bit samples */
   26.61 +#define AUDIO_S8        0x8008  /**< Signed 8-bit samples */
   26.62 +#define AUDIO_U16LSB    0x0010  /**< Unsigned 16-bit samples */
   26.63 +#define AUDIO_S16LSB    0x8010  /**< Signed 16-bit samples */
   26.64 +#define AUDIO_U16MSB    0x1010  /**< As above, but big-endian byte order */
   26.65 +#define AUDIO_S16MSB    0x9010  /**< As above, but big-endian byte order */
   26.66 +#define AUDIO_U16       AUDIO_U16LSB
   26.67 +#define AUDIO_S16       AUDIO_S16LSB
   26.68  /*@}*/
   26.69  
   26.70  /**
   26.71   *  \name int32 support
   26.72 - *  
   26.73 - *  New to SDL 1.3.
   26.74   */
   26.75  /*@{*/
   26.76 -#define AUDIO_S32LSB	0x8020  /**< 32-bit integer samples */
   26.77 -#define AUDIO_S32MSB	0x9020  /**< As above, but big-endian byte order */
   26.78 -#define AUDIO_S32	AUDIO_S32LSB
   26.79 +#define AUDIO_S32LSB    0x8020  /**< 32-bit integer samples */
   26.80 +#define AUDIO_S32MSB    0x9020  /**< As above, but big-endian byte order */
   26.81 +#define AUDIO_S32       AUDIO_S32LSB
   26.82  /*@}*/
   26.83  
   26.84  /**
   26.85   *  \name float32 support
   26.86 - *  
   26.87 - *  New to SDL 1.3.
   26.88   */
   26.89  /*@{*/
   26.90 -#define AUDIO_F32LSB	0x8120  /**< 32-bit floating point samples */
   26.91 -#define AUDIO_F32MSB	0x9120  /**< As above, but big-endian byte order */
   26.92 -#define AUDIO_F32	AUDIO_F32LSB
   26.93 +#define AUDIO_F32LSB    0x8120  /**< 32-bit floating point samples */
   26.94 +#define AUDIO_F32MSB    0x9120  /**< As above, but big-endian byte order */
   26.95 +#define AUDIO_F32       AUDIO_F32LSB
   26.96  /*@}*/
   26.97  
   26.98  /**
   26.99 @@ -125,21 +119,21 @@
  26.100   */
  26.101  /*@{*/
  26.102  #if SDL_BYTEORDER == SDL_LIL_ENDIAN
  26.103 -#define AUDIO_U16SYS	AUDIO_U16LSB
  26.104 -#define AUDIO_S16SYS	AUDIO_S16LSB
  26.105 -#define AUDIO_S32SYS	AUDIO_S32LSB
  26.106 -#define AUDIO_F32SYS	AUDIO_F32LSB
  26.107 +#define AUDIO_U16SYS    AUDIO_U16LSB
  26.108 +#define AUDIO_S16SYS    AUDIO_S16LSB
  26.109 +#define AUDIO_S32SYS    AUDIO_S32LSB
  26.110 +#define AUDIO_F32SYS    AUDIO_F32LSB
  26.111  #else
  26.112 -#define AUDIO_U16SYS	AUDIO_U16MSB
  26.113 -#define AUDIO_S16SYS	AUDIO_S16MSB
  26.114 -#define AUDIO_S32SYS	AUDIO_S32MSB
  26.115 -#define AUDIO_F32SYS	AUDIO_F32MSB
  26.116 +#define AUDIO_U16SYS    AUDIO_U16MSB
  26.117 +#define AUDIO_S16SYS    AUDIO_S16MSB
  26.118 +#define AUDIO_S32SYS    AUDIO_S32MSB
  26.119 +#define AUDIO_F32SYS    AUDIO_F32MSB
  26.120  #endif
  26.121  /*@}*/
  26.122  
  26.123 -/** 
  26.124 +/**
  26.125   *  \name Allow change flags
  26.126 - *  
  26.127 + *
  26.128   *  Which audio format changes are allowed when opening a device.
  26.129   */
  26.130  /*@{*/
  26.131 @@ -209,7 +203,7 @@
  26.132  
  26.133  /**
  26.134   *  \name Driver discovery functions
  26.135 - *  
  26.136 + *
  26.137   *  These functions return the list of built in audio drivers, in the
  26.138   *  order that they are normally initialized by default.
  26.139   */
  26.140 @@ -220,9 +214,9 @@
  26.141  
  26.142  /**
  26.143   *  \name Initialization and cleanup
  26.144 - *  
  26.145 + *
  26.146   *  \internal These functions are used internally, and should not be used unless
  26.147 - *            you have a specific need to specify the audio driver you want to 
  26.148 + *            you have a specific need to specify the audio driver you want to
  26.149   *            use.  You should normally use SDL_Init() or SDL_InitSubSystem().
  26.150   */
  26.151  /*@{*/
  26.152 @@ -242,20 +236,20 @@
  26.153   *  structure pointed to by \c obtained.  If \c obtained is NULL, the audio
  26.154   *  data passed to the callback function will be guaranteed to be in the
  26.155   *  requested format, and will be automatically converted to the hardware
  26.156 - *  audio format if necessary.  This function returns -1 if it failed 
  26.157 + *  audio format if necessary.  This function returns -1 if it failed
  26.158   *  to open the audio device, or couldn't set up the audio thread.
  26.159 - *  
  26.160 + *
  26.161   *  When filling in the desired audio spec structure,
  26.162   *    - \c desired->freq should be the desired audio frequency in samples-per-
  26.163   *      second.
  26.164   *    - \c desired->format should be the desired audio format.
  26.165 - *    - \c desired->samples is the desired size of the audio buffer, in 
  26.166 - *      samples.  This number should be a power of two, and may be adjusted by 
  26.167 + *    - \c desired->samples is the desired size of the audio buffer, in
  26.168 + *      samples.  This number should be a power of two, and may be adjusted by
  26.169   *      the audio driver to a value more suitable for the hardware.  Good values
  26.170 - *      seem to range between 512 and 8096 inclusive, depending on the 
  26.171 - *      application and CPU speed.  Smaller values yield faster response time, 
  26.172 - *      but can lead to underflow if the application is doing heavy processing 
  26.173 - *      and cannot fill the audio buffer in time.  A stereo sample consists of 
  26.174 + *      seem to range between 512 and 8096 inclusive, depending on the
  26.175 + *      application and CPU speed.  Smaller values yield faster response time,
  26.176 + *      but can lead to underflow if the application is doing heavy processing
  26.177 + *      and cannot fill the audio buffer in time.  A stereo sample consists of
  26.178   *      both right and left channels in LR ordering.
  26.179   *      Note that the number of samples is directly related to time by the
  26.180   *      following formula:  \code ms = (samples*1000)/freq \endcode
  26.181 @@ -271,7 +265,7 @@
  26.182   *      and SDL_UnlockAudio() in your code.
  26.183   *    - \c desired->userdata is passed as the first parameter to your callback
  26.184   *      function.
  26.185 - *  
  26.186 + *
  26.187   *  The audio device starts out playing silence when it's opened, and should
  26.188   *  be enabled for playing by calling \c SDL_PauseAudio(0) when you are ready
  26.189   *  for your audio callback function to be called.  Since the audio driver
  26.190 @@ -283,7 +277,7 @@
  26.191  
  26.192  /**
  26.193   *  SDL Audio Device IDs.
  26.194 - *  
  26.195 + *
  26.196   *  A successful call to SDL_OpenAudio() is always device id 1, and legacy
  26.197   *  SDL audio APIs assume you want this device ID. SDL_OpenAudioDevice() calls
  26.198   *  always returns devices >= 2 on success. The legacy calls are good both
  26.199 @@ -299,7 +293,7 @@
  26.200   *  not an error. For example, if SDL is set up to talk to a remote audio
  26.201   *  server, it can't list every one available on the Internet, but it will
  26.202   *  still allow a specific host to be specified to SDL_OpenAudioDevice().
  26.203 - *  
  26.204 + *
  26.205   *  In many common cases, when this function returns a value <= 0, it can still
  26.206   *  successfully open the default device (NULL for first argument of
  26.207   *  SDL_OpenAudioDevice()).
  26.208 @@ -313,7 +307,7 @@
  26.209   *  The values returned by this function reflect the latest call to
  26.210   *  SDL_GetNumAudioDevices(); recall that function to redetect available
  26.211   *  hardware.
  26.212 - *  
  26.213 + *
  26.214   *  The string returned by this function is UTF-8 encoded, read-only, and
  26.215   *  managed internally. You are not to free it. If you need to keep the
  26.216   *  string for any length of time, you should make your own copy of it, as it
  26.217 @@ -326,14 +320,14 @@
  26.218  /**
  26.219   *  Open a specific audio device. Passing in a device name of NULL requests
  26.220   *  the most reasonable default (and is equivalent to calling SDL_OpenAudio()).
  26.221 - *  
  26.222 + *
  26.223   *  The device name is a UTF-8 string reported by SDL_GetAudioDeviceName(), but
  26.224   *  some drivers allow arbitrary and driver-specific strings, such as a
  26.225   *  hostname/IP address for a remote audio server, or a filename in the
  26.226   *  diskaudio driver.
  26.227 - *  
  26.228 + *
  26.229   *  \return 0 on error, a valid device ID that is >= 2 on success.
  26.230 - *  
  26.231 + *
  26.232   *  SDL_OpenAudio(), unlike this function, always acts on device ID 1.
  26.233   */
  26.234  extern DECLSPEC SDL_AudioDeviceID SDLCALL SDL_OpenAudioDevice(const char
  26.235 @@ -351,7 +345,7 @@
  26.236  
  26.237  /**
  26.238   *  \name Audio state
  26.239 - *  
  26.240 + *
  26.241   *  Get the current audio state.
  26.242   */
  26.243  /*@{*/
  26.244 @@ -369,7 +363,7 @@
  26.245  
  26.246  /**
  26.247   *  \name Pause audio functions
  26.248 - *  
  26.249 + *
  26.250   *  These functions pause and unpause the audio callback processing.
  26.251   *  They should be called with a parameter of 0 after opening the audio
  26.252   *  device to start playing sound.  This is so you can safely initialize
  26.253 @@ -387,18 +381,18 @@
  26.254   *  that source if \c freesrc is non-zero.  For example, to load a WAVE file,
  26.255   *  you could do:
  26.256   *  \code
  26.257 - *  	SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
  26.258 + *      SDL_LoadWAV_RW(SDL_RWFromFile("sample.wav", "rb"), 1, ...);
  26.259   *  \endcode
  26.260   *
  26.261   *  If this function succeeds, it returns the given SDL_AudioSpec,
  26.262   *  filled with the audio data format of the wave data, and sets
  26.263   *  \c *audio_buf to a malloc()'d buffer containing the audio data,
  26.264   *  and sets \c *audio_len to the length of that audio buffer, in bytes.
  26.265 - *  You need to free the audio buffer with SDL_FreeWAV() when you are 
  26.266 + *  You need to free the audio buffer with SDL_FreeWAV() when you are
  26.267   *  done with it.
  26.268   *
  26.269 - *  This function returns NULL and sets the SDL error message if the 
  26.270 - *  wave file cannot be opened, uses an unknown data format, or is 
  26.271 + *  This function returns NULL and sets the SDL error message if the
  26.272 + *  wave file cannot be opened, uses an unknown data format, or is
  26.273   *  corrupt.  Currently raw and MS-ADPCM WAVE files are supported.
  26.274   */
  26.275  extern DECLSPEC SDL_AudioSpec *SDLCALL SDL_LoadWAV_RW(SDL_RWops * src,
  26.276 @@ -407,12 +401,12 @@
  26.277                                                        Uint8 ** audio_buf,
  26.278                                                        Uint32 * audio_len);
  26.279  
  26.280 -/** 
  26.281 +/**
  26.282   *  Loads a WAV from a file.
  26.283   *  Compatibility convenience function.
  26.284   */
  26.285  #define SDL_LoadWAV(file, spec, audio_buf, audio_len) \
  26.286 -	SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
  26.287 +    SDL_LoadWAV_RW(SDL_RWFromFile(file, "rb"),1, spec,audio_buf,audio_len)
  26.288  
  26.289  /**
  26.290   *  This function frees data previously allocated with SDL_LoadWAV_RW()
  26.291 @@ -424,7 +418,7 @@
  26.292   *  and rate, and initializes the \c cvt structure with information needed
  26.293   *  by SDL_ConvertAudio() to convert a buffer of audio data from one format
  26.294   *  to the other.
  26.295 - *  
  26.296 + *
  26.297   *  \return -1 if the format conversion is not supported, 0 if there's
  26.298   *  no conversion needed, or 1 if the audio filter is set up.
  26.299   */
  26.300 @@ -441,7 +435,7 @@
  26.301   *  created an audio buffer \c cvt->buf, and filled it with \c cvt->len bytes of
  26.302   *  audio data in the source format, this function will convert it in-place
  26.303   *  to the desired format.
  26.304 - *  
  26.305 + *
  26.306   *  The data conversion may expand the size of the audio data, so the buffer
  26.307   *  \c cvt->buf should be allocated after the \c cvt structure is initialized by
  26.308   *  SDL_BuildAudioCVT(), and should be \c cvt->len*cvt->len_mult bytes long.
  26.309 @@ -471,9 +465,9 @@
  26.310  
  26.311  /**
  26.312   *  \name Audio lock functions
  26.313 - *  
  26.314 + *
  26.315   *  The lock manipulated by these functions protects the callback function.
  26.316 - *  During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that 
  26.317 + *  During a SDL_LockAudio()/SDL_UnlockAudio() pair, you can be guaranteed that
  26.318   *  the callback function is not running.  Do not call these from the callback
  26.319   *  function or you will cause deadlock.
  26.320   */
  26.321 @@ -498,9 +492,7 @@
  26.322  
  26.323  /* Ends C function definitions when using C++ */
  26.324  #ifdef __cplusplus
  26.325 -/* *INDENT-OFF* */
  26.326  }
  26.327 -/* *INDENT-ON* */
  26.328  #endif
  26.329  #include "close_code.h"
  26.330  
    27.1 --- a/include/SDL_bits.h	Sat May 18 12:48:50 2013 -0700
    27.2 +++ b/include/SDL_bits.h	Sat May 18 14:17:52 2013 -0700
    27.3 @@ -33,9 +33,7 @@
    27.4  #include "begin_code.h"
    27.5  /* Set up for C function definitions, even when using C++ */
    27.6  #ifdef __cplusplus
    27.7 -/* *INDENT-OFF* */
    27.8  extern "C" {
    27.9 -/* *INDENT-ON* */
   27.10  #endif
   27.11  
   27.12  /**
   27.13 @@ -83,9 +81,7 @@
   27.14  
   27.15  /* Ends C function definitions when using C++ */
   27.16  #ifdef __cplusplus
   27.17 -/* *INDENT-OFF* */
   27.18  }
   27.19 -/* *INDENT-ON* */
   27.20  #endif
   27.21  #include "close_code.h"
   27.22  
    28.1 --- a/include/SDL_blendmode.h	Sat May 18 12:48:50 2013 -0700
    28.2 +++ b/include/SDL_blendmode.h	Sat May 18 14:17:52 2013 -0700
    28.3 @@ -21,7 +21,7 @@
    28.4  
    28.5  /**
    28.6   *  \file SDL_blendmode.h
    28.7 - *  
    28.8 + *
    28.9   *  Header file declaring the SDL_BlendMode enumeration
   28.10   */
   28.11  
   28.12 @@ -31,9 +31,7 @@
   28.13  #include "begin_code.h"
   28.14  /* Set up for C function definitions, even when using C++ */
   28.15  #ifdef __cplusplus
   28.16 -/* *INDENT-OFF* */
   28.17  extern "C" {
   28.18 -/* *INDENT-ON* */
   28.19  #endif
   28.20  
   28.21  /**
   28.22 @@ -49,9 +47,7 @@
   28.23  
   28.24  /* Ends C function definitions when using C++ */
   28.25  #ifdef __cplusplus
   28.26 -/* *INDENT-OFF* */
   28.27  }
   28.28 -/* *INDENT-ON* */
   28.29  #endif
   28.30  #include "close_code.h"
   28.31  
    29.1 --- a/include/SDL_clipboard.h	Sat May 18 12:48:50 2013 -0700
    29.2 +++ b/include/SDL_clipboard.h	Sat May 18 14:17:52 2013 -0700
    29.3 @@ -33,9 +33,7 @@
    29.4  #include "begin_code.h"
    29.5  /* Set up for C function definitions, even when using C++ */
    29.6  #ifdef __cplusplus
    29.7 -/* *INDENT-OFF* */
    29.8  extern "C" {
    29.9 -/* *INDENT-ON* */
   29.10  #endif
   29.11  
   29.12  /* Function prototypes */
   29.13 @@ -64,9 +62,7 @@
   29.14  
   29.15  /* Ends C function definitions when using C++ */
   29.16  #ifdef __cplusplus
   29.17 -/* *INDENT-OFF* */
   29.18  }
   29.19 -/* *INDENT-ON* */
   29.20  #endif
   29.21  #include "close_code.h"
   29.22  
    30.1 --- a/include/SDL_config.h	Sat May 18 12:48:50 2013 -0700
    30.2 +++ b/include/SDL_config.h	Sat May 18 14:17:52 2013 -0700
    30.3 @@ -27,13 +27,13 @@
    30.4  /**
    30.5   *  \file SDL_config.h
    30.6   */
    30.7 - 
    30.8 +
    30.9  /* Add any platform that doesn't build using the configure system. */
   30.10  #if defined(__WIN32__)
   30.11  #include "SDL_config_windows.h"
   30.12  #elif defined(__MACOSX__)
   30.13  #include "SDL_config_macosx.h"
   30.14 -#elif defined(__IPHONEOS__) 
   30.15 +#elif defined(__IPHONEOS__)
   30.16  #include "SDL_config_iphoneos.h"
   30.17  #elif defined(__ANDROID__)
   30.18  #include "SDL_config_android.h"
    31.1 --- a/include/SDL_config_android.h	Sat May 18 12:48:50 2013 -0700
    31.2 +++ b/include/SDL_config_android.h	Sat May 18 14:17:52 2013 -0700
    31.3 @@ -26,109 +26,109 @@
    31.4  
    31.5  /**
    31.6   *  \file SDL_config_android.h
    31.7 - *  
    31.8 + *
    31.9   *  This is a configuration that can be used to build SDL for Android
   31.10   */
   31.11  
   31.12  #include <stdarg.h>
   31.13  
   31.14 -#define HAVE_ALLOCA_H		1
   31.15 -#define HAVE_SYS_TYPES_H	1
   31.16 -#define HAVE_STDIO_H	1
   31.17 -#define STDC_HEADERS	1
   31.18 -#define HAVE_STRING_H	1
   31.19 -#define HAVE_INTTYPES_H	1
   31.20 -#define HAVE_STDINT_H	1
   31.21 -#define HAVE_CTYPE_H	1
   31.22 -#define HAVE_MATH_H	1
   31.23 -#define HAVE_SIGNAL_H	1
   31.24 +#define HAVE_ALLOCA_H       1
   31.25 +#define HAVE_SYS_TYPES_H    1
   31.26 +#define HAVE_STDIO_H    1
   31.27 +#define STDC_HEADERS    1
   31.28 +#define HAVE_STRING_H   1
   31.29 +#define HAVE_INTTYPES_H 1
   31.30 +#define HAVE_STDINT_H   1
   31.31 +#define HAVE_CTYPE_H    1
   31.32 +#define HAVE_MATH_H 1
   31.33 +#define HAVE_SIGNAL_H   1
   31.34  
   31.35  /* C library functions */
   31.36 -#define HAVE_MALLOC	1
   31.37 -#define HAVE_CALLOC	1
   31.38 -#define HAVE_REALLOC	1
   31.39 -#define HAVE_FREE	1
   31.40 -#define HAVE_ALLOCA	1
   31.41 -#define HAVE_GETENV	1
   31.42 -#define HAVE_SETENV	1
   31.43 -#define HAVE_PUTENV	1
   31.44 -#define HAVE_SETENV	1
   31.45 -#define HAVE_UNSETENV	1
   31.46 -#define HAVE_QSORT	1
   31.47 -#define HAVE_ABS	1
   31.48 -#define HAVE_BCOPY	1
   31.49 -#define HAVE_MEMSET	1
   31.50 -#define HAVE_MEMCPY	1
   31.51 -#define HAVE_MEMMOVE	1
   31.52 -#define HAVE_MEMCMP	1
   31.53 -#define HAVE_STRLEN	1
   31.54 -#define HAVE_STRLCPY	1
   31.55 -#define HAVE_STRLCAT	1
   31.56 -#define HAVE_STRDUP	1
   31.57 -#define HAVE_STRCHR	1
   31.58 -#define HAVE_STRRCHR	1
   31.59 -#define HAVE_STRSTR	1
   31.60 -#define HAVE_STRTOL	1
   31.61 -#define HAVE_STRTOUL	1
   31.62 -#define HAVE_STRTOLL	1
   31.63 -#define HAVE_STRTOULL	1
   31.64 -#define HAVE_STRTOD	1
   31.65 -#define HAVE_ATOI	1
   31.66 -#define HAVE_ATOF	1
   31.67 -#define HAVE_STRCMP	1
   31.68 -#define HAVE_STRNCMP	1
   31.69 -#define HAVE_STRCASECMP	1
   31.70 +#define HAVE_MALLOC 1
   31.71 +#define HAVE_CALLOC 1
   31.72 +#define HAVE_REALLOC    1
   31.73 +#define HAVE_FREE   1
   31.74 +#define HAVE_ALLOCA 1
   31.75 +#define HAVE_GETENV 1
   31.76 +#define HAVE_SETENV 1
   31.77 +#define HAVE_PUTENV 1
   31.78 +#define HAVE_SETENV 1
   31.79 +#define HAVE_UNSETENV   1
   31.80 +#define HAVE_QSORT  1
   31.81 +#define HAVE_ABS    1
   31.82 +#define HAVE_BCOPY  1
   31.83 +#define HAVE_MEMSET 1
   31.84 +#define HAVE_MEMCPY 1
   31.85 +#define HAVE_MEMMOVE    1
   31.86 +#define HAVE_MEMCMP 1
   31.87 +#define HAVE_STRLEN 1
   31.88 +#define HAVE_STRLCPY    1
   31.89 +#define HAVE_STRLCAT    1
   31.90 +#define HAVE_STRDUP 1
   31.91 +#define HAVE_STRCHR 1
   31.92 +#define HAVE_STRRCHR    1
   31.93 +#define HAVE_STRSTR 1
   31.94 +#define HAVE_STRTOL 1
   31.95 +#define HAVE_STRTOUL    1
   31.96 +#define HAVE_STRTOLL    1
   31.97 +#define HAVE_STRTOULL   1
   31.98 +#define HAVE_STRTOD 1
   31.99 +#define HAVE_ATOI   1
  31.100 +#define HAVE_ATOF   1
  31.101 +#define HAVE_STRCMP 1
  31.102 +#define HAVE_STRNCMP    1
  31.103 +#define HAVE_STRCASECMP 1
  31.104  #define HAVE_STRNCASECMP 1
  31.105 -#define HAVE_SSCANF	1
  31.106 -#define HAVE_SNPRINTF	1
  31.107 -#define HAVE_VSNPRINTF	1
  31.108 -#define HAVE_M_PI	1
  31.109 -#define HAVE_ATAN	1
  31.110 -#define HAVE_ATAN2	1
  31.111 -#define HAVE_CEIL	1
  31.112 -#define HAVE_COPYSIGN	1
  31.113 -#define HAVE_COS	1
  31.114 -#define HAVE_COSF	1
  31.115 -#define HAVE_FABS	1
  31.116 -#define HAVE_FLOOR	1
  31.117 -#define HAVE_LOG	1
  31.118 -#define HAVE_POW	1
  31.119 -#define HAVE_SCALBN	1
  31.120 -#define HAVE_SIN	1
  31.121 -#define HAVE_SINF	1
  31.122 -#define HAVE_SQRT	1
  31.123 -#define HAVE_SIGACTION	1
  31.124 -#define HAVE_SETJMP	1
  31.125 -#define HAVE_NANOSLEEP	1
  31.126 -#define HAVE_SYSCONF	1
  31.127 +#define HAVE_SSCANF 1
  31.128 +#define HAVE_SNPRINTF   1
  31.129 +#define HAVE_VSNPRINTF  1
  31.130 +#define HAVE_M_PI   1
  31.131 +#define HAVE_ATAN   1
  31.132 +#define HAVE_ATAN2  1
  31.133 +#define HAVE_CEIL   1
  31.134 +#define HAVE_COPYSIGN   1
  31.135 +#define HAVE_COS    1
  31.136 +#define HAVE_COSF   1
  31.137 +#define HAVE_FABS   1
  31.138 +#define HAVE_FLOOR  1
  31.139 +#define HAVE_LOG    1
  31.140 +#define HAVE_POW    1
  31.141 +#define HAVE_SCALBN 1
  31.142 +#define HAVE_SIN    1
  31.143 +#define HAVE_SINF   1
  31.144 +#define HAVE_SQRT   1
  31.145 +#define HAVE_SIGACTION  1
  31.146 +#define HAVE_SETJMP 1
  31.147 +#define HAVE_NANOSLEEP  1
  31.148 +#define HAVE_SYSCONF    1
  31.149  
  31.150  #define SIZEOF_VOIDP 4
  31.151  
  31.152  /* Enable various audio drivers */
  31.153 -#define SDL_AUDIO_DRIVER_ANDROID	1
  31.154 -#define SDL_AUDIO_DRIVER_DUMMY	1
  31.155 +#define SDL_AUDIO_DRIVER_ANDROID    1
  31.156 +#define SDL_AUDIO_DRIVER_DUMMY  1
  31.157  
  31.158  /* Enable various input drivers */
  31.159 -#define SDL_JOYSTICK_ANDROID	1
  31.160 -#define SDL_HAPTIC_DUMMY	1
  31.161 +#define SDL_JOYSTICK_ANDROID    1
  31.162 +#define SDL_HAPTIC_DUMMY    1
  31.163  
  31.164  /* Enable various shared object loading systems */
  31.165 -#define SDL_LOADSO_DLOPEN	1
  31.166 +#define SDL_LOADSO_DLOPEN   1
  31.167  
  31.168  /* Enable various threading systems */
  31.169 -#define SDL_THREAD_PTHREAD	1
  31.170 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
  31.171 +#define SDL_THREAD_PTHREAD  1
  31.172 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
  31.173  
  31.174  /* Enable various timer systems */
  31.175 -#define SDL_TIMER_UNIX	1
  31.176 +#define SDL_TIMER_UNIX  1
  31.177  
  31.178  /* Enable various video drivers */
  31.179  #define SDL_VIDEO_DRIVER_ANDROID 1
  31.180  
  31.181  /* Enable OpenGL ES */
  31.182 -#define SDL_VIDEO_OPENGL_ES	1
  31.183 -#define SDL_VIDEO_RENDER_OGL_ES	1
  31.184 -#define SDL_VIDEO_RENDER_OGL_ES2	1
  31.185 +#define SDL_VIDEO_OPENGL_ES 1
  31.186 +#define SDL_VIDEO_RENDER_OGL_ES 1
  31.187 +#define SDL_VIDEO_RENDER_OGL_ES2    1
  31.188  
  31.189  /* Enable system power support */
  31.190  #define SDL_POWER_ANDROID 1
    32.1 --- a/include/SDL_config_iphoneos.h	Sat May 18 12:48:50 2013 -0700
    32.2 +++ b/include/SDL_config_iphoneos.h	Sat May 18 14:17:52 2013 -0700
    32.3 @@ -30,109 +30,109 @@
    32.4  #define SIZEOF_VOIDP 4
    32.5  #endif
    32.6  
    32.7 -#define HAVE_GCC_ATOMICS	1
    32.8 +#define HAVE_GCC_ATOMICS    1
    32.9  
   32.10 -#define HAVE_ALLOCA_H		1
   32.11 -#define HAVE_SYS_TYPES_H	1
   32.12 -#define HAVE_STDIO_H	1
   32.13 -#define STDC_HEADERS	1
   32.14 -#define HAVE_STRING_H	1
   32.15 -#define HAVE_INTTYPES_H	1
   32.16 -#define HAVE_STDINT_H	1
   32.17 -#define HAVE_CTYPE_H	1
   32.18 -#define HAVE_MATH_H	1
   32.19 -#define HAVE_SIGNAL_H	1
   32.20 +#define HAVE_ALLOCA_H       1
   32.21 +#define HAVE_SYS_TYPES_H    1
   32.22 +#define HAVE_STDIO_H    1
   32.23 +#define STDC_HEADERS    1
   32.24 +#define HAVE_STRING_H   1
   32.25 +#define HAVE_INTTYPES_H 1
   32.26 +#define HAVE_STDINT_H   1
   32.27 +#define HAVE_CTYPE_H    1
   32.28 +#define HAVE_MATH_H 1
   32.29 +#define HAVE_SIGNAL_H   1
   32.30  
   32.31  /* C library functions */
   32.32 -#define HAVE_MALLOC	1
   32.33 -#define HAVE_CALLOC	1
   32.34 -#define HAVE_REALLOC	1
   32.35 -#define HAVE_FREE	1
   32.36 -#define HAVE_ALLOCA	1
   32.37 -#define HAVE_GETENV	1
   32.38 -#define HAVE_SETENV	1
   32.39 -#define HAVE_PUTENV	1
   32.40 -#define HAVE_SETENV	1
   32.41 -#define HAVE_UNSETENV	1
   32.42 -#define HAVE_QSORT	1
   32.43 -#define HAVE_ABS	1
   32.44 -#define HAVE_BCOPY	1
   32.45 -#define HAVE_MEMSET	1
   32.46 -#define HAVE_MEMCPY	1
   32.47 -#define HAVE_MEMMOVE	1
   32.48 -#define HAVE_MEMCMP	1
   32.49 -#define HAVE_STRLEN	1
   32.50 -#define HAVE_STRLCPY	1
   32.51 -#define HAVE_STRLCAT	1
   32.52 -#define HAVE_STRDUP	1
   32.53 -#define HAVE_STRCHR	1
   32.54 -#define HAVE_STRRCHR	1
   32.55 -#define HAVE_STRSTR	1
   32.56 -#define HAVE_STRTOL	1
   32.57 -#define HAVE_STRTOUL	1
   32.58 -#define HAVE_STRTOLL	1
   32.59 -#define HAVE_STRTOULL	1
   32.60 -#define HAVE_STRTOD	1
   32.61 -#define HAVE_ATOI	1
   32.62 -#define HAVE_ATOF	1
   32.63 -#define HAVE_STRCMP	1
   32.64 -#define HAVE_STRNCMP	1
   32.65 -#define HAVE_STRCASECMP	1
   32.66 +#define HAVE_MALLOC 1
   32.67 +#define HAVE_CALLOC 1
   32.68 +#define HAVE_REALLOC    1
   32.69 +#define HAVE_FREE   1
   32.70 +#define HAVE_ALLOCA 1
   32.71 +#define HAVE_GETENV 1
   32.72 +#define HAVE_SETENV 1
   32.73 +#define HAVE_PUTENV 1
   32.74 +#define HAVE_SETENV 1
   32.75 +#define HAVE_UNSETENV   1
   32.76 +#define HAVE_QSORT  1
   32.77 +#define HAVE_ABS    1
   32.78 +#define HAVE_BCOPY  1
   32.79 +#define HAVE_MEMSET 1
   32.80 +#define HAVE_MEMCPY 1
   32.81 +#define HAVE_MEMMOVE    1
   32.82 +#define HAVE_MEMCMP 1
   32.83 +#define HAVE_STRLEN 1
   32.84 +#define HAVE_STRLCPY    1
   32.85 +#define HAVE_STRLCAT    1
   32.86 +#define HAVE_STRDUP 1
   32.87 +#define HAVE_STRCHR 1
   32.88 +#define HAVE_STRRCHR    1
   32.89 +#define HAVE_STRSTR 1
   32.90 +#define HAVE_STRTOL 1
   32.91 +#define HAVE_STRTOUL    1
   32.92 +#define HAVE_STRTOLL    1
   32.93 +#define HAVE_STRTOULL   1
   32.94 +#define HAVE_STRTOD 1
   32.95 +#define HAVE_ATOI   1
   32.96 +#define HAVE_ATOF   1
   32.97 +#define HAVE_STRCMP 1
   32.98 +#define HAVE_STRNCMP    1
   32.99 +#define HAVE_STRCASECMP 1
  32.100  #define HAVE_STRNCASECMP 1
  32.101 -#define HAVE_SSCANF	1
  32.102 -#define HAVE_SNPRINTF	1
  32.103 -#define HAVE_VSNPRINTF	1
  32.104 -#define HAVE_M_PI	1
  32.105 -#define HAVE_ATAN	1
  32.106 -#define HAVE_ATAN2	1
  32.107 -#define HAVE_CEIL	1
  32.108 -#define HAVE_COPYSIGN	1
  32.109 -#define HAVE_COS	1
  32.110 -#define HAVE_COSF	1
  32.111 -#define HAVE_FABS	1
  32.112 -#define HAVE_FLOOR	1
  32.113 -#define HAVE_LOG	1
  32.114 -#define HAVE_POW	1
  32.115 -#define HAVE_SCALBN	1
  32.116 -#define HAVE_SIN	1
  32.117 -#define HAVE_SINF	1
  32.118 -#define HAVE_SQRT	1
  32.119 -#define HAVE_SIGACTION	1
  32.120 -#define HAVE_SETJMP	1
  32.121 -#define HAVE_NANOSLEEP	1
  32.122 -#define HAVE_SYSCONF	1
  32.123 +#define HAVE_SSCANF 1
  32.124 +#define HAVE_SNPRINTF   1
  32.125 +#define HAVE_VSNPRINTF  1
  32.126 +#define HAVE_M_PI   1
  32.127 +#define HAVE_ATAN   1
  32.128 +#define HAVE_ATAN2  1
  32.129 +#define HAVE_CEIL   1
  32.130 +#define HAVE_COPYSIGN   1
  32.131 +#define HAVE_COS    1
  32.132 +#define HAVE_COSF   1
  32.133 +#define HAVE_FABS   1
  32.134 +#define HAVE_FLOOR  1
  32.135 +#define HAVE_LOG    1
  32.136 +#define HAVE_POW    1
  32.137 +#define HAVE_SCALBN 1
  32.138 +#define HAVE_SIN    1
  32.139 +#define HAVE_SINF   1
  32.140 +#define HAVE_SQRT   1
  32.141 +#define HAVE_SIGACTION  1
  32.142 +#define HAVE_SETJMP 1
  32.143 +#define HAVE_NANOSLEEP  1
  32.144 +#define HAVE_SYSCONF    1
  32.145  #define HAVE_SYSCTLBYNAME 1
  32.146  
  32.147  /* enable iPhone version of Core Audio driver */
  32.148  #define SDL_AUDIO_DRIVER_COREAUDIO 1
  32.149  /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
  32.150 -#define SDL_AUDIO_DRIVER_DUMMY	1
  32.151 +#define SDL_AUDIO_DRIVER_DUMMY  1
  32.152  
  32.153  /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
  32.154 -#define SDL_HAPTIC_DISABLED	1
  32.155 +#define SDL_HAPTIC_DISABLED 1
  32.156  
  32.157  /* Enable Unix style SO loading */
  32.158  /* Technically this works, but it violates the iPhone developer agreement */
  32.159  /* #define SDL_LOADSO_DLOPEN 1 */
  32.160  
  32.161  /* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
  32.162 -#define SDL_LOADSO_DISABLED	1
  32.163 +#define SDL_LOADSO_DISABLED 1
  32.164  
  32.165  /* Enable various threading systems */
  32.166 -#define SDL_THREAD_PTHREAD	1
  32.167 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
  32.168 +#define SDL_THREAD_PTHREAD  1
  32.169 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
  32.170  
  32.171  /* Enable various timer systems */
  32.172 -#define SDL_TIMER_UNIX	1
  32.173 +#define SDL_TIMER_UNIX  1
  32.174  
  32.175  /* Supported video drivers */
  32.176 -#define SDL_VIDEO_DRIVER_UIKIT	1
  32.177 -#define SDL_VIDEO_DRIVER_DUMMY	1
  32.178 +#define SDL_VIDEO_DRIVER_UIKIT  1
  32.179 +#define SDL_VIDEO_DRIVER_DUMMY  1
  32.180  
  32.181  /* enable OpenGL ES */
  32.182 -#define SDL_VIDEO_OPENGL_ES	1
  32.183 -#define SDL_VIDEO_RENDER_OGL_ES	1
  32.184 -#define SDL_VIDEO_RENDER_OGL_ES2	1
  32.185 +#define SDL_VIDEO_OPENGL_ES 1
  32.186 +#define SDL_VIDEO_RENDER_OGL_ES 1
  32.187 +#define SDL_VIDEO_RENDER_OGL_ES2    1
  32.188  
  32.189  /* Enable system power support */
  32.190  #define SDL_POWER_UIKIT 1
    33.1 --- a/include/SDL_config_macosx.h	Sat May 18 12:48:50 2013 -0700
    33.2 +++ b/include/SDL_config_macosx.h	Sat May 18 14:17:52 2013 -0700
    33.3 @@ -30,106 +30,106 @@
    33.4  /* This is a set of defines to configure the SDL features */
    33.5  
    33.6  #ifdef __LP64__
    33.7 -	#define SIZEOF_VOIDP 8
    33.8 +    #define SIZEOF_VOIDP 8
    33.9  #else
   33.10 -	#define SIZEOF_VOIDP 4
   33.11 +    #define SIZEOF_VOIDP 4
   33.12  #endif
   33.13  
   33.14  /* Useful headers */
   33.15  /* If we specified an SDK or have a post-PowerPC chip, then alloca.h exists. */
   33.16  #if ( (MAC_OS_X_VERSION_MIN_REQUIRED >= 1030) || (!defined(__POWERPC__)) )
   33.17 -#define HAVE_ALLOCA_H		1
   33.18 +#define HAVE_ALLOCA_H       1
   33.19  #endif
   33.20 -#define HAVE_SYS_TYPES_H	1
   33.21 -#define HAVE_STDIO_H	1
   33.22 -#define STDC_HEADERS	1
   33.23 -#define HAVE_STRING_H	1
   33.24 -#define HAVE_INTTYPES_H	1
   33.25 -#define HAVE_STDINT_H	1
   33.26 -#define HAVE_CTYPE_H	1
   33.27 -#define HAVE_MATH_H	1
   33.28 -#define HAVE_SIGNAL_H	1
   33.29 +#define HAVE_SYS_TYPES_H    1
   33.30 +#define HAVE_STDIO_H    1
   33.31 +#define STDC_HEADERS    1
   33.32 +#define HAVE_STRING_H   1
   33.33 +#define HAVE_INTTYPES_H 1
   33.34 +#define HAVE_STDINT_H   1
   33.35 +#define HAVE_CTYPE_H    1
   33.36 +#define HAVE_MATH_H 1
   33.37 +#define HAVE_SIGNAL_H   1
   33.38  
   33.39  /* C library functions */
   33.40 -#define HAVE_MALLOC	1
   33.41 -#define HAVE_CALLOC	1
   33.42 -#define HAVE_REALLOC	1
   33.43 -#define HAVE_FREE	1
   33.44 -#define HAVE_ALLOCA	1
   33.45 -#define HAVE_GETENV	1
   33.46 -#define HAVE_SETENV	1
   33.47 -#define HAVE_PUTENV	1
   33.48 -#define HAVE_UNSETENV	1
   33.49 -#define HAVE_QSORT	1
   33.50 -#define HAVE_ABS	1
   33.51 -#define HAVE_BCOPY	1
   33.52 -#define HAVE_MEMSET	1
   33.53 -#define HAVE_MEMCPY	1
   33.54 -#define HAVE_MEMMOVE	1
   33.55 -#define HAVE_MEMCMP	1
   33.56 -#define HAVE_STRLEN	1
   33.57 -#define HAVE_STRLCPY	1
   33.58 -#define HAVE_STRLCAT	1
   33.59 -#define HAVE_STRDUP	1
   33.60 -#define HAVE_STRCHR	1
   33.61 -#define HAVE_STRRCHR	1
   33.62 -#define HAVE_STRSTR	1
   33.63 -#define HAVE_STRTOL	1
   33.64 -#define HAVE_STRTOUL	1
   33.65 -#define HAVE_STRTOLL	1
   33.66 -#define HAVE_STRTOULL	1
   33.67 -#define HAVE_STRTOD	1
   33.68 -#define HAVE_ATOI	1
   33.69 -#define HAVE_ATOF	1
   33.70 -#define HAVE_STRCMP	1
   33.71 -#define HAVE_STRNCMP	1
   33.72 -#define HAVE_STRCASECMP	1
   33.73 +#define HAVE_MALLOC 1
   33.74 +#define HAVE_CALLOC 1
   33.75 +#define HAVE_REALLOC    1
   33.76 +#define HAVE_FREE   1
   33.77 +#define HAVE_ALLOCA 1
   33.78 +#define HAVE_GETENV 1
   33.79 +#define HAVE_SETENV 1
   33.80 +#define HAVE_PUTENV 1
   33.81 +#define HAVE_UNSETENV   1
   33.82 +#define HAVE_QSORT  1
   33.83 +#define HAVE_ABS    1
   33.84 +#define HAVE_BCOPY  1
   33.85 +#define HAVE_MEMSET 1
   33.86 +#define HAVE_MEMCPY 1
   33.87 +#define HAVE_MEMMOVE    1
   33.88 +#define HAVE_MEMCMP 1
   33.89 +#define HAVE_STRLEN 1
   33.90 +#define HAVE_STRLCPY    1
   33.91 +#define HAVE_STRLCAT    1
   33.92 +#define HAVE_STRDUP 1
   33.93 +#define HAVE_STRCHR 1
   33.94 +#define HAVE_STRRCHR    1
   33.95 +#define HAVE_STRSTR 1
   33.96 +#define HAVE_STRTOL 1
   33.97 +#define HAVE_STRTOUL    1
   33.98 +#define HAVE_STRTOLL    1
   33.99 +#define HAVE_STRTOULL   1
  33.100 +#define HAVE_STRTOD 1
  33.101 +#define HAVE_ATOI   1
  33.102 +#define HAVE_ATOF   1
  33.103 +#define HAVE_STRCMP 1
  33.104 +#define HAVE_STRNCMP    1
  33.105 +#define HAVE_STRCASECMP 1
  33.106  #define HAVE_STRNCASECMP 1
  33.107 -#define HAVE_SSCANF	1
  33.108 -#define HAVE_SNPRINTF	1
  33.109 -#define HAVE_VSNPRINTF	1
  33.110 -#define HAVE_CEIL	1
  33.111 -#define HAVE_COPYSIGN	1
  33.112 -#define HAVE_COS	1
  33.113 -#define HAVE_COSF	1
  33.114 -#define HAVE_FABS	1
  33.115 -#define HAVE_FLOOR	1
  33.116 -#define HAVE_LOG	1
  33.117 -#define HAVE_POW	1
  33.118 -#define HAVE_SCALBN	1
  33.119 -#define HAVE_SIN	1
  33.120 -#define HAVE_SINF	1
  33.121 -#define HAVE_SQRT	1
  33.122 -#define HAVE_SIGACTION	1
  33.123 -#define HAVE_SETJMP	1
  33.124 -#define HAVE_NANOSLEEP	1
  33.125 -#define HAVE_SYSCONF	1
  33.126 +#define HAVE_SSCANF 1
  33.127 +#define HAVE_SNPRINTF   1
  33.128 +#define HAVE_VSNPRINTF  1
  33.129 +#define HAVE_CEIL   1
  33.130 +#define HAVE_COPYSIGN   1
  33.131 +#define HAVE_COS    1
  33.132 +#define HAVE_COSF   1
  33.133 +#define HAVE_FABS   1
  33.134 +#define HAVE_FLOOR  1
  33.135 +#define HAVE_LOG    1
  33.136 +#define HAVE_POW    1
  33.137 +#define HAVE_SCALBN 1
  33.138 +#define HAVE_SIN    1
  33.139 +#define HAVE_SINF   1
  33.140 +#define HAVE_SQRT   1
  33.141 +#define HAVE_SIGACTION  1
  33.142 +#define HAVE_SETJMP 1
  33.143 +#define HAVE_NANOSLEEP  1
  33.144 +#define HAVE_SYSCONF    1
  33.145  #define HAVE_SYSCTLBYNAME 1
  33.146  #define HAVE_ATAN 1
  33.147  #define HAVE_ATAN2 1
  33.148  
  33.149  /* Enable various audio drivers */
  33.150 -#define SDL_AUDIO_DRIVER_COREAUDIO	1
  33.151 -#define SDL_AUDIO_DRIVER_DISK	1
  33.152 -#define SDL_AUDIO_DRIVER_DUMMY	1
  33.153 +#define SDL_AUDIO_DRIVER_COREAUDIO  1
  33.154 +#define SDL_AUDIO_DRIVER_DISK   1
  33.155 +#define SDL_AUDIO_DRIVER_DUMMY  1
  33.156  
  33.157  /* Enable various input drivers */
  33.158 -#define SDL_JOYSTICK_IOKIT	1
  33.159 -#define SDL_HAPTIC_IOKIT	1
  33.160 +#define SDL_JOYSTICK_IOKIT  1
  33.161 +#define SDL_HAPTIC_IOKIT    1
  33.162  
  33.163  /* Enable various shared object loading systems */
  33.164 -#define SDL_LOADSO_DLOPEN	1
  33.165 +#define SDL_LOADSO_DLOPEN   1
  33.166  
  33.167  /* Enable various threading systems */
  33.168 -#define SDL_THREAD_PTHREAD	1
  33.169 -#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX	1
  33.170 +#define SDL_THREAD_PTHREAD  1
  33.171 +#define SDL_THREAD_PTHREAD_RECURSIVE_MUTEX  1
  33.172  
  33.173  /* Enable various timer systems */
  33.174 -#define SDL_TIMER_UNIX	1
  33.175 +#define SDL_TIMER_UNIX  1
  33.176  
  33.177  /* Enable various video drivers */
  33.178 -#define SDL_VIDEO_DRIVER_COCOA	1
  33.179 -#define SDL_VIDEO_DRIVER_DUMMY	1
  33.180 +#define SDL_VIDEO_DRIVER_COCOA  1
  33.181 +#define SDL_VIDEO_DRIVER_DUMMY  1
  33.182  #undef SDL_VIDEO_DRIVER_X11
  33.183  #define SDL_VIDEO_DRIVER_X11_DYNAMIC "/usr/X11R6/lib/libX11.6.dylib"
  33.184  #define SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT "/usr/X11R6/lib/libXext.6.dylib"
  33.185 @@ -157,27 +157,27 @@
  33.186  #endif
  33.187  
  33.188  #ifndef SDL_VIDEO_RENDER_OGL
  33.189 -#define SDL_VIDEO_RENDER_OGL	1
  33.190 +#define SDL_VIDEO_RENDER_OGL    1
  33.191  #endif
  33.192  
  33.193  /* Enable OpenGL support */
  33.194  #ifndef SDL_VIDEO_OPENGL
  33.195 -#define SDL_VIDEO_OPENGL	1
  33.196 +#define SDL_VIDEO_OPENGL    1
  33.197  #endif
  33.198  #ifndef SDL_VIDEO_OPENGL_CGL
  33.199 -#define SDL_VIDEO_OPENGL_CGL	1
  33.200 +#define SDL_VIDEO_OPENGL_CGL    1
  33.201  #endif
  33.202  #ifndef SDL_VIDEO_OPENGL_GLX
  33.203 -#define SDL_VIDEO_OPENGL_GLX	1
  33.204 +#define SDL_VIDEO_OPENGL_GLX    1
  33.205  #endif
  33.206  
  33.207  /* Enable system power support */
  33.208  #define SDL_POWER_MACOSX 1
  33.209  
  33.210  /* Enable assembly routines */
  33.211 -#define SDL_ASSEMBLY_ROUTINES	1
  33.212 +#define SDL_ASSEMBLY_ROUTINES   1
  33.213  #ifdef __ppc__
  33.214 -#define SDL_ALTIVEC_BLITTERS	1
  33.215 +#define SDL_ALTIVEC_BLITTERS    1
  33.216  #endif
  33.217  
  33.218  #endif /* _SDL_config_macosx_h */
    34.1 --- a/include/SDL_config_minimal.h	Sat May 18 12:48:50 2013 -0700
    34.2 +++ b/include/SDL_config_minimal.h	Sat May 18 14:17:52 2013 -0700
    34.3 @@ -26,7 +26,7 @@
    34.4  
    34.5  /**
    34.6   *  \file SDL_config_minimal.h
    34.7 - *  
    34.8 + *
    34.9   *  This is the minimal configuration that can be used to build SDL.
   34.10   */
   34.11  
   34.12 @@ -51,24 +51,24 @@
   34.13  #endif
   34.14  
   34.15  /* Enable the dummy audio driver (src/audio/dummy/\*.c) */
   34.16 -#define SDL_AUDIO_DRIVER_DUMMY	1
   34.17 +#define SDL_AUDIO_DRIVER_DUMMY  1
   34.18  
   34.19  /* Enable the stub joystick driver (src/joystick/dummy/\*.c) */
   34.20 -#define SDL_JOYSTICK_DISABLED	1
   34.21 +#define SDL_JOYSTICK_DISABLED   1
   34.22  
   34.23  /* Enable the stub haptic driver (src/haptic/dummy/\*.c) */
   34.24 -#define SDL_HAPTIC_DISABLED	1
   34.25 +#define SDL_HAPTIC_DISABLED 1
   34.26  
   34.27  /* Enable the stub shared object loader (src/loadso/dummy/\*.c) */
   34.28 -#define SDL_LOADSO_DISABLED	1
   34.29 +#define SDL_LOADSO_DISABLED 1
   34.30  
   34.31  /* Enable the stub thread support (src/thread/generic/\*.c) */
   34.32 -#define SDL_THREADS_DISABLED	1
   34.33 +#define SDL_THREADS_DISABLED    1
   34.34  
   34.35  /* Enable the stub timer support (src/timer/dummy/\*.c) */
   34.36 -#define SDL_TIMERS_DISABLED	1
   34.37 +#define SDL_TIMERS_DISABLED 1
   34.38  
   34.39  /* Enable the dummy video driver (src/video/dummy/\*.c) */
   34.40 -#define SDL_VIDEO_DRIVER_DUMMY	1
   34.41 +#define SDL_VIDEO_DRIVER_DUMMY  1
   34.42  
   34.43  #endif /* _SDL_config_minimal_h */
    35.1 --- a/include/SDL_config_pandora.h	Sat May 18 12:48:50 2013 -0700
    35.2 +++ b/include/SDL_config_pandora.h	Sat May 18 14:17:52 2013 -0700
    35.3 @@ -57,7 +57,7 @@
    35.4  #define HAVE_FREE 1
    35.5  #define HAVE_ALLOCA 1
    35.6  #define HAVE_GETENV 1
    35.7 -#define HAVE_SETENV	1
    35.8 +#define HAVE_SETENV 1
    35.9  #define HAVE_PUTENV 1
   35.10  #define HAVE_UNSETENV 1
   35.11  #define HAVE_QSORT 1
    36.1 --- a/include/SDL_config_psp.h	Sat May 18 12:48:50 2013 -0700
    36.2 +++ b/include/SDL_config_psp.h	Sat May 18 14:17:52 2013 -0700
    36.3 @@ -30,93 +30,93 @@
    36.4  #define HAVE_GCC_SYNC_LOCK_TEST_AND_SET 1
    36.5  #endif
    36.6  
    36.7 -#define HAVE_GCC_ATOMICS	1
    36.8 +#define HAVE_GCC_ATOMICS    1
    36.9  
   36.10 -#define HAVE_ALLOCA_H		1
   36.11 -#define HAVE_SYS_TYPES_H	1
   36.12 -#define HAVE_STDIO_H	1
   36.13 -#define STDC_HEADERS	1
   36.14 -#define HAVE_STRING_H	1
   36.15 -#define HAVE_INTTYPES_H	1
   36.16 -#define HAVE_STDINT_H	1
   36.17 -#define HAVE_CTYPE_H	1
   36.18 -#define HAVE_MATH_H	1
   36.19 -#define HAVE_SIGNAL_H	1
   36.20 +#define HAVE_ALLOCA_H       1
   36.21 +#define HAVE_SYS_TYPES_H    1
   36.22 +#define HAVE_STDIO_H    1
   36.23 +#define STDC_HEADERS    1
   36.24 +#define HAVE_STRING_H   1
   36.25 +#define HAVE_INTTYPES_H 1
   36.26 +#define HAVE_STDINT_H   1
   36.27 +#define HAVE_CTYPE_H    1
   36.28 +#define HAVE_MATH_H 1
   36.29 +#define HAVE_SIGNAL_H   1
   36.30  
   36.31  /* C library functions */
   36.32 -#define HAVE_MALLOC	1
   36.33 -#define HAVE_CALLOC	1
   36.34 -#define HAVE_REALLOC	1
   36.35 -#define HAVE_FREE	1
   36.36 -#define HAVE_ALLOCA	1
   36.37 -#define HAVE_GETENV	1
   36.38 -#define HAVE_SETENV	1
   36.39 -#define HAVE_PUTENV	1
   36.40 -#define HAVE_SETENV	1
   36.41 -#define HAVE_UNSETENV	1
   36.42 -#define HAVE_QSORT	1
   36.43 -#define HAVE_ABS	1
   36.44 -#define HAVE_BCOPY	1
   36.45 -#define HAVE_MEMSET	1
   36.46 -#define HAVE_MEMCPY	1
   36.47 -#define HAVE_MEMMOVE	1
   36.48 -#define HAVE_MEMCMP	1
   36.49 -#define HAVE_STRLEN	1
   36.50 -#define HAVE_STRLCPY	1
   36.51 -#define HAVE_STRLCAT	1
   36.52 -#define HAVE_STRDUP	1
   36.53 -#define HAVE_STRCHR	1
   36.54 -#define HAVE_STRRCHR	1
   36.55 -#define HAVE_STRSTR	1
   36.56 -#define HAVE_STRTOL	1
   36.57 -#define HAVE_STRTOUL	1
   36.58 -#define HAVE_STRTOLL	1
   36.59 -#define HAVE_STRTOULL	1
   36.60 -#define HAVE_STRTOD	1
   36.61 -#define HAVE_ATOI	1
   36.62 -#define HAVE_ATOF	1
   36.63 -#define HAVE_STRCMP	1
   36.64 -#define HAVE_STRNCMP	1
   36.65 -#define HAVE_STRCASECMP	1
   36.66 +#define HAVE_MALLOC 1
   36.67 +#define HAVE_CALLOC 1
   36.68 +#define HAVE_REALLOC    1
   36.69 +#define HAVE_FREE   1
   36.70 +#define HAVE_ALLOCA 1
   36.71 +#define HAVE_GETENV 1
   36.72 +#define HAVE_SETENV 1
   36.73 +#define HAVE_PUTENV 1
   36.74 +#define HAVE_SETENV 1
   36.75 +#define HAVE_UNSETENV   1
   36.76 +#define HAVE_QSORT  1
   36.77 +#define HAVE_ABS    1
   36.78 +#define HAVE_BCOPY  1
   36.79 +#define HAVE_MEMSET 1
   36.80 +#define HAVE_MEMCPY 1
   36.81 +#define HAVE_MEMMOVE    1
   36.82 +#define HAVE_MEMCMP 1
   36.83 +#define HAVE_STRLEN 1
   36.84 +#define HAVE_STRLCPY    1
   36.85 +#define HAVE_STRLCAT    1
   36.86 +#define HAVE_STRDUP 1
   36.87 +#define HAVE_STRCHR 1
   36.88 +#define HAVE_STRRCHR    1
   36.89 +#define HAVE_STRSTR 1
   36.90 +#define HAVE_STRTOL 1
   36.91 +#define HAVE_STRTOUL    1
   36.92 +#define HAVE_STRTOLL    1
   36.93 +#define HAVE_STRTOULL   1
   36.94 +#define HAVE_STRTOD 1
   36.95 +#define HAVE_ATOI   1
   36.96 +#define HAVE_ATOF   1
   36.97 +#define HAVE_STRCMP 1
   36.98 +#define HAVE_STRNCMP    1
   36.99 +#define HAVE_STRCASECMP 1
  36.100  #define HAVE_STRNCASECMP 1
  36.101 -#define HAVE_SSCANF	1
  36.102 -#define HAVE_SNPRINTF	1
  36.103 -#define HAVE_VSNPRINTF	1
  36.104 -#define HAVE_M_PI	1
  36.105 -#define HAVE_ATAN	1
  36.106 -#define HAVE_ATAN2	1
  36.107 -#define HAVE_CEIL	1
  36.108 -#define HAVE_COPYSIGN	1
  36.109 -#define HAVE_COS	1
  36.110 -#define HAVE_COSF	1
  36.111 -#define HAVE_FABS	1
  36.112 -#define HAVE_FLOOR	1
  36.113 -#define HAVE_LOG	1
  36.114 -#define HAVE_POW	1
  36.115 -#define HAVE_SCALBN	1
  36.116 -#define HAVE_SIN	1
  36.117 -#define HAVE_SINF	1
  36.118 -#define HAVE_SQRT	1
  36.119 -#define HAVE_SETJMP	1
  36.120 -#define HAVE_NANOSLEEP	1
  36.121 -//#define HAVE_SYSCONF	1
  36.122 -//#define HAVE_SIGACTION	1
  36.123 +#define HAVE_SSCANF 1
  36.124 +#define HAVE_SNPRINTF   1
  36.125 +#define HAVE_VSNPRINTF  1
  36.126 +#define HAVE_M_PI   1
  36.127 +#define HAVE_ATAN   1
  36.128 +#define HAVE_ATAN2  1
  36.129 +#define HAVE_CEIL   1
  36.130 +#define HAVE_COPYSIGN   1
  36.131 +#define HAVE_COS    1
  36.132 +#define HAVE_COSF   1
  36.133 +#define HAVE_FABS   1
  36.134 +#define HAVE_FLOOR  1
  36.135 +#define HAVE_LOG    1
  36.136 +#define HAVE_POW    1
  36.137 +#define HAVE_SCALBN 1
  36.138 +#define HAVE_SIN    1
  36.139 +#define HAVE_SINF   1
  36.140 +#define HAVE_SQRT   1
  36.141 +#define HAVE_SETJMP 1
  36.142 +#define HAVE_NANOSLEEP  1
  36.143 +//#define HAVE_SYSCONF  1
  36.144 +//#define HAVE_SIGACTION    1
  36.145  
  36.146  
  36.147  /* PSP isn't that sophisticated */
  36.148  #define LACKS_SYS_MMAN_H 1
  36.149  
  36.150  /* Enable the stub thread support (src/thread/psp/\*.c) */
  36.151 -#define SDL_THREAD_PSP	1
  36.152 +#define SDL_THREAD_PSP  1
  36.153  
  36.154  /* Enable the stub timer support (src/timer/psp/\*.c) */
  36.155 -#define SDL_TIMERS_PSP	1
  36.156 +#define SDL_TIMERS_PSP  1
  36.157  
  36.158  /* Enable the stub joystick driver (src/joystick/psp/\*.c) */
  36.159 -#define SDL_JOYSTICK_PSP		1
  36.160 +#define SDL_JOYSTICK_PSP        1
  36.161  
  36.162  /* Enable the stub audio driver (src/audio/psp/\*.c) */
  36.163 -#define SDL_AUDIO_DRIVER_PSP	1
  36.164 +#define SDL_AUDIO_DRIVER_PSP    1
  36.165  
  36.166  /* PSP video dirver */
  36.167  #define SDL_VIDEO_DRIVER_PSP   1
  36.168 @@ -127,10 +127,10 @@
  36.169  #define SDL_POWER_PSP          1
  36.170  
  36.171  /* PSP doesn't have haptic device (src/haptic/dummy/\*.c) */
  36.172 -#define SDL_HAPTIC_DISABLED	   1
  36.173 +#define SDL_HAPTIC_DISABLED    1
  36.174  
  36.175  /* PSP can't load shared object (src/loadso/dummy/\*.c) */
  36.176 -#define SDL_LOADSO_DISABLED	   1
  36.177 +#define SDL_LOADSO_DISABLED    1
  36.178  
  36.179  
  36.180  #endif /* _SDL_config_psp_h */
    37.1 --- a/include/SDL_config_windows.h	Sat May 18 12:48:50 2013 -0700
    37.2 +++ b/include/SDL_config_windows.h	Sat May 18 14:17:52 2013 -0700
    37.3 @@ -28,7 +28,7 @@
    37.4  
    37.5  #if !defined(_STDINT_H_) && (!defined(HAVE_STDINT_H) || !_HAVE_STDINT_H)
    37.6  #if defined(__GNUC__) || defined(__DMC__) || defined(__WATCOMC__)
    37.7 -#define HAVE_STDINT_H	1
    37.8 +#define HAVE_STDINT_H   1
    37.9  #elif defined(_MSC_VER)
   37.10  typedef signed __int8 int8_t;
   37.11  typedef unsigned __int8 uint8_t;
   37.12 @@ -136,49 +136,49 @@
   37.13  #define HAVE_SINF 1
   37.14  #define HAVE_SQRT 1
   37.15  #else
   37.16 -#define HAVE_STDARG_H	1
   37.17 -#define HAVE_STDDEF_H	1
   37.18 +#define HAVE_STDARG_H   1
   37.19 +#define HAVE_STDDEF_H   1
   37.20  #endif
   37.21  
   37.22  /* Enable various audio drivers */
   37.23 -#define SDL_AUDIO_DRIVER_DSOUND	1
   37.24 +#define SDL_AUDIO_DRIVER_DSOUND 1
   37.25  #ifndef __GNUC__
   37.26 -#define SDL_AUDIO_DRIVER_XAUDIO2	1
   37.27 +#define SDL_AUDIO_DRIVER_XAUDIO2    1
   37.28  #endif
   37.29 -#define SDL_AUDIO_DRIVER_WINMM	1
   37.30 -#define SDL_AUDIO_DRIVER_DISK	1
   37.31 -#define SDL_AUDIO_DRIVER_DUMMY	1
   37.32 +#define SDL_AUDIO_DRIVER_WINMM  1
   37.33 +#define SDL_AUDIO_DRIVER_DISK   1
   37.34 +#define SDL_AUDIO_DRIVER_DUMMY  1
   37.35  
   37.36  /* Enable various input drivers */
   37.37 -#define SDL_JOYSTICK_DINPUT	1
   37.38 -#define SDL_HAPTIC_DINPUT	1
   37.39 +#define SDL_JOYSTICK_DINPUT 1
   37.40 +#define SDL_HAPTIC_DINPUT   1
   37.41  
   37.42  /* Enable various shared object loading systems */
   37.43 -#define SDL_LOADSO_WINDOWS	1
   37.44 +#define SDL_LOADSO_WINDOWS  1
   37.45  
   37.46  /* Enable various threading systems */
   37.47 -#define SDL_THREAD_WINDOWS	1
   37.48 +#define SDL_THREAD_WINDOWS  1
   37.49  
   37.50  /* Enable various timer systems */
   37.51 -#define SDL_TIMER_WINDOWS	1
   37.52 +#define SDL_TIMER_WINDOWS   1
   37.53  
   37.54  /* Enable various video drivers */
   37.55 -#define SDL_VIDEO_DRIVER_DUMMY	1
   37.56 -#define SDL_VIDEO_DRIVER_WINDOWS	1
   37.57 +#define SDL_VIDEO_DRIVER_DUMMY  1
   37.58 +#define SDL_VIDEO_DRIVER_WINDOWS    1
   37.59  
   37.60  #ifndef SDL_VIDEO_RENDER_D3D
   37.61 -#define SDL_VIDEO_RENDER_D3D	1
   37.62 +#define SDL_VIDEO_RENDER_D3D    1
   37.63  #endif
   37.64  
   37.65  /* Enable OpenGL support */
   37.66  #ifndef SDL_VIDEO_OPENGL
   37.67 -#define SDL_VIDEO_OPENGL	1
   37.68 +#define SDL_VIDEO_OPENGL    1
   37.69  #endif
   37.70  #ifndef SDL_VIDEO_OPENGL_WGL
   37.71 -#define SDL_VIDEO_OPENGL_WGL	1
   37.72 +#define SDL_VIDEO_OPENGL_WGL    1
   37.73  #endif
   37.74  #ifndef SDL_VIDEO_RENDER_OGL
   37.75 -#define SDL_VIDEO_RENDER_OGL	1
   37.76 +#define SDL_VIDEO_RENDER_OGL    1
   37.77  #endif
   37.78  
   37.79  /* Enable system power support */
   37.80 @@ -186,7 +186,7 @@
   37.81  
   37.82  /* Enable assembly routines (Win64 doesn't have inline asm) */
   37.83  #ifndef _WIN64
   37.84 -#define SDL_ASSEMBLY_ROUTINES	1
   37.85 +#define SDL_ASSEMBLY_ROUTINES   1
   37.86  #endif
   37.87  
   37.88  #endif /* _SDL_config_windows_h */
    38.1 --- a/include/SDL_config_wiz.h	Sat May 18 12:48:50 2013 -0700
    38.2 +++ b/include/SDL_config_wiz.h	Sat May 18 14:17:52 2013 -0700
    38.3 @@ -51,7 +51,7 @@
    38.4  #define HAVE_FREE 1
    38.5  #define HAVE_ALLOCA 1
    38.6  #define HAVE_GETENV 1
    38.7 -#define HAVE_SETENV	1
    38.8 +#define HAVE_SETENV 1
    38.9  #define HAVE_PUTENV 1
   38.10  #define HAVE_UNSETENV 1
   38.11  #define HAVE_QSORT 1
    39.1 --- a/include/SDL_cpuinfo.h	Sat May 18 12:48:50 2013 -0700
    39.2 +++ b/include/SDL_cpuinfo.h	Sat May 18 14:17:52 2013 -0700
    39.3 @@ -21,7 +21,7 @@
    39.4  
    39.5  /**
    39.6   *  \file SDL_cpuinfo.h
    39.7 - *  
    39.8 + *
    39.9   *  CPU feature detection for SDL.
   39.10   */
   39.11  
   39.12 @@ -66,9 +66,7 @@
   39.13  #include "begin_code.h"
   39.14  /* Set up for C function definitions, even when using C++ */
   39.15  #ifdef __cplusplus
   39.16 -/* *INDENT-OFF* */
   39.17  extern "C" {
   39.18 -/* *INDENT-ON* */
   39.19  #endif
   39.20  
   39.21  /* This is a guess for the cacheline size used for padding.
   39.22 @@ -139,9 +137,7 @@
   39.23  
   39.24  /* Ends C function definitions when using C++ */
   39.25  #ifdef __cplusplus
   39.26 -/* *INDENT-OFF* */
   39.27  }
   39.28 -/* *INDENT-ON* */
   39.29  #endif
   39.30  #include "close_code.h"
   39.31  
    40.1 --- a/include/SDL_endian.h	Sat May 18 12:48:50 2013 -0700
    40.2 +++ b/include/SDL_endian.h	Sat May 18 14:17:52 2013 -0700
    40.3 @@ -21,7 +21,7 @@
    40.4  
    40.5  /**
    40.6   *  \file SDL_endian.h
    40.7 - *  
    40.8 + *
    40.9   *  Functions for reading and writing endian-specific values
   40.10   */
   40.11  
   40.12 @@ -34,8 +34,8 @@
   40.13   *  \name The two types of endianness
   40.14   */
   40.15  /*@{*/
   40.16 -#define SDL_LIL_ENDIAN	1234
   40.17 -#define SDL_BIG_ENDIAN	4321
   40.18 +#define SDL_LIL_ENDIAN  1234
   40.19 +#define SDL_BIG_ENDIAN  4321
   40.20  /*@}*/
   40.21  
   40.22  #ifndef SDL_BYTEORDER           /* Not defined in SDL_config.h? */
   40.23 @@ -48,9 +48,9 @@
   40.24      (defined(__MIPS__) && defined(__MISPEB__)) || \
   40.25      defined(__ppc__) || defined(__POWERPC__) || defined(_M_PPC) || \
   40.26      defined(__sparc__)
   40.27 -#define SDL_BYTEORDER	SDL_BIG_ENDIAN
   40.28 +#define SDL_BYTEORDER   SDL_BIG_ENDIAN
   40.29  #else
   40.30 -#define SDL_BYTEORDER	SDL_LIL_ENDIAN
   40.31 +#define SDL_BYTEORDER   SDL_LIL_ENDIAN
   40.32  #endif
   40.33  #endif /* __linux __ */
   40.34  #endif /* !SDL_BYTEORDER */
   40.35 @@ -59,9 +59,7 @@
   40.36  #include "begin_code.h"
   40.37  /* Set up for C function definitions, even when using C++ */
   40.38  #ifdef __cplusplus
   40.39 -/* *INDENT-OFF* */
   40.40  extern "C" {
   40.41 -/* *INDENT-ON* */
   40.42  #endif
   40.43  
   40.44  /**
   40.45 @@ -210,31 +208,29 @@
   40.46   */
   40.47  /*@{*/
   40.48  #if SDL_BYTEORDER == SDL_LIL_ENDIAN
   40.49 -#define SDL_SwapLE16(X)	(X)
   40.50 -#define SDL_SwapLE32(X)	(X)
   40.51 -#define SDL_SwapLE64(X)	(X)
   40.52 -#define SDL_SwapFloatLE(X)	(X)
   40.53 -#define SDL_SwapBE16(X)	SDL_Swap16(X)
   40.54 -#define SDL_SwapBE32(X)	SDL_Swap32(X)
   40.55 -#define SDL_SwapBE64(X)	SDL_Swap64(X)
   40.56 -#define SDL_SwapFloatBE(X)	SDL_SwapFloat(X)
   40.57 +#define SDL_SwapLE16(X) (X)
   40.58 +#define SDL_SwapLE32(X) (X)
   40.59 +#define SDL_SwapLE64(X) (X)
   40.60 +#define SDL_SwapFloatLE(X)  (X)
   40.61 +#define SDL_SwapBE16(X) SDL_Swap16(X)
   40.62 +#define SDL_SwapBE32(X) SDL_Swap32(X)
   40.63 +#define SDL_SwapBE64(X) SDL_Swap64(X)
   40.64 +#define SDL_SwapFloatBE(X)  SDL_SwapFloat(X)
   40.65  #else
   40.66 -#define SDL_SwapLE16(X)	SDL_Swap16(X)
   40.67 -#define SDL_SwapLE32(X)	SDL_Swap32(X)
   40.68 -#define SDL_SwapLE64(X)	SDL_Swap64(X)
   40.69 -#define SDL_SwapFloatLE(X)	SDL_SwapFloat(X)
   40.70 -#define SDL_SwapBE16(X)	(X)
   40.71 -#define SDL_SwapBE32(X)	(X)
   40.72 -#define SDL_SwapBE64(X)	(X)
   40.73 -#define SDL_SwapFloatBE(X)	(X)
   40.74 +#define SDL_SwapLE16(X) SDL_Swap16(X)
   40.75 +#define SDL_SwapLE32(X) SDL_Swap32(X)
   40.76 +#define SDL_SwapLE64(X) SDL_Swap64(X)
   40.77 +#define SDL_SwapFloatLE(X)  SDL_SwapFloat(X)
   40.78 +#define SDL_SwapBE16(X) (X)
   40.79 +#define SDL_SwapBE32(X) (X)
   40.80 +#define SDL_SwapBE64(X) (X)
   40.81 +#define SDL_SwapFloatBE(X)  (X)
   40.82  #endif
   40.83  /*@}*//*Swap to native*/
   40.84  
   40.85  /* Ends C function definitions when using C++ */
   40.86  #ifdef __cplusplus
   40.87 -/* *INDENT-OFF* */
   40.88  }
   40.89 -/* *INDENT-ON* */
   40.90  #endif
   40.91  #include "close_code.h"
   40.92  
    41.1 --- a/include/SDL_error.h	Sat May 18 12:48:50 2013 -0700
    41.2 +++ b/include/SDL_error.h	Sat May 18 14:17:52 2013 -0700
    41.3 @@ -21,7 +21,7 @@
    41.4  
    41.5  /**
    41.6   *  \file SDL_error.h
    41.7 - *  
    41.8 + *
    41.9   *  Simple error message routines for SDL.
   41.10   */
   41.11  
   41.12 @@ -33,9 +33,7 @@
   41.13  #include "begin_code.h"
   41.14  /* Set up for C function definitions, even when using C++ */
   41.15  #ifdef __cplusplus
   41.16 -/* *INDENT-OFF* */
   41.17  extern "C" {
   41.18 -/* *INDENT-ON* */
   41.19  #endif
   41.20  
   41.21  /* Public functions */
   41.22 @@ -46,14 +44,14 @@
   41.23  
   41.24  /**
   41.25   *  \name Internal error functions
   41.26 - *  
   41.27 - *  \internal 
   41.28 + *
   41.29 + *  \internal
   41.30   *  Private error reporting function - used internally.
   41.31   */
   41.32  /*@{*/
   41.33 -#define SDL_OutOfMemory()	SDL_Error(SDL_ENOMEM)
   41.34 -#define SDL_Unsupported()	SDL_Error(SDL_UNSUPPORTED)
   41.35 -#define SDL_InvalidParamError(param)	SDL_SetError("Parameter '%s' is invalid", (param))
   41.36 +#define SDL_OutOfMemory()   SDL_Error(SDL_ENOMEM)
   41.37 +#define SDL_Unsupported()   SDL_Error(SDL_UNSUPPORTED)
   41.38 +#define SDL_InvalidParamError(param)    SDL_SetError("Parameter '%s' is invalid", (param))
   41.39  typedef enum
   41.40  {
   41.41      SDL_ENOMEM,
   41.42 @@ -69,9 +67,7 @@
   41.43  
   41.44  /* Ends C function definitions when using C++ */
   41.45  #ifdef __cplusplus
   41.46 -/* *INDENT-OFF* */
   41.47  }
   41.48 -/* *INDENT-ON* */
   41.49  #endif
   41.50  #include "close_code.h"
   41.51  
    42.1 --- a/include/SDL_events.h	Sat May 18 12:48:50 2013 -0700
    42.2 +++ b/include/SDL_events.h	Sat May 18 14:17:52 2013 -0700
    42.3 @@ -21,7 +21,7 @@
    42.4  
    42.5  /**
    42.6   *  \file SDL_events.h
    42.7 - *  
    42.8 + *
    42.9   *  Include file for SDL event handling.
   42.10   */
   42.11  
   42.12 @@ -42,14 +42,12 @@
   42.13  #include "begin_code.h"
   42.14  /* Set up for C function definitions, even when using C++ */
   42.15  #ifdef __cplusplus
   42.16 -/* *INDENT-OFF* */
   42.17  extern "C" {
   42.18 -/* *INDENT-ON* */
   42.19  #endif
   42.20  
   42.21  /* General keyboard/mouse state definitions */
   42.22 -#define SDL_RELEASED	0
   42.23 -#define SDL_PRESSED	1
   42.24 +#define SDL_RELEASED    0
   42.25 +#define SDL_PRESSED 1
   42.26  
   42.27  /**
   42.28   * \brief The types of events that can be delivered.
   42.29 @@ -62,27 +60,27 @@
   42.30      SDL_QUIT           = 0x100, /**< User-requested quit */
   42.31  
   42.32      /* These application events have special meaning on iOS, see README.iOS for details */
   42.33 -	SDL_APP_TERMINATING,        /**< The application is being terminated by the OS
   42.34 +    SDL_APP_TERMINATING,        /**< The application is being terminated by the OS
   42.35                                       Called on iOS in applicationWillTerminate()
   42.36                                       Called on Android in onDestroy()
   42.37                                  */
   42.38 -	SDL_APP_LOWMEMORY,          /**< The application is low on memory, free memory if possible.
   42.39 +    SDL_APP_LOWMEMORY,          /**< The application is low on memory, free memory if possible.
   42.40                                       Called on iOS in applicationDidReceiveMemoryWarning()
   42.41                                       Called on Android in onLowMemory()
   42.42                                  */
   42.43 -	SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background
   42.44 +    SDL_APP_WILLENTERBACKGROUND, /**< The application is about to enter the background
   42.45                                       Called on iOS in applicationWillResignActive()
   42.46                                       Called on Android in onPause()
   42.47                                  */
   42.48 -	SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time
   42.49 +    SDL_APP_DIDENTERBACKGROUND, /**< The application did enter the background and may not get CPU for some time
   42.50                                       Called on iOS in applicationDidEnterBackground()
   42.51                                       Called on Android in onPause()
   42.52                                  */
   42.53 -	SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground
   42.54 +    SDL_APP_WILLENTERFOREGROUND, /**< The application is about to enter the foreground
   42.55                                       Called on iOS in applicationWillEnterForeground()
   42.56                                       Called on Android in onResume()
   42.57                                  */
   42.58 -	SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive
   42.59 +    SDL_APP_DIDENTERFOREGROUND, /**< The application is now interactive
   42.60                                       Called on iOS in applicationDidBecomeActive()
   42.61                                       Called on Android in onResume()
   42.62                                  */
   42.63 @@ -112,13 +110,13 @@
   42.64      SDL_JOYDEVICEADDED,         /**< A new joystick has been inserted into the system */
   42.65      SDL_JOYDEVICEREMOVED,       /**< An opened joystick has been removed */
   42.66  
   42.67 -	/* Game controller events */
   42.68 -	SDL_CONTROLLERAXISMOTION  = 0x650, /**< Game controller axis motion */
   42.69 -	SDL_CONTROLLERBUTTONDOWN,          /**< Game controller button pressed */
   42.70 -	SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
   42.71 -	SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
   42.72 -	SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
   42.73 -	SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
   42.74 +    /* Game controller events */
   42.75 +    SDL_CONTROLLERAXISMOTION  = 0x650, /**< Game controller axis motion */
   42.76 +    SDL_CONTROLLERBUTTONDOWN,          /**< Game controller button pressed */
   42.77 +    SDL_CONTROLLERBUTTONUP,            /**< Game controller button released */
   42.78 +    SDL_CONTROLLERDEVICEADDED,         /**< A new Game controller has been inserted into the system */
   42.79 +    SDL_CONTROLLERDEVICEREMOVED,       /**< An opened Game controller has been removed */
   42.80 +    SDL_CONTROLLERDEVICEREMAPPED,      /**< The controller mapping was updated */
   42.81  
   42.82      /* Touch events */
   42.83      SDL_FINGERDOWN      = 0x700,
   42.84 @@ -135,7 +133,7 @@
   42.85  
   42.86      /* Drag and drop events */
   42.87      SDL_DROPFILE        = 0x1000, /**< The system requests a file open */
   42.88 -	
   42.89 +
   42.90      /** Events ::SDL_USEREVENT through ::SDL_LASTEVENT are for your use,
   42.91       *  and should be allocated with SDL_RegisterEvents()
   42.92       */
   42.93 @@ -155,7 +153,7 @@
   42.94      Uint32 type;
   42.95      Uint32 timestamp;
   42.96  } SDL_CommonEvent;
   42.97 -    
   42.98 +
   42.99  /**
  42.100   *  \brief Window state change event data (event.window.*)
  42.101   */
  42.102 @@ -285,7 +283,7 @@
  42.103  typedef struct SDL_JoyBallEvent
  42.104  {
  42.105      Uint32 type;        /**< ::SDL_JOYBALLMOTION */
  42.106 -	Uint32 timestamp;
  42.107 +    Uint32 timestamp;
  42.108      SDL_JoystickID which; /**< The joystick instance id */
  42.109      Uint8 ball;         /**< The joystick trackball index */
  42.110      Uint8 padding1;
  42.111 @@ -301,14 +299,14 @@
  42.112  typedef struct SDL_JoyHatEvent
  42.113  {
  42.114      Uint32 type;        /**< ::SDL_JOYHATMOTION */
  42.115 -	Uint32 timestamp;
  42.116 +    Uint32 timestamp;
  42.117      SDL_JoystickID which; /**< The joystick instance id */
  42.118      Uint8 hat;          /**< The joystick hat index */
  42.119      Uint8 value;        /**< The hat position value.
  42.120                           *   \sa ::SDL_HAT_LEFTUP ::SDL_HAT_UP ::SDL_HAT_RIGHTUP
  42.121                           *   \sa ::SDL_HAT_LEFT ::SDL_HAT_CENTERED ::SDL_HAT_RIGHT
  42.122                           *   \sa ::SDL_HAT_LEFTDOWN ::SDL_HAT_DOWN ::SDL_HAT_RIGHTDOWN
  42.123 -                         *   
  42.124 +                         *
  42.125                           *   Note that zero means the POV is centered.
  42.126                           */
  42.127      Uint8 padding1;
  42.128 @@ -321,7 +319,7 @@
  42.129  typedef struct SDL_JoyButtonEvent
  42.130  {
  42.131      Uint32 type;        /**< ::SDL_JOYBUTTONDOWN or ::SDL_JOYBUTTONUP */
  42.132 -	Uint32 timestamp;
  42.133 +    Uint32 timestamp;
  42.134      SDL_JoystickID which; /**< The joystick instance id */
  42.135      Uint8 button;       /**< The joystick button index */
  42.136      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
  42.137 @@ -334,9 +332,9 @@
  42.138   */
  42.139  typedef struct SDL_JoyDeviceEvent
  42.140  {
  42.141 -	Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
  42.142 -	Uint32 timestamp;
  42.143 -	Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
  42.144 +    Uint32 type;        /**< ::SDL_JOYDEVICEADDED or ::SDL_JOYDEVICEREMOVED */
  42.145 +    Uint32 timestamp;
  42.146 +    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED event */
  42.147  } SDL_JoyDeviceEvent;
  42.148  
  42.149  
  42.150 @@ -346,7 +344,7 @@
  42.151  typedef struct SDL_ControllerAxisEvent
  42.152  {
  42.153      Uint32 type;        /**< ::SDL_CONTROLLERAXISMOTION */
  42.154 -	Uint32 timestamp;
  42.155 +    Uint32 timestamp;
  42.156      SDL_JoystickID which; /**< The joystick instance id */
  42.157      Uint8 axis;         /**< The controller axis (SDL_GameControllerAxis) */
  42.158      Uint8 padding1;
  42.159 @@ -363,7 +361,7 @@
  42.160  typedef struct SDL_ControllerButtonEvent
  42.161  {
  42.162      Uint32 type;        /**< ::SDL_CONTROLLERBUTTONDOWN or ::SDL_CONTROLLERBUTTONUP */
  42.163 -	Uint32 timestamp;
  42.164 +    Uint32 timestamp;
  42.165      SDL_JoystickID which; /**< The joystick instance id */
  42.166      Uint8 button;       /**< The controller button (SDL_GameControllerButton) */
  42.167      Uint8 state;        /**< ::SDL_PRESSED or ::SDL_RELEASED */
  42.168 @@ -377,9 +375,9 @@
  42.169   */
  42.170  typedef struct SDL_ControllerDeviceEvent
  42.171  {
  42.172 -	Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
  42.173 -	Uint32 timestamp;
  42.174 -	Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
  42.175 +    Uint32 type;        /**< ::SDL_CONTROLLERDEVICEADDED, ::SDL_CONTROLLERDEVICEREMOVED, or ::SDL_CONTROLLERDEVICEREMAPPED */
  42.176 +    Uint32 timestamp;
  42.177 +    Sint32 which;       /**< The joystick device index for the ADDED event, instance id for the REMOVED or REMAPPED event */
  42.178  } SDL_ControllerDeviceEvent;
  42.179  
  42.180  
  42.181 @@ -411,7 +409,7 @@
  42.182      float dTheta;
  42.183      float dDist;
  42.184      float x;
  42.185 -    float y;  
  42.186 +    float y;
  42.187      Uint16 numFingers;
  42.188      Uint16 padding;
  42.189  } SDL_MultiGestureEvent;
  42.190 @@ -511,9 +509,9 @@
  42.191      SDL_JoyHatEvent jhat;           /**< Joystick hat event data */
  42.192      SDL_JoyButtonEvent jbutton;     /**< Joystick button event data */
  42.193      SDL_JoyDeviceEvent jdevice;     /**< Joystick device change event data */
  42.194 -	SDL_ControllerAxisEvent caxis;		/**< Game Controller axis event data */
  42.195 -	SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
  42.196 -	SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
  42.197 +    SDL_ControllerAxisEvent caxis;      /**< Game Controller axis event data */
  42.198 +    SDL_ControllerButtonEvent cbutton;  /**< Game Controller button event data */
  42.199 +    SDL_ControllerDeviceEvent cdevice;  /**< Game Controller device event data */
  42.200      SDL_QuitEvent quit;             /**< Quit request event data */
  42.201      SDL_UserEvent user;             /**< Custom event data */
  42.202      SDL_SysWMEvent syswm;           /**< System dependent window event data */
  42.203 @@ -537,9 +535,9 @@
  42.204  
  42.205  /**
  42.206   *  Pumps the event loop, gathering events from the input devices.
  42.207 - *  
  42.208 + *
  42.209   *  This function updates the event queue and internal input device state.
  42.210 - *  
  42.211 + *
  42.212   *  This should only be run in the thread that sets the video mode.
  42.213   */
  42.214  extern DECLSPEC void SDLCALL SDL_PumpEvents(void);
  42.215 @@ -554,20 +552,20 @@
  42.216  
  42.217  /**
  42.218   *  Checks the event queue for messages and optionally returns them.
  42.219 - *  
  42.220 + *
  42.221   *  If \c action is ::SDL_ADDEVENT, up to \c numevents events will be added to
  42.222   *  the back of the event queue.
  42.223 - *  
  42.224 + *
  42.225   *  If \c action is ::SDL_PEEKEVENT, up to \c numevents events at the front
  42.226   *  of the event queue, within the specified minimum and maximum type,
  42.227   *  will be returned and will not be removed from the queue.
  42.228 - *  
  42.229 - *  If \c action is ::SDL_GETEVENT, up to \c numevents events at the front 
  42.230 + *
  42.231 + *  If \c action is ::SDL_GETEVENT, up to \c numevents events at the front
  42.232   *  of the event queue, within the specified minimum and maximum type,
  42.233   *  will be returned and will be removed from the queue.
  42.234 - *  
  42.235 + *
  42.236   *  \return The number of events actually stored, or -1 if there was an error.
  42.237 - *  
  42.238 + *
  42.239   *  This function is thread-safe.
  42.240   */
  42.241  extern DECLSPEC int SDLCALL SDL_PeepEvents(SDL_Event * events, int numevents,
  42.242 @@ -589,31 +587,31 @@
  42.243  
  42.244  /**
  42.245   *  \brief Polls for currently pending events.
  42.246 - *  
  42.247 + *
  42.248   *  \return 1 if there are any pending events, or 0 if there are none available.
  42.249 - *  
  42.250 - *  \param event If not NULL, the next event is removed from the queue and 
  42.251 + *
  42.252 + *  \param event If not NULL, the next event is removed from the queue and
  42.253   *               stored in that area.
  42.254   */
  42.255  extern DECLSPEC int SDLCALL SDL_PollEvent(SDL_Event * event);
  42.256  
  42.257  /**
  42.258   *  \brief Waits indefinitely for the next available event.
  42.259 - *  
  42.260 + *
  42.261   *  \return 1, or 0 if there was an error while waiting for events.
  42.262 - *   
  42.263 - *  \param event If not NULL, the next event is removed from the queue and 
  42.264 + *
  42.265 + *  \param event If not NULL, the next event is removed from the queue and
  42.266   *               stored in that area.
  42.267   */
  42.268  extern DECLSPEC int SDLCALL SDL_WaitEvent(SDL_Event * event);
  42.269  
  42.270  /**
  42.271 - *  \brief Waits until the specified timeout (in milliseconds) for the next 
  42.272 + *  \brief Waits until the specified timeout (in milliseconds) for the next
  42.273   *         available event.
  42.274 - *  
  42.275 + *
  42.276   *  \return 1, or 0 if there was an error while waiting for events.
  42.277 - *  
  42.278 - *  \param event If not NULL, the next event is removed from the queue and 
  42.279 + *
  42.280 + *  \param event If not NULL, the next event is removed from the queue and
  42.281   *               stored in that area.
  42.282   *  \param timeout The timeout (in milliseconds) to wait for next event.
  42.283   */
  42.284 @@ -622,8 +620,8 @@
  42.285  
  42.286  /**
  42.287   *  \brief Add an event to the event queue.
  42.288 - *  
  42.289 - *  \return 1 on success, 0 if the event was filtered, or -1 if the event queue 
  42.290 + *
  42.291 + *  \return 1 on success, 0 if the event was filtered, or -1 if the event queue
  42.292   *          was full or there was some other error.
  42.293   */
  42.294  extern DECLSPEC int SDLCALL SDL_PushEvent(SDL_Event * event);
  42.295 @@ -633,20 +631,20 @@
  42.296  /**
  42.297   *  Sets up a filter to process all events before they change internal state and
  42.298   *  are posted to the internal event queue.
  42.299 - *  
  42.300 + *
  42.301   *  The filter is prototyped as:
  42.302   *  \code
  42.303   *      int SDL_EventFilter(void *userdata, SDL_Event * event);
  42.304   *  \endcode
  42.305   *
  42.306   *  If the filter returns 1, then the event will be added to the internal queue.
  42.307 - *  If it returns 0, then the event will be dropped from the queue, but the 
  42.308 + *  If it returns 0, then the event will be dropped from the queue, but the
  42.309   *  internal state will still be updated.  This allows selective filtering of
  42.310   *  dynamically arriving events.
  42.311 - *  
  42.312 - *  \warning  Be very careful of what you do in the event filter function, as 
  42.313 + *
  42.314 + *  \warning  Be very careful of what you do in the event filter function, as
  42.315   *            it may run in a different thread!
  42.316 - *  
  42.317 + *
  42.318   *  There is one caveat when dealing with the ::SDL_QUITEVENT event type.  The
  42.319   *  event filter is only called when the window manager desires to close the
  42.320   *  application window.  If the event filter returns 1, then the window will
  42.321 @@ -685,18 +683,18 @@
  42.322                                                void *userdata);
  42.323  
  42.324  /*@{*/
  42.325 -#define SDL_QUERY	-1
  42.326 -#define SDL_IGNORE	 0
  42.327 -#define SDL_DISABLE	 0
  42.328 -#define SDL_ENABLE	 1
  42.329 +#define SDL_QUERY   -1
  42.330 +#define SDL_IGNORE   0
  42.331 +#define SDL_DISABLE  0
  42.332 +#define SDL_ENABLE   1
  42.333  
  42.334  /**
  42.335   *  This function allows you to set the state of processing certain events.
  42.336 - *   - If \c state is set to ::SDL_IGNORE, that event will be automatically 
  42.337 + *   - If \c state is set to ::SDL_IGNORE, that event will be automatically
  42.338   *     dropped from the event queue and will not event be filtered.
  42.339 - *   - If \c state is set to ::SDL_ENABLE, that event will be processed 
  42.340 + *   - If \c state is set to ::SDL_ENABLE, that event will be processed
  42.341   *     normally.
  42.342 - *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the 
  42.343 + *   - If \c state is set to ::SDL_QUERY, SDL_EventState() will return the
  42.344   *     current processing state of the specified event.
  42.345   */
  42.346  extern DECLSPEC Uint8 SDLCALL SDL_EventState(Uint32 type, int state);
  42.347 @@ -714,9 +712,7 @@
  42.348  
  42.349  /* Ends C function definitions when using C++ */
  42.350  #ifdef __cplusplus
  42.351 -/* *INDENT-OFF* */
  42.352  }
  42.353 -/* *INDENT-ON* */
  42.354  #endif
  42.355  #include "close_code.h"
  42.356  
    43.1 --- a/include/SDL_gamecontroller.h	Sat May 18 12:48:50 2013 -0700
    43.2 +++ b/include/SDL_gamecontroller.h	Sat May 18 14:17:52 2013 -0700
    43.3 @@ -35,9 +35,7 @@
    43.4  #include "begin_code.h"
    43.5  /* Set up for C function definitions, even when using C++ */
    43.6  #ifdef __cplusplus
    43.7 -/* *INDENT-OFF* */
    43.8  extern "C" {
    43.9 -/* *INDENT-ON* */
   43.10  #endif
   43.11  
   43.12  /**
   43.13 @@ -55,10 +53,10 @@
   43.14  
   43.15  typedef enum
   43.16  {
   43.17 -	SDL_CONTROLLER_BINDTYPE_NONE = 0,
   43.18 -	SDL_CONTROLLER_BINDTYPE_BUTTON,
   43.19 -	SDL_CONTROLLER_BINDTYPE_AXIS,
   43.20 -	SDL_CONTROLLER_BINDTYPE_HAT
   43.21 +    SDL_CONTROLLER_BINDTYPE_NONE = 0,
   43.22 +    SDL_CONTROLLER_BINDTYPE_BUTTON,
   43.23 +    SDL_CONTROLLER_BINDTYPE_AXIS,
   43.24 +    SDL_CONTROLLER_BINDTYPE_HAT
   43.25  } SDL_GameControllerBindType;
   43.26  
   43.27  /**
   43.28 @@ -66,43 +64,43 @@
   43.29   */
   43.30  typedef struct SDL_GameControllerButtonBind
   43.31  {
   43.32 -	SDL_GameControllerBindType bindType;
   43.33 -	union
   43.34 -	{
   43.35 -		int button;
   43.36 -		int axis;
   43.37 -		struct {
   43.38 +    SDL_GameControllerBindType bindType;
   43.39 +    union
   43.40 +    {
   43.41 +        int button;
   43.42 +        int axis;
   43.43 +        struct {
   43.44              int hat;
   43.45              int hat_mask;
   43.46          } hat;
   43.47 -	} value;
   43.48 +    } value;
   43.49  
   43.50  } SDL_GameControllerButtonBind;
   43.51  
   43.52  
   43.53  /**
   43.54   *  To count the number of game controllers in the system for the following:
   43.55 - *	int nJoysticks = SDL_NumJoysticks();
   43.56 - *	int nGameControllers = 0;
   43.57 - *	for ( int i = 0; i < nJoysticks; i++ ) {
   43.58 - *		if ( SDL_IsGameController(i) ) {
   43.59 - *			nGameControllers++;
   43.60 - *		}
   43.61 + *  int nJoysticks = SDL_NumJoysticks();
   43.62 + *  int nGameControllers = 0;
   43.63 + *  for ( int i = 0; i < nJoysticks; i++ ) {
   43.64 + *      if ( SDL_IsGameController(i) ) {
   43.65 + *          nGameControllers++;
   43.66 + *      }
   43.67   *  }
   43.68   *
   43.69   *  Using the SDL_HINT_GAMECONTROLLERCONFIG hint or the SDL_GameControllerAddMapping you can add support for controllers SDL is unaware of or cause an existing controller to have a different binding. The format is:
   43.70 - *	guid,name,mappings
   43.71 + *  guid,name,mappings
   43.72   *
   43.73   *  Where GUID is the string value from SDL_JoystickGetGUIDString(), name is the human readable string for the device and mappings are controller mappings to joystick ones.
   43.74   *  Under Windows there is a reserved GUID of "xinput" that covers any XInput devices.
   43.75 - *	The mapping format for joystick is:
   43.76 - *		bX - a joystick button, index X
   43.77 - *		hX.Y - hat X with value Y
   43.78 - *		aX - axis X of the joystick
   43.79 + *  The mapping format for joystick is:
   43.80 + *      bX - a joystick button, index X
   43.81 + *      hX.Y - hat X with value Y
   43.82 + *      aX - axis X of the joystick
   43.83   *  Buttons can be used as a controller axis and vice versa.
   43.84   *
   43.85   *  This string shows an example of a valid mapping for a controller
   43.86 - * 	"341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7",
   43.87 + *  "341a3608000000000000504944564944,Afterglow PS3 Controller,a:b1,b:b2,y:b3,x:b0,start:b9,guide:b12,back:b8,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftshoulder:b4,rightshoulder:b5,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7",
   43.88   *
   43.89   */
   43.90  
   43.91 @@ -179,7 +177,7 @@
   43.92  
   43.93  /**
   43.94   *  Update the current state of the open game controllers.
   43.95 - *  
   43.96 + *
   43.97   *  This is called automatically by the event loop if any game controller
   43.98   *  events are enabled.
   43.99   */
  43.100 @@ -191,14 +189,14 @@
  43.101   */
  43.102  typedef enum
  43.103  {
  43.104 -	SDL_CONTROLLER_AXIS_INVALID = -1,
  43.105 -	SDL_CONTROLLER_AXIS_LEFTX,
  43.106 -	SDL_CONTROLLER_AXIS_LEFTY,
  43.107 -	SDL_CONTROLLER_AXIS_RIGHTX,
  43.108 -	SDL_CONTROLLER_AXIS_RIGHTY,
  43.109 -	SDL_CONTROLLER_AXIS_TRIGGERLEFT,
  43.110 -	SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
  43.111 -	SDL_CONTROLLER_AXIS_MAX
  43.112 +    SDL_CONTROLLER_AXIS_INVALID = -1,
  43.113 +    SDL_CONTROLLER_AXIS_LEFTX,
  43.114 +    SDL_CONTROLLER_AXIS_LEFTY,
  43.115 +    SDL_CONTROLLER_AXIS_RIGHTX,
  43.116 +    SDL_CONTROLLER_AXIS_RIGHTY,
  43.117 +    SDL_CONTROLLER_AXIS_TRIGGERLEFT,
  43.118 +    SDL_CONTROLLER_AXIS_TRIGGERRIGHT,
  43.119 +    SDL_CONTROLLER_AXIS_MAX
  43.120  } SDL_GameControllerAxis;
  43.121  
  43.122  /**
  43.123 @@ -234,23 +232,23 @@
  43.124   */
  43.125  typedef enum
  43.126  {
  43.127 -	SDL_CONTROLLER_BUTTON_INVALID = -1,
  43.128 -	SDL_CONTROLLER_BUTTON_A,
  43.129 -	SDL_CONTROLLER_BUTTON_B,
  43.130 -	SDL_CONTROLLER_BUTTON_X,
  43.131 -	SDL_CONTROLLER_BUTTON_Y,
  43.132 -	SDL_CONTROLLER_BUTTON_BACK,
  43.133 -	SDL_CONTROLLER_BUTTON_GUIDE,
  43.134 -	SDL_CONTROLLER_BUTTON_START,
  43.135 -	SDL_CONTROLLER_BUTTON_LEFTSTICK,
  43.136 -	SDL_CONTROLLER_BUTTON_RIGHTSTICK,
  43.137 -	SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
  43.138 -	SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
  43.139 -	SDL_CONTROLLER_BUTTON_DPAD_UP,
  43.140 -	SDL_CONTROLLER_BUTTON_DPAD_DOWN,
  43.141 -	SDL_CONTROLLER_BUTTON_DPAD_LEFT,
  43.142 -	SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
  43.143 -	SDL_CONTROLLER_BUTTON_MAX
  43.144 +    SDL_CONTROLLER_BUTTON_INVALID = -1,
  43.145 +    SDL_CONTROLLER_BUTTON_A,
  43.146 +    SDL_CONTROLLER_BUTTON_B,
  43.147 +    SDL_CONTROLLER_BUTTON_X,
  43.148 +    SDL_CONTROLLER_BUTTON_Y,
  43.149 +    SDL_CONTROLLER_BUTTON_BACK,
  43.150 +    SDL_CONTROLLER_BUTTON_GUIDE,
  43.151 +    SDL_CONTROLLER_BUTTON_START,
  43.152 +    SDL_CONTROLLER_BUTTON_LEFTSTICK,
  43.153 +    SDL_CONTROLLER_BUTTON_RIGHTSTICK,
  43.154 +    SDL_CONTROLLER_BUTTON_LEFTSHOULDER,
  43.155 +    SDL_CONTROLLER_BUTTON_RIGHTSHOULDER,
  43.156 +    SDL_CONTROLLER_BUTTON_DPAD_UP,
  43.157 +    SDL_CONTROLLER_BUTTON_DPAD_DOWN,
  43.158 +    SDL_CONTROLLER_BUTTON_DPAD_LEFT,
  43.159 +    SDL_CONTROLLER_BUTTON_DPAD_RIGHT,
  43.160 +    SDL_CONTROLLER_BUTTON_MAX
  43.161  } SDL_GameControllerButton;
  43.162  
  43.163  /**
  43.164 @@ -287,9 +285,7 @@
  43.165  
  43.166  /* Ends C function definitions when using C++ */
  43.167  #ifdef __cplusplus
  43.168 -/* *INDENT-OFF* */
  43.169  }
  43.170 -/* *INDENT-ON* */
  43.171  #endif
  43.172  #include "close_code.h"
  43.173  
    44.1 --- a/include/SDL_gesture.h	Sat May 18 12:48:50 2013 -0700
    44.2 +++ b/include/SDL_gesture.h	Sat May 18 14:17:52 2013 -0700
    44.3 @@ -21,7 +21,7 @@
    44.4  
    44.5  /**
    44.6   *  \file SDL_gesture.h
    44.7 - *  
    44.8 + *
    44.9   *  Include file for SDL gesture event handling.
   44.10   */
   44.11  
   44.12 @@ -38,9 +38,7 @@
   44.13  #include "begin_code.h"
   44.14  /* Set up for C function definitions, even when using C++ */
   44.15  #ifdef __cplusplus
   44.16 -/* *INDENT-OFF* */
   44.17  extern "C" {
   44.18 -/* *INDENT-ON* */
   44.19  #endif
   44.20  
   44.21  typedef Sint64 SDL_GestureID;
   44.22 @@ -80,9 +78,7 @@
   44.23  
   44.24  /* Ends C function definitions when using C++ */
   44.25  #ifdef __cplusplus
   44.26 -/* *INDENT-OFF* */
   44.27  }
   44.28 -/* *INDENT-ON* */
   44.29  #endif
   44.30  #include "close_code.h"
   44.31  
    45.1 --- a/include/SDL_haptic.h	Sat May 18 12:48:50 2013 -0700
    45.2 +++ b/include/SDL_haptic.h	Sat May 18 14:17:52 2013 -0700
    45.3 @@ -21,10 +21,10 @@
    45.4  
    45.5  /**
    45.6   *  \file SDL_haptic.h
    45.7 - *  
    45.8 + *
    45.9   *  \brief The SDL Haptic subsystem allows you to control haptic (force feedback)
   45.10   *         devices.
   45.11 - * 
   45.12 + *
   45.13   *  The basic usage is as follows:
   45.14   *   - Initialize the Subsystem (::SDL_INIT_HAPTIC).
   45.15   *   - Open a Haptic Device.
   45.16 @@ -119,16 +119,14 @@
   45.17  #include "begin_code.h"
   45.18  /* Set up for C function definitions, even when using C++ */
   45.19  #ifdef __cplusplus
   45.20 -/* *INDENT-OFF* */
   45.21  extern "C" {
   45.22 -   /* *INDENT-ON* */                                                         
   45.23  #endif /* __cplusplus */
   45.24  
   45.25  /**
   45.26   *  \typedef SDL_Haptic
   45.27 - *  
   45.28 + *
   45.29   *  \brief The haptic structure used to identify an SDL haptic.
   45.30 - *  
   45.31 + *
   45.32   *  \sa SDL_HapticOpen
   45.33   *  \sa SDL_HapticOpenFromJoystick
   45.34   *  \sa SDL_HapticClose
   45.35 @@ -139,7 +137,7 @@
   45.36  
   45.37  /**
   45.38   *  \name Haptic features
   45.39 - *  
   45.40 + *
   45.41   *  Different haptic features a device can have.
   45.42   */
   45.43  /*@{*/
   45.44 @@ -153,68 +151,68 @@
   45.45   *  \brief Constant effect supported.
   45.46   *
   45.47   *  Constant haptic effect.
   45.48 - *  
   45.49 + *
   45.50   *  \sa SDL_HapticCondition
   45.51   */
   45.52  #define SDL_HAPTIC_CONSTANT   (1<<0)
   45.53  
   45.54  /**
   45.55   *  \brief Sine wave effect supported.
   45.56 - *  
   45.57 + *
   45.58   *  Periodic haptic effect that simulates sine waves.
   45.59 - *  
   45.60 + *
   45.61   *  \sa SDL_HapticPeriodic
   45.62   */
   45.63  #define SDL_HAPTIC_SINE       (1<<1)
   45.64  
   45.65  /**
   45.66   *  \brief Square wave effect supported.
   45.67 - *  
   45.68 + *
   45.69   *  Periodic haptic effect that simulates square waves.
   45.70 - * 
   45.71 + *
   45.72   *  \sa SDL_HapticPeriodic
   45.73   */
   45.74  #define SDL_HAPTIC_SQUARE     (1<<2)
   45.75  
   45.76  /**
   45.77   *  \brief Triangle wave effect supported.
   45.78 - *  
   45.79 + *
   45.80   *  Periodic haptic effect that simulates triangular waves.
   45.81 - *  
   45.82 + *
   45.83   *  \sa SDL_HapticPeriodic
   45.84   */
   45.85  #define SDL_HAPTIC_TRIANGLE   (1<<3)
   45.86  
   45.87  /**
   45.88   *  \brief Sawtoothup wave effect supported.
   45.89 - *  
   45.90 + *
   45.91   *  Periodic haptic effect that simulates saw tooth up waves.
   45.92 - *  
   45.93 + *
   45.94   *  \sa SDL_HapticPeriodic
   45.95   */
   45.96  #define SDL_HAPTIC_SAWTOOTHUP (1<<4)
   45.97  
   45.98  /**
   45.99   *  \brief Sawtoothdown wave effect supported.
  45.100 - *  
  45.101 + *
  45.102   *  Periodic haptic effect that simulates saw tooth down waves.
  45.103 - *  
  45.104 + *
  45.105   *  \sa SDL_HapticPeriodic
  45.106   */
  45.107  #define SDL_HAPTIC_SAWTOOTHDOWN (1<<5)
  45.108  
  45.109  /**
  45.110   *  \brief Ramp effect supported.
  45.111 - *  
  45.112 + *
  45.113   *  Ramp haptic effect.
  45.114 - *  
  45.115 + *
  45.116   *  \sa SDL_HapticRamp
  45.117   */
  45.118  #define SDL_HAPTIC_RAMP       (1<<6)
  45.119  
  45.120  /**
  45.121   *  \brief Spring effect supported - uses axes position.
  45.122 - *  
  45.123 + *
  45.124   *  Condition haptic effect that simulates a spring.  Effect is based on the
  45.125   *  axes position.
  45.126   *
  45.127 @@ -224,17 +222,17 @@
  45.128  
  45.129  /**
  45.130   *  \brief Damper effect supported - uses axes velocity.
  45.131 - *  
  45.132 + *
  45.133   *  Condition haptic effect that simulates dampening.  Effect is based on the
  45.134   *  axes velocity.
  45.135 - *  
  45.136 + *
  45.137   *  \sa SDL_HapticCondition
  45.138   */
  45.139  #define SDL_HAPTIC_DAMPER     (1<<8)
  45.140  
  45.141  /**
  45.142   *  \brief Inertia effect supported - uses axes acceleration.
  45.143 - *  
  45.144 + *
  45.145   *  Condition haptic effect that simulates inertia.  Effect is based on the axes
  45.146   *  acceleration.
  45.147   *
  45.148 @@ -244,17 +242,17 @@
  45.149  
  45.150  /**
  45.151   *  \brief Friction effect supported - uses axes movement.
  45.152 - *  
  45.153 - *  Condition haptic effect that simulates friction.  Effect is based on the 
  45.154 + *
  45.155 + *  Condition haptic effect that simulates friction.  Effect is based on the
  45.156   *  axes movement.
  45.157 - *  
  45.158 + *
  45.159   *  \sa SDL_HapticCondition
  45.160   */
  45.161  #define SDL_HAPTIC_FRICTION   (1<<10)
  45.162  
  45.163  /**
  45.164   *  \brief Custom effect is supported.
  45.165 - *  
  45.166 + *
  45.167   *  User defined custom haptic effect.
  45.168   */
  45.169  #define SDL_HAPTIC_CUSTOM     (1<<11)
  45.170 @@ -265,34 +263,34 @@
  45.171  
  45.172  /**
  45.173   *  \brief Device can set global gain.
  45.174 - *  
  45.175 + *
  45.176   *  Device supports setting the global gain.
  45.177 - *  
  45.178 + *
  45.179   *  \sa SDL_HapticSetGain
  45.180   */
  45.181  #define SDL_HAPTIC_GAIN       (1<<12)
  45.182  
  45.183  /**
  45.184   *  \brief Device can set autocenter.
  45.185 - *  
  45.186 + *
  45.187   *  Device supports setting autocenter.
  45.188 - *  
  45.189 + *
  45.190   *  \sa SDL_HapticSetAutocenter
  45.191   */
  45.192  #define SDL_HAPTIC_AUTOCENTER (1<<13)
  45.193  
  45.194  /**
  45.195   *  \brief Device can be queried for effect status.
  45.196 - *  
  45.197 + *
  45.198   *  Device can be queried for effect status.
  45.199 - *  
  45.200 + *
  45.201   *  \sa SDL_HapticGetEffectStatus
  45.202   */
  45.203  #define SDL_HAPTIC_STATUS     (1<<14)
  45.204  
  45.205  /**
  45.206   *  \brief Device can be paused.
  45.207 - *  
  45.208 + *
  45.209   *  \sa SDL_HapticPause
  45.210   *  \sa SDL_HapticUnpause
  45.211   */
  45.212 @@ -306,21 +304,21 @@
  45.213  
  45.214  /**
  45.215   *  \brief Uses polar coordinates for the direction.
  45.216 - *  
  45.217 + *
  45.218   *  \sa SDL_HapticDirection
  45.219   */
  45.220  #define SDL_HAPTIC_POLAR      0
  45.221  
  45.222  /**
  45.223   *  \brief Uses cartesian coordinates for the direction.
  45.224 - *  
  45.225 + *
  45.226   *  \sa SDL_HapticDirection
  45.227   */
  45.228  #define SDL_HAPTIC_CARTESIAN  1
  45.229  
  45.230  /**
  45.231   *  \brief Uses spherical coordinates for the direction.
  45.232 - *  
  45.233 + *
  45.234   *  \sa SDL_HapticDirection
  45.235   */
  45.236  #define SDL_HAPTIC_SPHERICAL  2
  45.237 @@ -343,7 +341,7 @@
  45.238  
  45.239  /**
  45.240   *  \brief Structure that represents a haptic direction.
  45.241 - *  
  45.242 + *
  45.243   *  Directions can be specified by:
  45.244   *   - ::SDL_HAPTIC_POLAR : Specified by polar coordinates.
  45.245   *   - ::SDL_HAPTIC_CARTESIAN : Specified by cartesian coordinates.
  45.246 @@ -361,8 +359,8 @@
  45.247                   |  | |'-----'|
  45.248                   |__|~')_____('
  45.249                     [ COMPUTER ]
  45.250 -    
  45.251 -    
  45.252 +
  45.253 +
  45.254                       North (0,-1)
  45.255                           ^
  45.256                           |
  45.257 @@ -372,22 +370,22 @@
  45.258                           |
  45.259                           v
  45.260                        South (0,1)
  45.261 -    
  45.262 -    
  45.263 +
  45.264 +
  45.265                        [ USER ]
  45.266                          \|||/
  45.267                          (o o)
  45.268                    ---ooO-(_)-Ooo---
  45.269      \endverbatim
  45.270 - *  
  45.271 - *  If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a 
  45.272 + *
  45.273 + *  If type is ::SDL_HAPTIC_POLAR, direction is encoded by hundredths of a
  45.274   *  degree starting north and turning clockwise.  ::SDL_HAPTIC_POLAR only uses
  45.275   *  the first \c dir parameter.  The cardinal directions would be:
  45.276   *   - North: 0 (0 degrees)
  45.277   *   - East: 9000 (90 degrees)
  45.278   *   - South: 18000 (180 degrees)
  45.279   *   - West: 27000 (270 degrees)
  45.280 - *  
  45.281 + *
  45.282   *  If type is ::SDL_HAPTIC_CARTESIAN, direction is encoded by three positions
  45.283   *  (X axis, Y axis and Z axis (with 3 axes)).  ::SDL_HAPTIC_CARTESIAN uses
  45.284   *  the first three \c dir parameters.  The cardinal directions would be:
  45.285 @@ -395,13 +393,13 @@
  45.286   *   - East:  -1, 0, 0
  45.287   *   - South:  0, 1, 0
  45.288   *   - West:   1, 0, 0
  45.289 - *  
  45.290 + *
  45.291   *  The Z axis represents the height of the effect if supported, otherwise
  45.292   *  it's unused.  In cartesian encoding (1, 2) would be the same as (2, 4), you
  45.293   *  can use any multiple you want, only the direction matters.
  45.294 - *  
  45.295 + *
  45.296   *  If type is ::SDL_HAPTIC_SPHERICAL, direction is encoded by two rotations.
  45.297 - *  The first two \c dir parameters are used.  The \c dir parameters are as 
  45.298 + *  The first two \c dir parameters are used.  The \c dir parameters are as
  45.299   *  follows (all values are in hundredths of degrees):
  45.300   *   - Degrees from (1, 0) rotated towards (0, 1).
  45.301   *   - Degrees towards (0, 0, 1) (device needs at least 3 axes).
  45.302 @@ -411,17 +409,17 @@
  45.303   *  from the south means the user will have to pull the stick to counteract):
  45.304   *  \code
  45.305   *  SDL_HapticDirection direction;
  45.306 - *  
  45.307 + *
  45.308   *  // Cartesian directions
  45.309   *  direction.type = SDL_HAPTIC_CARTESIAN; // Using cartesian direction encoding.
  45.310   *  direction.dir[0] = 0; // X position
  45.311   *  direction.dir[1] = 1; // Y position
  45.312   *  // Assuming the device has 2 axes, we don't need to specify third parameter.
  45.313 - *  
  45.314 + *
  45.315   *  // Polar directions
  45.316   *  direction.type = SDL_HAPTIC_POLAR; // We'll be using polar direction encoding.
  45.317   *  direction.dir[0] = 18000; // Polar only uses first parameter
  45.318 - *  
  45.319 + *
  45.320   *  // Spherical coordinates
  45.321   *  direction.type = SDL_HAPTIC_SPHERICAL; // Spherical encoding
  45.322   *  direction.dir[0] = 9000; // Since we only have two axes we don't need more parameters.
  45.323 @@ -442,12 +440,12 @@
  45.324  
  45.325  /**
  45.326   *  \brief A structure containing a template for a Constant effect.
  45.327 - *  
  45.328 + *
  45.329   *  The struct is exclusive to the ::SDL_HAPTIC_CONSTANT effect.
  45.330 - *  
  45.331 + *
  45.332   *  A constant effect applies a constant force in the specified direction
  45.333   *  to the joystick.
  45.334 - *  
  45.335 + *
  45.336   *  \sa SDL_HAPTIC_CONSTANT
  45.337   *  \sa SDL_HapticEffect
  45.338   */
  45.339 @@ -477,18 +475,18 @@
  45.340  
  45.341  /**
  45.342   *  \brief A structure containing a template for a Periodic effect.
  45.343 - *  
  45.344 + *
  45.345   *  The struct handles the following effects:
  45.346   *   - ::SDL_HAPTIC_SINE
  45.347   *   - ::SDL_HAPTIC_SQUARE
  45.348   *   - ::SDL_HAPTIC_TRIANGLE
  45.349   *   - ::SDL_HAPTIC_SAWTOOTHUP
  45.350   *   - ::SDL_HAPTIC_SAWTOOTHDOWN
  45.351 - *  
  45.352 + *
  45.353   *  A periodic effect consists in a wave-shaped effect that repeats itself
  45.354   *  over time.  The type determines the shape of the wave and the parameters
  45.355   *  determine the dimensions of the wave.
  45.356 - *  
  45.357 + *
  45.358   *  Phase is given by hundredth of a cycle meaning that giving the phase a value
  45.359   *  of 9000 will displace it 25% of its period.  Here are sample values:
  45.360   *   -     0: No phase displacement.
  45.361 @@ -503,28 +501,28 @@
  45.362        __      __      __      __
  45.363       /  \    /  \    /  \    /
  45.364      /    \__/    \__/    \__/
  45.365 -    
  45.366 +
  45.367      SDL_HAPTIC_SQUARE
  45.368       __    __    __    __    __
  45.369      |  |  |  |  |  |  |  |  |  |
  45.370      |  |__|  |__|  |__|  |__|  |
  45.371 -    
  45.372 +
  45.373      SDL_HAPTIC_TRIANGLE
  45.374        /\    /\    /\    /\    /\
  45.375       /  \  /  \  /  \  /  \  /
  45.376      /    \/    \/    \/    \/
  45.377 -    
  45.378 +
  45.379      SDL_HAPTIC_SAWTOOTHUP
  45.380        /|  /|  /|  /|  /|  /|  /|
  45.381       / | / | / | / | / | / | / |
  45.382      /  |/  |/  |/  |/  |/  |/  |
  45.383 -    
  45.384 +
  45.385      SDL_HAPTIC_SAWTOOTHDOWN
  45.386      \  |\  |\  |\  |\  |\  |\  |
  45.387       \ | \ | \ | \ | \ | \ | \ |
  45.388        \|  \|  \|  \|  \|  \|  \|
  45.389      \endverbatim
  45.390 - *  
  45.391 + *
  45.392   *  \sa SDL_HAPTIC_SINE
  45.393   *  \sa SDL_HAPTIC_SQUARE
  45.394   *  \sa SDL_HAPTIC_TRIANGLE
  45.395 @@ -563,21 +561,21 @@
  45.396  
  45.397  /**
  45.398   *  \brief A structure containing a template for a Condition effect.
  45.399 - *  
  45.400 + *
  45.401   *  The struct handles the following effects:
  45.402   *   - ::SDL_HAPTIC_SPRING: Effect based on axes position.
  45.403   *   - ::SDL_HAPTIC_DAMPER: Effect based on axes velocity.
  45.404   *   - ::SDL_HAPTIC_INERTIA: Effect based on axes acceleration.
  45.405   *   - ::SDL_HAPTIC_FRICTION: Effect based on axes movement.
  45.406 - *  
  45.407 + *
  45.408   *  Direction is handled by condition internals instead of a direction member.
  45.409   *  The condition effect specific members have three parameters.  The first
  45.410   *  refers to the X axis, the second refers to the Y axis and the third
  45.411   *  refers to the Z axis.  The right terms refer to the positive side of the
  45.412 - *  axis and the left terms refer to the negative side of the axis.  Please 
  45.413 + *  axis and the left terms refer to the negative side of the axis.  Please
  45.414   *  refer to the ::SDL_HapticDirection diagram for which side is positive and
  45.415   *  which is negative.
  45.416 - *  
  45.417 + *
  45.418   *  \sa SDL_HapticDirection
  45.419   *  \sa SDL_HAPTIC_SPRING
  45.420   *  \sa SDL_HAPTIC_DAMPER
  45.421 @@ -611,14 +609,14 @@
  45.422  
  45.423  /**
  45.424   *  \brief A structure containing a template for a Ramp effect.
  45.425 - *  
  45.426 + *
  45.427   *  This struct is exclusively for the ::SDL_HAPTIC_RAMP effect.
  45.428 - *  
  45.429 + *
  45.430   *  The ramp effect starts at start strength and ends at end strength.
  45.431   *  It augments in linear fashion.  If you use attack and fade with a ramp
  45.432   *  they effects get added to the ramp effect making the effect become
  45.433   *  quadratic instead of linear.
  45.434 - *  
  45.435 + *
  45.436   *  \sa SDL_HAPTIC_RAMP
  45.437   *  \sa SDL_HapticEffect
  45.438   */
  45.439 @@ -649,14 +647,14 @@
  45.440  
  45.441  /**
  45.442   *  \brief A structure containing a template for the ::SDL_HAPTIC_CUSTOM effect.
  45.443 - *  
  45.444 + *
  45.445   *  A custom force feedback effect is much like a periodic effect, where the
  45.446   *  application can define its exact shape.  You will have to allocate the
  45.447   *  data yourself.  Data should consist of channels * samples Uint16 samples.
  45.448 - *  
  45.449 + *
  45.450   *  If channels is one, the effect is rotated using the defined direction.
  45.451   *  Otherwise it uses the samples in data for the different axes.
  45.452 - *  
  45.453 + *
  45.454   *  \sa SDL_HAPTIC_CUSTOM
  45.455   *  \sa SDL_HapticEffect
  45.456   */
  45.457 @@ -689,34 +687,34 @@
  45.458  
  45.459  /**
  45.460   *  \brief The generic template for any haptic effect.
  45.461 - *  
  45.462 + *
  45.463   *  All values max at 32767 (0x7FFF).  Signed values also can be negative.
  45.464   *  Time values unless specified otherwise are in milliseconds.
  45.465 - *  
  45.466 - *  You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767 
  45.467 - *  value.  Neither delay, interval, attack_length nor fade_length support 
  45.468 + *
  45.469 + *  You can also pass ::SDL_HAPTIC_INFINITY to length instead of a 0-32767
  45.470 + *  value.  Neither delay, interval, attack_length nor fade_length support
  45.471   *  ::SDL_HAPTIC_INFINITY.  Fade will also not be used since effect never ends.
  45.472 - *  
  45.473 + *
  45.474   *  Additionally, the ::SDL_HAPTIC_RAMP effect does not support a duration of
  45.475   *  ::SDL_HAPTIC_INFINITY.
  45.476 - *  
  45.477 + *
  45.478   *  Button triggers may not be supported on all devices, it is advised to not
  45.479   *  use them if possible.  Buttons start at index 1 instead of index 0 like
  45.480   *  they joystick.
  45.481 - *  
  45.482 + *
  45.483   *  If both attack_length and fade_level are 0, the envelope is not used,
  45.484   *  otherwise both values are used.
  45.485 - *  
  45.486 + *
  45.487   *  Common parts:
  45.488   *  \code
  45.489   *  // Replay - All effects have this
  45.490   *  Uint32 length;        // Duration of effect (ms).
  45.491   *  Uint16 delay;         // Delay before starting effect.
  45.492 - *  
  45.493 + *
  45.494   *  // Trigger - All effects have this
  45.495   *  Uint16 button;        // Button that triggers effect.
  45.496   *  Uint16 interval;      // How soon before effect can be triggered again.
  45.497 - *  
  45.498 + *
  45.499   *  // Envelope - All effects except condition effects have this
  45.500   *  Uint16 attack_length; // Duration of the attack (ms).
  45.501   *  Uint16 attack_level;  // Level at the start of the attack.
  45.502 @@ -734,18 +732,18 @@
  45.503      |                     /                 \
  45.504      |                    /                   \
  45.505      |                   /                     \
  45.506 -    |                  /                       \ 
  45.507 +    |                  /                       \
  45.508      | attack_level --> |                        \
  45.509      |                  |                        |  <---  fade_level
  45.510      |
  45.511      +--------------------------------------------------> Time
  45.512                         [--]                 [---]
  45.513                         attack_length        fade_length
  45.514 -    
  45.515 +
  45.516      [------------------][-----------------------]
  45.517      delay               length
  45.518      \endverbatim
  45.519 - *  
  45.520 + *
  45.521   *  Note either the attack_level or the fade_level may be above the actual
  45.522   *  effect level.
  45.523   *
  45.524 @@ -770,17 +768,17 @@
  45.525  /* Function prototypes */
  45.526  /**
  45.527   *  \brief Count the number of joysticks attached to the system.
  45.528 - *  
  45.529 + *
  45.530   *  \return Number of haptic devices detected on the system.
  45.531   */
  45.532  extern DECLSPEC int SDLCALL SDL_NumHaptics(void);
  45.533  
  45.534  /**
  45.535   *  \brief Get the implementation dependent name of a Haptic device.
  45.536 - *  
  45.537 + *
  45.538   *  This can be called before any joysticks are opened.
  45.539   *  If no name can be found, this function returns NULL.
  45.540 - *  
  45.541 + *
  45.542   *  \param device_index Index of the device to get its name.
  45.543   *  \return Name of the device or NULL on error.
  45.544   *
  45.545 @@ -790,8 +788,8 @@
  45.546  
  45.547  /**
  45.548   *  \brief Opens a Haptic device for usage.
  45.549 - *  
  45.550 - *  The index passed as an argument refers to the N'th Haptic device on this 
  45.551 + *
  45.552 + *  The index passed as an argument refers to the N'th Haptic device on this
  45.553   *  system.
  45.554   *
  45.555   *  When opening a haptic device, its gain will be set to maximum and
  45.556 @@ -814,10 +812,10 @@
  45.557  
  45.558  /**
  45.559   *  \brief Checks if the haptic device at index has been opened.
  45.560 - *  
  45.561 + *
  45.562   *  \param device_index Index to check to see if it has been opened.
  45.563   *  \return 1 if it has been opened or 0 if it hasn't.
  45.564 - *  
  45.565 + *
  45.566   *  \sa SDL_HapticOpen
  45.567   *  \sa SDL_HapticIndex
  45.568   */
  45.569 @@ -825,10 +823,10 @@
  45.570  
  45.571  /**
  45.572   *  \brief Gets the index of a haptic device.
  45.573 - *  
  45.574 + *
  45.575   *  \param haptic Haptic device to get the index of.
  45.576   *  \return The index of the haptic device or -1 on error.
  45.577 - *  
  45.578 + *
  45.579   *  \sa SDL_HapticOpen
  45.580   *  \sa SDL_HapticOpened
  45.581   */
  45.582 @@ -836,18 +834,18 @@
  45.583  
  45.584  /**
  45.585   *  \brief Gets whether or not the current mouse has haptic capabilities.
  45.586 - *  
  45.587 + *
  45.588   *  \return SDL_TRUE if the mouse is haptic, SDL_FALSE if it isn't.
  45.589 - *  
  45.590 + *
  45.591   *  \sa SDL_HapticOpenFromMouse
  45.592   */
  45.593  extern DECLSPEC int SDLCALL SDL_MouseIsHaptic(void);
  45.594  
  45.595  /**
  45.596   *  \brief Tries to open a haptic device from the current mouse.
  45.597 - *  
  45.598 + *
  45.599   *  \return The haptic device identifier or NULL on error.
  45.600 - *  
  45.601 + *
  45.602   *  \sa SDL_MouseIsHaptic
  45.603   *  \sa SDL_HapticOpen
  45.604   */
  45.605 @@ -855,29 +853,29 @@
  45.606  
  45.607  /**
  45.608   *  \brief Checks to see if a joystick has haptic features.
  45.609 - *  
  45.610 + *
  45.611   *  \param joystick Joystick to test for haptic capabilities.
  45.612   *  \return 1 if the joystick is haptic, 0 if it isn't
  45.613   *          or -1 if an error ocurred.
  45.614 - *  
  45.615 + *
  45.616   *  \sa SDL_HapticOpenFromJoystick
  45.617   */
  45.618  extern DECLSPEC int SDLCALL SDL_JoystickIsHaptic(SDL_Joystick * joystick);
  45.619  
  45.620  /**
  45.621   *  \brief Opens a Haptic device for usage from a Joystick device.
  45.622 - *  
  45.623 - *  You must still close the haptic device seperately.  It will not be closed 
  45.624 + *
  45.625 + *  You must still close the haptic device seperately.  It will not be closed
  45.626   *  with the joystick.
  45.627 - *  
  45.628 + *
  45.629   *  When opening from a joystick you should first close the haptic device before
  45.630   *  closing the joystick device.  If not, on some implementations the haptic
  45.631   *  device will also get unallocated and you'll be unable to use force feedback
  45.632   *  on that device.
  45.633 - *  
  45.634 + *
  45.635   *  \param joystick Joystick to create a haptic device from.
  45.636   *  \return A valid haptic device identifier on success or NULL on error.
  45.637 - *  
  45.638 + *
  45.639   *  \sa SDL_HapticOpen
  45.640   *  \sa SDL_HapticClose
  45.641   */
  45.642 @@ -886,34 +884,34 @@
  45.643  
  45.644  /**
  45.645   *  \brief Closes a Haptic device previously opened with SDL_HapticOpen().
  45.646 - *  
  45.647 + *
  45.648   *  \param haptic Haptic device to close.
  45.649   */
  45.650  extern DECLSPEC void SDLCALL SDL_HapticClose(SDL_Haptic * haptic);
  45.651  
  45.652  /**
  45.653   *  \brief Returns the number of effects a haptic device can store.
  45.654 - *  
  45.655 + *
  45.656   *  On some platforms this isn't fully supported, and therefore is an
  45.657   *  approximation.  Always check to see if your created effect was actually
  45.658   *  created and do not rely solely on SDL_HapticNumEffects().
  45.659 - *  
  45.660 + *
  45.661   *  \param haptic The haptic device to query effect max.
  45.662   *  \return The number of effects the haptic device can store or
  45.663   *          -1 on error.
  45.664 - *  
  45.665 + *
  45.666   *  \sa SDL_HapticNumEffectsPlaying
  45.667   *  \sa SDL_HapticQuery
  45.668   */
  45.669  extern DECLSPEC int SDLCALL SDL_HapticNumEffects(SDL_Haptic * haptic);
  45.670  
  45.671  /**
  45.672 - *  \brief Returns the number of effects a haptic device can play at the same 
  45.673 + *  \brief Returns the number of effects a haptic device can play at the same
  45.674   *         time.
  45.675 - *  
  45.676 - *  This is not supported on all platforms, but will always return a value.  
  45.677 + *
  45.678 + *  This is not supported on all platforms, but will always return a value.
  45.679   *  Added here for the sake of completeness.
  45.680 - *  
  45.681 + *
  45.682   *  \param haptic The haptic device to query maximum playing effects.
  45.683   *  \return The number of effects the haptic device can play at the same time
  45.684   *          or -1 on error.
  45.685 @@ -925,17 +923,17 @@
  45.686  
  45.687  /**
  45.688   *  \brief Gets the haptic devices supported features in bitwise matter.
  45.689 - *  
  45.690 - *  Example: 
  45.691 + *
  45.692 + *  Example:
  45.693   *  \code
  45.694   *  if (SDL_HapticQueryEffects(haptic) & SDL_HAPTIC_CONSTANT) {
  45.695   *      printf("We have constant haptic effect!");
  45.696   *  }
  45.697   *  \endcode
  45.698 - *  
  45.699 + *
  45.700   *  \param haptic The haptic device to query.
  45.701   *  \return Haptic features in bitwise manner (OR'd).
  45.702 - *  
  45.703 + *
  45.704   *  \sa SDL_HapticNumEffects
  45.705   *  \sa SDL_HapticEffectSupported
  45.706   */
  45.707 @@ -944,18 +942,18 @@
  45.708  
  45.709  /**
  45.710   *  \brief Gets the number of haptic axes the device has.
  45.711 - *  
  45.712 + *
  45.713   *  \sa SDL_HapticDirection
  45.714   */
  45.715  extern DECLSPEC int SDLCALL SDL_HapticNumAxes(SDL_Haptic * haptic);
  45.716  
  45.717  /**
  45.718   *  \brief Checks to see if effect is supported by haptic.
  45.719 - *  
  45.720 + *
  45.721   *  \param haptic Haptic device to check on.
  45.722   *  \param effect Effect to check to see if it is supported.
  45.723   *  \return SDL_TRUE if effect is supported, SDL_FALSE if it isn't or -1 on error.
  45.724 - *  
  45.725 + *
  45.726   *  \sa SDL_HapticQuery
  45.727   *  \sa SDL_HapticNewEffect
  45.728   */
  45.729 @@ -965,11 +963,11 @@
  45.730  
  45.731  /**
  45.732   *  \brief Creates a new haptic effect on the device.
  45.733 - *  
  45.734 + *
  45.735   *  \param haptic Haptic device to create the effect on.
  45.736   *  \param effect Properties of the effect to create.
  45.737   *  \return The id of the effect on success or -1 on error.
  45.738 - *  
  45.739 + *
  45.740   *  \sa SDL_HapticUpdateEffect
  45.741   *  \sa SDL_HapticRunEffect
  45.742   *  \sa SDL_HapticDestroyEffect
  45.743 @@ -979,17 +977,17 @@
  45.744  
  45.745  /**
  45.746   *  \brief Updates the properties of an effect.
  45.747 - *  
  45.748 + *
  45.749   *  Can be used dynamically, although behaviour when dynamically changing
  45.750   *  direction may be strange.  Specifically the effect may reupload itself
  45.751   *  and start playing from the start.  You cannot change the type either when
  45.752   *  running SDL_HapticUpdateEffect().
  45.753 - *  
  45.754 + *
  45.755   *  \param haptic Haptic device that has the effect.
  45.756   *  \param effect Effect to update.
  45.757   *  \param data New effect properties to use.
  45.758   *  \return The id of the effect on success or -1 on error.
  45.759 - *  
  45.760 + *
  45.761   *  \sa SDL_HapticNewEffect
  45.762   *  \sa SDL_HapticRunEffect
  45.763   *  \sa SDL_HapticDestroyEffect
  45.764 @@ -1000,18 +998,18 @@
  45.765  
  45.766  /**
  45.767   *  \brief Runs the haptic effect on its associated haptic device.
  45.768 - *  
  45.769 + *
  45.770   *  If iterations are ::SDL_HAPTIC_INFINITY, it'll run the effect over and over
  45.771   *  repeating the envelope (attack and fade) every time.  If you only want the
  45.772   *  effect to last forever, set ::SDL_HAPTIC_INFINITY in the effect's length
  45.773   *  parameter.
  45.774 - *  
  45.775 + *
  45.776   *  \param haptic Haptic device to run the effect on.
  45.777   *  \param effect Identifier of the haptic effect to run.
  45.778   *  \param iterations Number of iterations to run the effect. Use
  45.779   *         ::SDL_HAPTIC_INFINITY for infinity.
  45.780   *  \return 0 on success or -1 on error.
  45.781 - *  
  45.782 + *
  45.783   *  \sa SDL_HapticStopEffect
  45.784   *  \sa SDL_HapticDestroyEffect
  45.785   *  \sa SDL_HapticGetEffectStatus
  45.786 @@ -1022,11 +1020,11 @@
  45.787  
  45.788  /**
  45.789   *  \brief Stops the haptic effect on its associated haptic device.
  45.790 - *  
  45.791 + *
  45.792   *  \param haptic Haptic device to stop the effect on.
  45.793   *  \param effect Identifier of the effect to stop.
  45.794   *  \return 0 on success or -1 on error.
  45.795 - *  
  45.796 + *
  45.797   *  \sa SDL_HapticRunEffect
  45.798   *  \sa SDL_HapticDestroyEffect
  45.799   */
  45.800 @@ -1035,13 +1033,13 @@
  45.801  
  45.802  /**
  45.803   *  \brief Destroys a haptic effect on the device.
  45.804 - *  
  45.805 - *  This will stop the effect if it's running.  Effects are automatically 
  45.806 + *
  45.807 + *  This will stop the effect if it's running.  Effects are automatically
  45.808   *  destroyed when the device is closed.
  45.809 - *  
  45.810 + *
  45.811   *  \param haptic Device to destroy the effect on.
  45.812   *  \param effect Identifier of the effect to destroy.
  45.813 - *  
  45.814 + *
  45.815   *  \sa SDL_HapticNewEffect
  45.816   */
  45.817  extern DECLSPEC void SDLCALL SDL_HapticDestroyEffect(SDL_Haptic * haptic,
  45.818 @@ -1049,14 +1047,14 @@
  45.819  
  45.820  /**
  45.821   *  \brief Gets the status of the current effect on the haptic device.
  45.822 - *  
  45.823 + *
  45.824   *  Device must support the ::SDL_HAPTIC_STATUS feature.
  45.825 - *  
  45.826 + *
  45.827   *  \param haptic Haptic device to query the effect status on.
  45.828   *  \param effect Identifier of the effect to query its status.
  45.829   *  \return 0 if it isn't playing, ::SDL_HAPTIC_PLAYING if it is playing
  45.830   *          or -1 on error.
  45.831 - *  
  45.832 + *
  45.833   *  \sa SDL_HapticRunEffect
  45.834   *  \sa SDL_HapticStopEffect
  45.835   */
  45.836 @@ -1065,26 +1063,26 @@
  45.837  
  45.838  /**
  45.839   *  \brief Sets the global gain of the device.
  45.840 - *  
  45.841 + *
  45.842   *  Device must support the ::SDL_HAPTIC_GAIN feature.
  45.843 - *  
  45.844 + *
  45.845   *  The user may specify the maximum gain by setting the environment variable
  45.846   *  ::SDL_HAPTIC_GAIN_MAX which should be between 0 and 100.  All calls to
  45.847   *  SDL_HapticSetGain() will scale linearly using ::SDL_HAPTIC_GAIN_MAX as the
  45.848   *  maximum.
  45.849 - *  
  45.850 + *
  45.851   *  \param haptic Haptic device to set the gain on.
  45.852   *  \param gain Value to set the gain to, should be between 0 and 100.
  45.853   *  \return 0 on success or -1 on error.
  45.854 - *  
  45.855 + *
  45.856   *  \sa SDL_HapticQuery
  45.857   */
  45.858  extern DECLSPEC int SDLCALL SDL_HapticSetGain(SDL_Haptic * haptic, int gain);
  45.859  
  45.860  /**
  45.861   *  \brief Sets the global autocenter of the device.
  45.862 - *  
  45.863 - *  Autocenter should be between 0 and 100.  Setting it to 0 will disable 
  45.864 + *
  45.865 + *  Autocenter should be between 0 and 100.  Setting it to 0 will disable
  45.866   *  autocentering.
  45.867   *
  45.868   *  Device must support the ::SDL_HAPTIC_AUTOCENTER feature.
  45.869 @@ -1092,7 +1090,7 @@
  45.870   *  \param haptic Haptic device to set autocentering on.
  45.871   *  \param autocenter Value to set autocenter to, 0 disables autocentering.
  45.872   *  \return 0 on success or -1 on error.
  45.873 - *  
  45.874 + *
  45.875   *  \sa SDL_HapticQuery
  45.876   */
  45.877  extern DECLSPEC int SDLCALL SDL_HapticSetAutocenter(SDL_Haptic * haptic,
  45.878 @@ -1100,35 +1098,35 @@
  45.879  
  45.880  /**
  45.881   *  \brief Pauses a haptic device.
  45.882 - *  
  45.883 - *  Device must support the ::SDL_HAPTIC_PAUSE feature.  Call 
  45.884 + *
  45.885 + *  Device must support the ::SDL_HAPTIC_PAUSE feature.  Call
  45.886   *  SDL_HapticUnpause() to resume playback.
  45.887 - *  
  45.888 + *
  45.889   *  Do not modify the effects nor add new ones while the device is paused.
  45.890   *  That can cause all sorts of weird errors.
  45.891 - *  
  45.892 + *
  45.893   *  \param haptic Haptic device to pause.
  45.894   *  \return 0 on success or -1 on error.
  45.895 - *  
  45.896 + *
  45.897   *  \sa SDL_HapticUnpause
  45.898   */
  45.899  extern DECLSPEC int SDLCALL SDL_HapticPause(SDL_Haptic * haptic);
  45.900  
  45.901  /**
  45.902   *  \brief Unpauses a haptic device.
  45.903 - *  
  45.904 + *
  45.905   *  Call to unpause after SDL_HapticPause().
  45.906 - *  
  45.907 + *
  45.908   *  \param haptic Haptic device to pause.
  45.909   *  \return 0 on success or -1 on error.
  45.910 - *  
  45.911 + *
  45.912   *  \sa SDL_HapticPause
  45.913   */
  45.914  extern DECLSPEC int SDLCALL SDL_HapticUnpause(SDL_Haptic * haptic);
  45.915  
  45.916  /**
  45.917   *  \brief Stops all the currently playing effects on a haptic device.
  45.918 - *  
  45.919 + *
  45.920   *  \param haptic Haptic device to stop.
  45.921   *  \return 0 on success or -1 on error.
  45.922   */
  45.923 @@ -1189,9 +1187,7 @@
  45.924  
  45.925  /* Ends C function definitions when using C++ */
  45.926  #ifdef __cplusplus
  45.927 -/* *INDENT-OFF* */
  45.928  }
  45.929 -/* *INDENT-ON* */
  45.930  #endif
  45.931  #include "close_code.h"
  45.932  
    46.1 --- a/include/SDL_hints.h	Sat May 18 12:48:50 2013 -0700
    46.2 +++ b/include/SDL_hints.h	Sat May 18 14:17:52 2013 -0700
    46.3 @@ -21,7 +21,7 @@
    46.4  
    46.5  /**
    46.6   *  \file SDL_hints.h
    46.7 - *  
    46.8 + *
    46.9   *  Official documentation for SDL configuration variables
   46.10   *
   46.11   *  This file contains functions to set and get configuration hints,
   46.12 @@ -44,13 +44,11 @@
   46.13  #include "begin_code.h"
   46.14  /* Set up for C function definitions, even when using C++ */
   46.15  #ifdef __cplusplus
   46.16 -/* *INDENT-OFF* */
   46.17  extern "C" {
   46.18 -/* *INDENT-ON* */
   46.19  #endif
   46.20  
   46.21  /**
   46.22 - *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL 1.2 screen surface. 
   46.23 + *  \brief  A variable controlling how 3D acceleration is used to accelerate the SDL 1.2 screen surface.
   46.24   *
   46.25   *  SDL can try to accelerate the SDL 1.2 screen surface by using streaming
   46.26   *  textures with a 3D rendering engine.  This variable controls whether and
   46.27 @@ -169,7 +167,7 @@
   46.28   */
   46.29  #define SDL_HINT_VIDEO_MINIMIZE_ON_FOCUS_LOSS   "SDL_VIDEO_MINIMIZE_ON_FOCUS_LOSS"
   46.30  
   46.31 -	
   46.32 +
   46.33  /**
   46.34   *  \brief  A variable controlling whether the idle timer is disabled on iOS.
   46.35   *
   46.36 @@ -183,7 +181,7 @@
   46.37   *    "1"       - Disable idle timer
   46.38   */
   46.39  #define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED"
   46.40 -	
   46.41 +
   46.42  /**
   46.43   *  \brief  A variable controlling which orientations are allowed on iOS.
   46.44   *
   46.45 @@ -208,7 +206,7 @@
   46.46  
   46.47  /**
   46.48   *  \brief  A variable that lets you manually hint extra gamecontroller db entries
   46.49 - *  
   46.50 + *
   46.51   *  The variable should be newline delimited rows of gamecontroller config data, see SDL_gamecontroller.h
   46.52   *
   46.53   *  This hint must be set before calling SDL_Init(SDL_INIT_GAMECONTROLLER)
   46.54 @@ -219,7 +217,7 @@
   46.55  
   46.56  /**
   46.57   *  \brief If set to 0 then never set the top most bit on a SDL Window, even if the video mode expects it.
   46.58 - *		This is a debugging aid for developers and not expected to be used by end users. The default is "1"
   46.59 + *      This is a debugging aid for developers and not expected to be used by end users. The default is "1"
   46.60   *
   46.61   *  This variable can be set to the following values:
   46.62   *    "0"       - don't allow topmost
   46.63 @@ -246,7 +244,7 @@
   46.64   *  The priority controls the behavior when setting a hint that already
   46.65   *  has a value.  Hints will replace existing hints of their priority and
   46.66   *  lower.  Environment variables are considered to have override priority.
   46.67 - * 
   46.68 + *
   46.69   *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
   46.70   */
   46.71  extern DECLSPEC SDL_bool SDLCALL SDL_SetHintWithPriority(const char *name,
   46.72 @@ -255,7 +253,7 @@
   46.73  
   46.74  /**
   46.75   *  \brief Set a hint with normal priority
   46.76 - * 
   46.77 + *
   46.78   *  \return SDL_TRUE if the hint was set, SDL_FALSE otherwise
   46.79   */
   46.80  extern DECLSPEC SDL_bool SDLCALL SDL_SetHint(const char *name,
   46.81 @@ -264,7 +262,7 @@
   46.82  
   46.83  /**
   46.84   *  \brief Get a hint
   46.85 - *  
   46.86 + *
   46.87   *  \return The string value of a hint variable.
   46.88   */
   46.89  extern DECLSPEC const char * SDLCALL SDL_GetHint(const char *name);
   46.90 @@ -279,9 +277,7 @@
   46.91  
   46.92  /* Ends C function definitions when using C++ */
   46.93  #ifdef __cplusplus
   46.94 -/* *INDENT-OFF* */
   46.95  }
   46.96 -/* *INDENT-ON* */
   46.97  #endif
   46.98  #include "close_code.h"
   46.99  
    47.1 --- a/include/SDL_joystick.h	Sat May 18 12:48:50 2013 -0700
    47.2 +++ b/include/SDL_joystick.h	Sat May 18 14:17:52 2013 -0700
    47.3 @@ -21,7 +21,7 @@
    47.4  
    47.5  /**
    47.6   *  \file SDL_joystick.h
    47.7 - *  
    47.8 + *
    47.9   *  Include file for SDL joystick event handling
   47.10   *
   47.11   * The term "device_index" identifies currently plugged in joystick devices between 0 and SDL_NumJoysticks, with the exact joystick
   47.12 @@ -30,7 +30,7 @@
   47.13   * The term "instance_id" is the current instantiation of a joystick device in the system, if the joystick is removed and then re-inserted
   47.14   *   then it will get a new instance_id, instance_id's are monotonically increasing identifiers of a joystick plugged in.
   47.15   *
   47.16 - * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of 
   47.17 + * The term JoystickGUID is a stable 128-bit identifier for a joystick device that does not change over time, it identifies class of
   47.18   *   the device (a X360 wired controller for example). This identifier is platform dependent.
   47.19   *
   47.20   *
   47.21 @@ -45,9 +45,7 @@
   47.22  #include "begin_code.h"
   47.23  /* Set up for C function definitions, even when using C++ */
   47.24  #ifdef __cplusplus
   47.25 -/* *INDENT-OFF* */
   47.26  extern "C" {
   47.27 -/* *INDENT-ON* */
   47.28  #endif
   47.29  
   47.30  /**
   47.31 @@ -64,7 +62,7 @@
   47.32  
   47.33  /* A structure that encodes the stable unique id for a joystick device */
   47.34  typedef struct {
   47.35 -	Uint8 data[16];
   47.36 +    Uint8 data[16];
   47.37  } SDL_JoystickGUID;
   47.38  
   47.39  typedef Sint32 SDL_JoystickID;
   47.40 @@ -84,11 +82,11 @@
   47.41  extern DECLSPEC const char *SDLCALL SDL_JoystickNameForIndex(int device_index);
   47.42  
   47.43  /**
   47.44 - *  Open a joystick for use.  
   47.45 - *  The index passed as an argument refers tothe N'th joystick on the system.  
   47.46 + *  Open a joystick for use.
   47.47 + *  The index passed as an argument refers tothe N'th joystick on the system.
   47.48   *  This index is the value which will identify this joystick in future joystick
   47.49   *  events.
   47.50 - *  
   47.51 + *
   47.52   *  \return A joystick identifier, or NULL if an error occurred.
   47.53   */
   47.54  extern DECLSPEC SDL_Joystick *SDLCALL SDL_JoystickOpen(int device_index);
   47.55 @@ -98,7 +96,7 @@
   47.56   *  If no name can be found, this function returns NULL.
   47.57   */
   47.58  extern DECLSPEC const char *SDLCALL SDL_JoystickName(SDL_Joystick * joystick);
   47.59 -	
   47.60 +
   47.61  /**
   47.62   *  Return the GUID for the joystick at this index
   47.63   */
   47.64 @@ -137,7 +135,7 @@
   47.65  
   47.66  /**
   47.67   *  Get the number of trackballs on a joystick.
   47.68 - *  
   47.69 + *
   47.70   *  Joystick trackballs have only relative motion events associated
   47.71   *  with them and their state cannot be polled.
   47.72   */
   47.73 @@ -155,7 +153,7 @@
   47.74  
   47.75  /**
   47.76   *  Update the current state of the open joysticks.
   47.77 - *  
   47.78 + *
   47.79   *  This is called automatically by the event loop if any joystick
   47.80   *  events are enabled.
   47.81   */
   47.82 @@ -163,20 +161,20 @@
   47.83  
   47.84  /**
   47.85   *  Enable/disable joystick event polling.
   47.86 - *  
   47.87 + *
   47.88   *  If joystick events are disabled, you must call SDL_JoystickUpdate()
   47.89   *  yourself and check the state of the joystick when you want joystick
   47.90   *  information.
   47.91 - *  
   47.92 + *
   47.93   *  The state can be one of ::SDL_QUERY, ::SDL_ENABLE or ::SDL_IGNORE.
   47.94   */
   47.95  extern DECLSPEC int SDLCALL SDL_JoystickEventState(int state);
   47.96  
   47.97  /**
   47.98   *  Get the current state of an axis control on a joystick.
   47.99 - *  
  47.100 + *
  47.101   *  The state is a value ranging from -32768 to 32767.
  47.102 - *  
  47.103 + *
  47.104   *  The axis indices start at index 0.
  47.105   */
  47.106  extern DECLSPEC Sint16 SDLCALL SDL_JoystickGetAxis(SDL_Joystick * joystick,
  47.107 @@ -186,22 +184,22 @@
  47.108   *  \name Hat positions
  47.109   */
  47.110  /*@{*/
  47.111 -#define SDL_HAT_CENTERED	0x00
  47.112 -#define SDL_HAT_UP		0x01
  47.113 -#define SDL_HAT_RIGHT		0x02
  47.114 -#define SDL_HAT_DOWN		0x04
  47.115 -#define SDL_HAT_LEFT		0x08
  47.116 -#define SDL_HAT_RIGHTUP		(SDL_HAT_RIGHT|SDL_HAT_UP)
  47.117 -#define SDL_HAT_RIGHTDOWN	(SDL_HAT_RIGHT|SDL_HAT_DOWN)
  47.118 -#define SDL_HAT_LEFTUP		(SDL_HAT_LEFT|SDL_HAT_UP)
  47.119 -#define SDL_HAT_LEFTDOWN	(SDL_HAT_LEFT|SDL_HAT_DOWN)
  47.120 +#define SDL_HAT_CENTERED    0x00
  47.121 +#define SDL_HAT_UP      0x01
  47.122 +#define SDL_HAT_RIGHT       0x02
  47.123 +#define SDL_HAT_DOWN        0x04
  47.124 +#define SDL_HAT_LEFT        0x08
  47.125 +#define SDL_HAT_RIGHTUP     (SDL_HAT_RIGHT|SDL_HAT_UP)
  47.126 +#define SDL_HAT_RIGHTDOWN   (SDL_HAT_RIGHT|SDL_HAT_DOWN)
  47.127 +#define SDL_HAT_LEFTUP      (SDL_HAT_LEFT|SDL_HAT_UP)
  47.128 +#define SDL_HAT_LEFTDOWN    (SDL_HAT_LEFT|SDL_HAT_DOWN)
  47.129  /*@}*/
  47.130  
  47.131  /**
  47.132   *  Get the current state of a POV hat on a joystick.
  47.133   *
  47.134   *  The hat indices start at index 0.
  47.135 - *  
  47.136 + *
  47.137   *  \return The return value is one of the following positions:
  47.138   *           - ::SDL_HAT_CENTERED
  47.139   *           - ::SDL_HAT_UP
  47.140 @@ -218,9 +216,9 @@
  47.141  
  47.142  /**
  47.143   *  Get the ball axis change since the last poll.
  47.144 - *  
  47.145 + *
  47.146   *  \return 0, or -1 if you passed it invalid parameters.
  47.147 - *  
  47.148 + *
  47.149   *  The ball indices start at index 0.
  47.150   */
  47.151  extern DECLSPEC int SDLCALL SDL_JoystickGetBall(SDL_Joystick * joystick,
  47.152 @@ -228,7 +226,7 @@
  47.153  
  47.154  /**
  47.155   *  Get the current state of a button on a joystick.
  47.156 - *  
  47.157 + *
  47.158   *  The button indices start at index 0.
  47.159   */
  47.160  extern DECLSPEC Uint8 SDLCALL SDL_JoystickGetButton(SDL_Joystick * joystick,
  47.161 @@ -242,9 +240,7 @@
  47.162  
  47.163  /* Ends C function definitions when using C++ */
  47.164  #ifdef __cplusplus
  47.165 -/* *INDENT-OFF* */
  47.166  }
  47.167 -/* *INDENT-ON* */
  47.168  #endif
  47.169  #include "close_code.h"
  47.170  
    48.1 --- a/include/SDL_keyboard.h	Sat May 18 12:48:50 2013 -0700
    48.2 +++ b/include/SDL_keyboard.h	Sat May 18 14:17:52 2013 -0700
    48.3 @@ -21,7 +21,7 @@
    48.4  
    48.5  /**
    48.6   *  \file SDL_keyboard.h
    48.7 - *  
    48.8 + *
    48.9   *  Include file for SDL keyboard event handling
   48.10   */
   48.11  
   48.12 @@ -36,9 +36,7 @@
   48.13  #include "begin_code.h"
   48.14  /* Set up for C function definitions, even when using C++ */
   48.15  #ifdef __cplusplus
   48.16 -/* *INDENT-OFF* */
   48.17  extern "C" {
   48.18 -/* *INDENT-ON* */
   48.19  #endif
   48.20  
   48.21  /**
   48.22 @@ -61,11 +59,11 @@
   48.23  
   48.24  /**
   48.25   *  \brief Get a snapshot of the current state of the keyboard.
   48.26 - *  
   48.27 + *
   48.28   *  \param numkeys if non-NULL, receives the length of the returned array.
   48.29 - *  
   48.30 + *
   48.31   *  \return An array of key states. Indexes into this array are obtained by using ::SDL_Scancode values.
   48.32 - *  
   48.33 + *
   48.34   *  \b Example:
   48.35   *  \code
   48.36   *  Uint8 *state = SDL_GetKeyboardState(NULL);
   48.37 @@ -83,7 +81,7 @@
   48.38  
   48.39  /**
   48.40   *  \brief Set the current key modifier state for the keyboard.
   48.41 - *  
   48.42 + *
   48.43   *  \note This does not change the keyboard state, only the key modifier flags.
   48.44   */
   48.45  extern DECLSPEC void SDLCALL SDL_SetModState(SDL_Keymod modstate);
   48.46 @@ -91,9 +89,9 @@
   48.47  /**
   48.48   *  \brief Get the key code corresponding to the given scancode according
   48.49   *         to the current keyboard layout.
   48.50 - *  
   48.51 + *
   48.52   *  See ::SDL_Keycode for details.
   48.53 - *  
   48.54 + *
   48.55   *  \sa SDL_GetKeyName()
   48.56   */
   48.57  extern DECLSPEC SDL_Keycode SDLCALL SDL_GetKeyFromScancode(SDL_Scancode scancode);
   48.58 @@ -101,16 +99,16 @@
   48.59  /**
   48.60   *  \brief Get the scancode corresponding to the given key code according to the
   48.61   *         current keyboard layout.
   48.62 - *  
   48.63 + *
   48.64   *  See ::SDL_Scancode for details.
   48.65 - *  
   48.66 + *
   48.67   *  \sa SDL_GetScancodeName()
   48.68   */
   48.69  extern DECLSPEC SDL_Scancode SDLCALL SDL_GetScancodeFromKey(SDL_Keycode key);
   48.70  
   48.71  /**
   48.72   *  \brief Get a human-readable name for a scancode.
   48.73 - *  
   48.74 + *
   48.75   *  \return A pointer to the name for the scancode.
   48.76   *          If the scancode doesn't have a name, this function returns
   48.77   *          an empty string ("").
   48.78 @@ -121,7 +119,7 @@
   48.79  
   48.80  /**
   48.81   *  \brief Get a scancode from a human-readable name
   48.82 - *  
   48.83 + *
   48.84   *  \return scancode, or SDL_SCANCODE_UNKNOWN if the name wasn't recognized
   48.85   *
   48.86   *  \sa SDL_Scancode
   48.87 @@ -130,19 +128,19 @@
   48.88  
   48.89  /**
   48.90   *  \brief Get a human-readable name for a key.
   48.91 - *  
   48.92 + *
   48.93   *  \return A pointer to a UTF-8 string that stays valid at least until the next
   48.94 - *          call to this function. If you need it around any longer, you must 
   48.95 - *          copy it.  If the key doesn't have a name, this function returns an 
   48.96 + *          call to this function. If you need it around any longer, you must
   48.97 + *          copy it.  If the key doesn't have a name, this function returns an
   48.98   *          empty string ("").
   48.99 - *  
  48.100 + *
  48.101   *  \sa SDL_Key
  48.102   */
  48.103  extern DECLSPEC const char *SDLCALL SDL_GetKeyName(SDL_Keycode key);
  48.104  
  48.105  /**
  48.106   *  \brief Get a key code from a human-readable name
  48.107 - *  
  48.108 + *
  48.109   *  \return key code, or SDLK_UNKNOWN if the name wasn't recognized
  48.110   *
  48.111   *  \sa SDL_Keycode
  48.112 @@ -152,7 +150,7 @@
  48.113  /**
  48.114   *  \brief Start accepting Unicode text input events.
  48.115   *         This function will show the on-screen keyboard if supported.
  48.116 - *  
  48.117 + *
  48.118   *  \sa SDL_StopTextInput()
  48.119   *  \sa SDL_SetTextInputRect()
  48.120   *  \sa SDL_HasScreenKeyboardSupport()
  48.121 @@ -170,7 +168,7 @@
  48.122  /**
  48.123   *  \brief Stop receiving any text input events.
  48.124   *         This function will hide the on-screen keyboard if supported.
  48.125 - *  
  48.126 + *
  48.127   *  \sa SDL_StartTextInput()
  48.128   *  \sa SDL_HasScreenKeyboardSupport()
  48.129   */
  48.130 @@ -179,38 +177,36 @@
  48.131  /**
  48.132   *  \brief Set the rectangle used to type Unicode text inputs.
  48.133   *         This is used as a hint for IME and on-screen keyboard placement.
  48.134 - *  
  48.135 + *
  48.136   *  \sa SDL_StartTextInput()
  48.137   */
  48.138  extern DECLSPEC void SDLCALL SDL_SetTextInputRect(SDL_Rect *rect);
  48.139  
  48.140  /**
  48.141   *  \brief Returns whether the platform has some screen keyboard support.
  48.142 - *  
  48.143 + *
  48.144   *  \return SDL_TRUE if some keyboard support is available else SDL_FALSE.
  48.145 - *  
  48.146 + *
  48.147   *  \note Not all screen keyboard functions are supported on all platforms.
  48.148 - *  
  48.149 + *
  48.150   *  \sa SDL_IsScreenKeyboardShown()
  48.151   */
  48.152  extern DECLSPEC SDL_bool SDLCALL SDL_HasScreenKeyboardSupport(void);
  48.153  
  48.154  /**
  48.155   *  \brief Returns whether the screen keyboard is shown for given window.
  48.156 - *  
  48.157 + *
  48.158   *  \param window The window for which screen keyboard should be queried.
  48.159 - *  
  48.160 + *
  48.161   *  \return SDL_TRUE if screen keyboard is shown else SDL_FALSE.
  48.162 - *  
  48.163 + *
  48.164   *  \sa SDL_HasScreenKeyboardSupport()
  48.165   */
  48.166  extern DECLSPEC SDL_bool SDLCALL SDL_IsScreenKeyboardShown(SDL_Window *window);
  48.167  
  48.168  /* Ends C function definitions when using C++ */
  48.169  #ifdef __cplusplus
  48.170 -/* *INDENT-OFF* */
  48.171  }
  48.172 -/* *INDENT-ON* */
  48.173  #endif
  48.174  #include "close_code.h"
  48.175  
    49.1 --- a/include/SDL_keycode.h	Sat May 18 12:48:50 2013 -0700
    49.2 +++ b/include/SDL_keycode.h	Sat May 18 14:17:52 2013 -0700
    49.3 @@ -21,7 +21,7 @@
    49.4  
    49.5  /**
    49.6   *  \file SDL_keycode.h
    49.7 - *  
    49.8 + *
    49.9   *  Defines constants which identify keyboard keys and modifiers.
   49.10   */
   49.11  
   49.12 @@ -33,7 +33,7 @@
   49.13  
   49.14  /**
   49.15   *  \brief The SDL virtual key representation.
   49.16 - *  
   49.17 + *
   49.18   *  Values of this type are used to represent keyboard keys using the current
   49.19   *  layout of the keyboard.  These values include Unicode values representing
   49.20   *  the unmodified character that would be generated by pressing the key, or
   49.21 @@ -42,7 +42,7 @@
   49.22  typedef Sint32 SDL_Keycode;
   49.23  
   49.24  #define SDLK_SCANCODE_MASK (1<<30)
   49.25 -#define SDL_SCANCODE_TO_KEYCODE(X)	(X | SDLK_SCANCODE_MASK)
   49.26 +#define SDL_SCANCODE_TO_KEYCODE(X)  (X | SDLK_SCANCODE_MASK)
   49.27  
   49.28  enum
   49.29  {
   49.30 @@ -85,7 +85,7 @@
   49.31      SDLK_GREATER = '>',
   49.32      SDLK_QUESTION = '?',
   49.33      SDLK_AT = '@',
   49.34 -    /* 
   49.35 +    /*
   49.36         Skip uppercase letters
   49.37       */
   49.38      SDLK_LEFTBRACKET = '[',
   49.39 @@ -331,10 +331,10 @@
   49.40      KMOD_RESERVED = 0x8000
   49.41  } SDL_Keymod;
   49.42  
   49.43 -#define KMOD_CTRL	(KMOD_LCTRL|KMOD_RCTRL)
   49.44 -#define KMOD_SHIFT	(KMOD_LSHIFT|KMOD_RSHIFT)
   49.45 -#define KMOD_ALT	(KMOD_LALT|KMOD_RALT)
   49.46 -#define KMOD_GUI	(KMOD_LGUI|KMOD_RGUI)
   49.47 +#define KMOD_CTRL   (KMOD_LCTRL|KMOD_RCTRL)
   49.48 +#define KMOD_SHIFT  (KMOD_LSHIFT|KMOD_RSHIFT)
   49.49 +#define KMOD_ALT    (KMOD_LALT|KMOD_RALT)
   49.50 +#define KMOD_GUI    (KMOD_LGUI|KMOD_RGUI)
   49.51  
   49.52  #endif /* _SDL_keycode_h */
   49.53  
    50.1 --- a/include/SDL_loadso.h	Sat May 18 12:48:50 2013 -0700
    50.2 +++ b/include/SDL_loadso.h	Sat May 18 14:17:52 2013 -0700
    50.3 @@ -24,7 +24,7 @@
    50.4   *
    50.5   *  System dependent library loading routines
    50.6   *
    50.7 - *  Some things to keep in mind:                                        
    50.8 + *  Some things to keep in mind:
    50.9   *  \li These functions only work on C function names.  Other languages may
   50.10   *      have name mangling and intrinsic language support that varies from
   50.11   *      compiler to compiler.
   50.12 @@ -47,9 +47,7 @@
   50.13  #include "begin_code.h"
   50.14  /* Set up for C function definitions, even when using C++ */
   50.15  #ifdef __cplusplus
   50.16 -/* *INDENT-OFF* */
   50.17  extern "C" {
   50.18 -/* *INDENT-ON* */
   50.19  #endif
   50.20  
   50.21  /**
   50.22 @@ -74,9 +72,7 @@
   50.23  
   50.24  /* Ends C function definitions when using C++ */
   50.25  #ifdef __cplusplus
   50.26 -/* *INDENT-OFF* */
   50.27  }
   50.28 -/* *INDENT-ON* */
   50.29  #endif
   50.30  #include "close_code.h"
   50.31  
    51.1 --- a/include/SDL_log.h	Sat May 18 12:48:50 2013 -0700
    51.2 +++ b/include/SDL_log.h	Sat May 18 14:17:52 2013 -0700
    51.3 @@ -21,7 +21,7 @@
    51.4  
    51.5  /**
    51.6   *  \file SDL_log.h
    51.7 - *  
    51.8 + *
    51.9   *  Simple log messages with categories and priorities.
   51.10   *
   51.11   *  By default logs are quiet, but if you're debugging SDL you might want:
   51.12 @@ -42,9 +42,7 @@
   51.13  #include "begin_code.h"
   51.14  /* Set up for C function definitions, even when using C++ */
   51.15  #ifdef __cplusplus
   51.16 -/* *INDENT-OFF* */
   51.17  extern "C" {
   51.18 -/* *INDENT-ON* */
   51.19  #endif
   51.20  
   51.21  
   51.22 @@ -60,7 +58,7 @@
   51.23   *
   51.24   *  By default the application category is enabled at the INFO level,
   51.25   *  the assert category is enabled at the WARN level, test is enabled
   51.26 - *  at the VERBOSE level and all other categories are enabled at the 
   51.27 + *  at the VERBOSE level and all other categories are enabled at the
   51.28   *  CRITICAL level.
   51.29   */
   51.30  enum
   51.31 @@ -204,9 +202,7 @@
   51.32  
   51.33  /* Ends C function definitions when using C++ */
   51.34  #ifdef __cplusplus
   51.35 -/* *INDENT-OFF* */
   51.36  }
   51.37 -/* *INDENT-ON* */
   51.38  #endif
   51.39  #include "close_code.h"
   51.40  
    52.1 --- a/include/SDL_main.h	Sat May 18 12:48:50 2013 -0700
    52.2 +++ b/include/SDL_main.h	Sat May 18 14:17:52 2013 -0700
    52.3 @@ -26,7 +26,7 @@
    52.4  
    52.5  /**
    52.6   *  \file SDL_main.h
    52.7 - *  
    52.8 + *
    52.9   *  Redefine main() on some platforms so that it is called by SDL.
   52.10   */
   52.11  
   52.12 @@ -37,7 +37,7 @@
   52.13  #endif
   52.14  
   52.15  #ifdef __cplusplus
   52.16 -#define C_LINKAGE	"C"
   52.17 +#define C_LINKAGE   "C"
   52.18  #else
   52.19  #define C_LINKAGE
   52.20  #endif /* __cplusplus */
   52.21 @@ -58,7 +58,7 @@
   52.22   */
   52.23  
   52.24  #ifdef SDL_MAIN_NEEDED
   52.25 -#define main	SDL_main
   52.26 +#define main    SDL_main
   52.27  #endif
   52.28  
   52.29  /**
   52.30 @@ -69,9 +69,7 @@
   52.31  
   52.32  #include "begin_code.h"
   52.33  #ifdef __cplusplus
   52.34 -/* *INDENT-OFF* */
   52.35  extern "C" {
   52.36 -/* *INDENT-ON* */
   52.37  #endif
   52.38  
   52.39  #ifdef __WIN32__
   52.40 @@ -87,9 +85,7 @@
   52.41  
   52.42  
   52.43  #ifdef __cplusplus
   52.44 -/* *INDENT-OFF* */
   52.45  }
   52.46 -/* *INDENT-ON* */
   52.47  #endif
   52.48  #include "close_code.h"
   52.49  
    53.1 --- a/include/SDL_messagebox.h	Sat May 18 12:48:50 2013 -0700
    53.2 +++ b/include/SDL_messagebox.h	Sat May 18 14:17:52 2013 -0700
    53.3 @@ -28,9 +28,7 @@
    53.4  #include "begin_code.h"
    53.5  /* Set up for C function definitions, even when using C++ */
    53.6  #ifdef __cplusplus
    53.7 -/* *INDENT-OFF* */
    53.8  extern "C" {
    53.9 -/* *INDENT-ON* */
   53.10  #endif
   53.11  
   53.12  /**
   53.13 @@ -137,9 +135,7 @@
   53.14  
   53.15  /* Ends C function definitions when using C++ */
   53.16  #ifdef __cplusplus
   53.17 -/* *INDENT-OFF* */
   53.18  }
   53.19 -/* *INDENT-ON* */
   53.20  #endif
   53.21  #include "close_code.h"
   53.22  
    54.1 --- a/include/SDL_mouse.h	Sat May 18 12:48:50 2013 -0700
    54.2 +++ b/include/SDL_mouse.h	Sat May 18 14:17:52 2013 -0700
    54.3 @@ -21,7 +21,7 @@
    54.4  
    54.5  /**
    54.6   *  \file SDL_mouse.h
    54.7 - *  
    54.8 + *
    54.9   *  Include file for SDL mouse event handling.
   54.10   */
   54.11  
   54.12 @@ -35,9 +35,7 @@
   54.13  #include "begin_code.h"
   54.14  /* Set up for C function definitions, even when using C++ */
   54.15  #ifdef __cplusplus
   54.16 -/* *INDENT-OFF* */
   54.17  extern "C" {
   54.18 -/* *INDENT-ON* */
   54.19  #endif
   54.20  
   54.21  typedef struct SDL_Cursor SDL_Cursor;   /* Implementation dependent */
   54.22 @@ -71,7 +69,7 @@
   54.23  
   54.24  /**
   54.25   *  \brief Retrieve the current state of the mouse.
   54.26 - *  
   54.27 + *
   54.28   *  The current button state is returned as a button bitmask, which can
   54.29   *  be tested using the SDL_BUTTON(X) macros, and x and y are set to the
   54.30   *  mouse cursor position relative to the focus window for the currently
   54.31 @@ -90,11 +88,11 @@
   54.32  
   54.33  /**
   54.34   *  \brief Moves the mouse to the given position within the window.
   54.35 - *  
   54.36 + *
   54.37   *  \param window The window to move the mouse into, or NULL for the current mouse focus
   54.38   *  \param x The x coordinate within the window
   54.39   *  \param y The y coordinate within the window
   54.40 - *  
   54.41 + *
   54.42   *  \note This function generates a mouse motion event
   54.43   */
   54.44  extern DECLSPEC void SDLCALL SDL_WarpMouseInWindow(SDL_Window * window,
   54.45 @@ -102,25 +100,25 @@
   54.46  
   54.47  /**
   54.48   *  \brief Set relative mouse mode.
   54.49 - *  
   54.50 + *
   54.51   *  \param enabled Whether or not to enable relative mode
   54.52   *
   54.53   *  \return 0 on success, or -1 if relative mode is not supported.
   54.54 - *  
   54.55 + *
   54.56   *  While the mouse is in relative mode, the cursor is hidden, and the
   54.57   *  driver will try to report continuous motion in the current window.
   54.58   *  Only relative motion events will be delivered, the mouse position
   54.59   *  will not change.
   54.60 - *  
   54.61 + *
   54.62   *  \note This function will flush any pending mouse motion.
   54.63 - *  
   54.64 + *
   54.65   *  \sa SDL_GetRelativeMouseMode()
   54.66   */
   54.67  extern DECLSPEC int SDLCALL SDL_SetRelativeMouseMode(SDL_bool enabled);
   54.68  
   54.69  /**
   54.70   *  \brief Query whether relative mouse mode is enabled.
   54.71 - *  
   54.72 + *
   54.73   *  \sa SDL_SetRelativeMouseMode()
   54.74   */
   54.75  extern DECLSPEC SDL_bool SDLCALL SDL_GetRelativeMouseMode(void);
   54.76 @@ -128,19 +126,19 @@
   54.77  /**
   54.78   *  \brief Create a cursor, using the specified bitmap data and
   54.79   *         mask (in MSB format).
   54.80 - *  
   54.81 + *
   54.82   *  The cursor width must be a multiple of 8 bits.
   54.83 - *  
   54.84 + *
   54.85   *  The cursor is created in black and white according to the following:
   54.86   *  <table>
   54.87   *  <tr><td> data </td><td> mask </td><td> resulting pixel on screen </td></tr>
   54.88   *  <tr><td>  0   </td><td>  1   </td><td> White </td></tr>
   54.89   *  <tr><td>  1   </td><td>  1   </td><td> Black </td></tr>
   54.90   *  <tr><td>  0   </td><td>  0   </td><td> Transparent </td></tr>
   54.91 - *  <tr><td>  1   </td><td>  0   </td><td> Inverted color if possible, black 
   54.92 + *  <tr><td>  1   </td><td>  0   </td><td> Inverted color if possible, black
   54.93   *                                         if not. </td></tr>
   54.94   *  </table>
   54.95 - *  
   54.96 + *
   54.97   *  \sa SDL_FreeCursor()
   54.98   */
   54.99  extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateCursor(const Uint8 * data,
  54.100 @@ -150,7 +148,7 @@
  54.101  
  54.102  /**
  54.103   *  \brief Create a color cursor.
  54.104 - *  
  54.105 + *
  54.106   *  \sa SDL_FreeCursor()
  54.107   */
  54.108  extern DECLSPEC SDL_Cursor *SDLCALL SDL_CreateColorCursor(SDL_Surface *surface,
  54.109 @@ -181,17 +179,17 @@
  54.110  
  54.111  /**
  54.112   *  \brief Frees a cursor created with SDL_CreateCursor().
  54.113 - *  
  54.114 + *
  54.115   *  \sa SDL_CreateCursor()
  54.116   */
  54.117  extern DECLSPEC void SDLCALL SDL_FreeCursor(SDL_Cursor * cursor);
  54.118  
  54.119  /**
  54.120   *  \brief Toggle whether or not the cursor is shown.
  54.121 - *  
  54.122 - *  \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current 
  54.123 + *
  54.124 + *  \param toggle 1 to show the cursor, 0 to hide it, -1 to query the current
  54.125   *                state.
  54.126 - *  
  54.127 + *
  54.128   *  \return 1 if the cursor is shown, or 0 if the cursor is hidden.
  54.129   */
  54.130  extern DECLSPEC int SDLCALL SDL_ShowCursor(int toggle);
  54.131 @@ -202,24 +200,22 @@
  54.132   *   - Button 2:  Middle mouse button
  54.133   *   - Button 3:  Right mouse button
  54.134   */
  54.135 -#define SDL_BUTTON(X)		(1 << ((X)-1))
  54.136 -#define SDL_BUTTON_LEFT		1
  54.137 -#define SDL_BUTTON_MIDDLE	2
  54.138 -#define SDL_BUTTON_RIGHT	3
  54.139 -#define SDL_BUTTON_X1		4
  54.140 -#define SDL_BUTTON_X2		5
  54.141 -#define SDL_BUTTON_LMASK	SDL_BUTTON(SDL_BUTTON_LEFT)
  54.142 -#define SDL_BUTTON_MMASK	SDL_BUTTON(SDL_BUTTON_MIDDLE)
  54.143 -#define SDL_BUTTON_RMASK	SDL_BUTTON(SDL_BUTTON_RIGHT)
  54.144 -#define SDL_BUTTON_X1MASK	SDL_BUTTON(SDL_BUTTON_X1)
  54.145 -#define SDL_BUTTON_X2MASK	SDL_BUTTON(SDL_BUTTON_X2)
  54.146 +#define SDL_BUTTON(X)       (1 << ((X)-1))
  54.147 +#define SDL_BUTTON_LEFT     1
  54.148 +#define SDL_BUTTON_MIDDLE   2
  54.149 +#define SDL_BUTTON_RIGHT    3
  54.150 +#define SDL_BUTTON_X1       4
  54.151 +#define SDL_BUTTON_X2       5
  54.152 +#define SDL_BUTTON_LMASK    SDL_BUTTON(SDL_BUTTON_LEFT)
  54.153 +#define SDL_BUTTON_MMASK    SDL_BUTTON(SDL_BUTTON_MIDDLE)
  54.154 +#define SDL_BUTTON_RMASK    SDL_BUTTON(SDL_BUTTON_RIGHT)
  54.155 +#define SDL_BUTTON_X1MASK   SDL_BUTTON(SDL_BUTTON_X1)
  54.156 +#define SDL_BUTTON_X2MASK   SDL_BUTTON(SDL_BUTTON_X2)
  54.157  
  54.158  
  54.159  /* Ends C function definitions when using C++ */
  54.160  #ifdef __cplusplus
  54.161 -/* *INDENT-OFF* */
  54.162  }
  54.163 -/* *INDENT-ON* */
  54.164  #endif
  54.165  #include "close_code.h"
  54.166  
    55.1 --- a/include/SDL_mutex.h	Sat May 18 12:48:50 2013 -0700
    55.2 +++ b/include/SDL_mutex.h	Sat May 18 14:17:52 2013 -0700
    55.3 @@ -24,7 +24,7 @@
    55.4  
    55.5  /**
    55.6   *  \file SDL_mutex.h
    55.7 - *  
    55.8 + *
    55.9   *  Functions to provide thread synchronization primitives.
   55.10   */
   55.11  
   55.12 @@ -34,21 +34,19 @@
   55.13  #include "begin_code.h"
   55.14  /* Set up for C function definitions, even when using C++ */
   55.15  #ifdef __cplusplus
   55.16 -/* *INDENT-OFF* */
   55.17  extern "C" {
   55.18 -/* *INDENT-ON* */
   55.19  #endif
   55.20  
   55.21  /**
   55.22   *  Synchronization functions which can time out return this value
   55.23   *  if they time out.
   55.24   */
   55.25 -#define SDL_MUTEX_TIMEDOUT	1
   55.26 +#define SDL_MUTEX_TIMEDOUT  1
   55.27  
   55.28  /**
   55.29   *  This is the timeout value which corresponds to never time out.
   55.30   */
   55.31 -#define SDL_MUTEX_MAXWAIT	(~(Uint32)0)
   55.32 +#define SDL_MUTEX_MAXWAIT   (~(Uint32)0)
   55.33  
   55.34  
   55.35  /**
   55.36 @@ -67,31 +65,31 @@
   55.37  
   55.38  /**
   55.39   *  Lock the mutex.
   55.40 - *  
   55.41 + *
   55.42   *  \return 0, or -1 on error.
   55.43   */
   55.44 -#define SDL_mutexP(m)	SDL_LockMutex(m)
   55.45 +#define SDL_mutexP(m)   SDL_LockMutex(m)
   55.46  extern DECLSPEC int SDLCALL SDL_LockMutex(SDL_mutex * mutex);
   55.47  
   55.48  /**
   55.49   *  Try to lock the mutex
   55.50 - *  
   55.51 + *
   55.52   *  \return 0, SDL_MUTEX_TIMEDOUT, or -1 on error
   55.53   */
   55.54  extern DECLSPEC int SDLCALL SDL_TryLockMutex(SDL_mutex * mutex);
   55.55  
   55.56  /**
   55.57   *  Unlock the mutex.
   55.58 - *  
   55.59 + *
   55.60   *  \return 0, or -1 on error.
   55.61 - *  
   55.62 + *
   55.63   *  \warning It is an error to unlock a mutex that has not been locked by
   55.64   *           the current thread, and doing so results in undefined behavior.
   55.65   */
   55.66 -#define SDL_mutexV(m)	SDL_UnlockMutex(m)
   55.67 +#define SDL_mutexV(m)   SDL_UnlockMutex(m)
   55.68  extern DECLSPEC int SDLCALL SDL_UnlockMutex(SDL_mutex * mutex);
   55.69  
   55.70 -/** 
   55.71 +/**
   55.72   *  Destroy a mutex.
   55.73   */
   55.74  extern DECLSPEC void SDLCALL SDL_DestroyMutex(SDL_mutex * mutex);
   55.75 @@ -119,34 +117,34 @@
   55.76  extern DECLSPEC void SDLCALL SDL_DestroySemaphore(SDL_sem * sem);
   55.77  
   55.78  /**
   55.79 - *  This function suspends the calling thread until the semaphore pointed 
   55.80 - *  to by \c sem has a positive count. It then atomically decreases the 
   55.81 + *  This function suspends the calling thread until the semaphore pointed
   55.82 + *  to by \c sem has a positive count. It then atomically decreases the
   55.83   *  semaphore count.
   55.84   */
   55.85  extern DECLSPEC int SDLCALL SDL_SemWait(SDL_sem * sem);
   55.86  
   55.87  /**
   55.88   *  Non-blocking variant of SDL_SemWait().
   55.89 - *  
   55.90 - *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would 
   55.91 + *
   55.92 + *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait would
   55.93   *          block, and -1 on error.
   55.94   */
   55.95  extern DECLSPEC int SDLCALL SDL_SemTryWait(SDL_sem * sem);
   55.96  
   55.97  /**
   55.98   *  Variant of SDL_SemWait() with a timeout in milliseconds.
   55.99 - *  
  55.100 - *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not 
  55.101 + *
  55.102 + *  \return 0 if the wait succeeds, ::SDL_MUTEX_TIMEDOUT if the wait does not
  55.103   *          succeed in the allotted time, and -1 on error.
  55.104 - *  
  55.105 - *  \warning On some platforms this function is implemented by looping with a 
  55.106 + *
  55.107 + *  \warning On some platforms this function is implemented by looping with a
  55.108   *           delay of 1 ms, and so should be avoided if possible.
  55.109   */
  55.110  extern DECLSPEC int SDLCALL SDL_SemWaitTimeout(SDL_sem * sem, Uint32 ms);
  55.111  
  55.112  /**
  55.113   *  Atomically increases the semaphore's count (not blocking).
  55.114 - *  
  55.115 + *
  55.116   *  \return 0, or -1 on error.
  55.117   */
  55.118  extern DECLSPEC int SDLCALL SDL_SemPost(SDL_sem * sem);
  55.119 @@ -205,7 +203,7 @@
  55.120  
  55.121  /**
  55.122   *  Restart one of the threads that are waiting on the condition variable.
  55.123 - *  
  55.124 + *
  55.125   *  \return 0 or -1 on error.
  55.126   */
  55.127  extern DECLSPEC int SDLCALL SDL_CondSignal(SDL_cond * cond);
  55.128 @@ -219,11 +217,11 @@
  55.129  
  55.130  /**
  55.131   *  Wait on the condition variable, unlocking the provided mutex.
  55.132 - *  
  55.133 + *
  55.134   *  \warning The mutex must be locked before entering this function!
  55.135 - *  
  55.136 + *
  55.137   *  The mutex is re-locked once the condition variable is signaled.
  55.138 - *  
  55.139 + *
  55.140   *  \return 0 when it is signaled, or -1 on error.
  55.141   */
  55.142  extern DECLSPEC int SDLCALL SDL_CondWait(SDL_cond * cond, SDL_mutex * mutex);
  55.143 @@ -233,7 +231,7 @@
  55.144   *  variable is signaled, ::SDL_MUTEX_TIMEDOUT if the condition is not
  55.145   *  signaled in the allotted time, and -1 on error.
  55.146   *
  55.147 - *  \warning On some platforms this function is implemented by looping with a 
  55.148 + *  \warning On some platforms this function is implemented by looping with a
  55.149   *           delay of 1 ms, and so should be avoided if possible.
  55.150   */
  55.151  extern DECLSPEC int SDLCALL SDL_CondWaitTimeout(SDL_cond * cond,
  55.152 @@ -244,9 +242,7 @@
  55.153  
  55.154  /* Ends C function definitions when using C++ */
  55.155  #ifdef __cplusplus
  55.156 -/* *INDENT-OFF* */
  55.157  }
  55.158 -/* *INDENT-ON* */
  55.159  #endif
  55.160  #include "close_code.h"
  55.161  
    56.1 --- a/include/SDL_name.h	Sat May 18 12:48:50 2013 -0700
    56.2 +++ b/include/SDL_name.h	Sat May 18 14:17:52 2013 -0700
    56.3 @@ -6,6 +6,6 @@
    56.4  #define NeedFunctionPrototypes 1
    56.5  #endif
    56.6  
    56.7 -#define SDL_NAME(X)	SDL_##X
    56.8 +#define SDL_NAME(X) SDL_##X
    56.9  
   56.10  #endif /* _SDLname_h_ */
    57.1 --- a/include/SDL_opengl.h	Sat May 18 12:48:50 2013 -0700
    57.2 +++ b/include/SDL_opengl.h	Sat May 18 14:17:52 2013 -0700
    57.3 @@ -21,7 +21,7 @@
    57.4  
    57.5  /**
    57.6   *  \file SDL_opengl.h
    57.7 - *  
    57.8 + *
    57.9   *  This is a simple file to encapsulate the OpenGL API headers.
   57.10   */
   57.11  
   57.12 @@ -63,23 +63,22 @@
   57.13  
   57.14  /**
   57.15   *  \file SDL_opengl.h
   57.16 - *  
   57.17 + *
   57.18   *  This file is included because glext.h is not available on some systems.
   57.19   *  If you don't want this version included, simply define ::NO_SDL_GLEXT.
   57.20 - *  
   57.21 + *
   57.22   *  The latest version is available from:
   57.23 - *  	http://www.opengl.org/registry/
   57.24 + *      http://www.opengl.org/registry/
   57.25   */
   57.26  
   57.27  /**
   57.28   *  \def NO_SDL_GLEXT
   57.29 - *  
   57.30 - *  Define this if you have your own version of glext.h and want to disable the 
   57.31 + *
   57.32 + *  Define this if you have your own version of glext.h and want to disable the
   57.33   *  version included in SDL_opengl.h.
   57.34   */
   57.35  
   57.36  #if !defined(NO_SDL_GLEXT) && !defined(GL_GLEXT_LEGACY)
   57.37 -/* *INDENT-OFF* */
   57.38  #ifndef __glext_h_
   57.39  #define __glext_h_
   57.40  
   57.41 @@ -89,7 +88,7 @@
   57.42  
   57.43  /*
   57.44  ** Copyright (c) 2007-2010 The Khronos Group Inc.
   57.45 -** 
   57.46 +**
   57.47  ** Permission is hereby granted, free of charge, to any person obtaining a
   57.48  ** copy of this software and/or associated documentation files (the
   57.49  ** "Materials"), to deal in the Materials without restriction, including
   57.50 @@ -97,10 +96,10 @@
   57.51  ** distribute, sublicense, and/or sell copies of the Materials, and to
   57.52  ** permit persons to whom the Materials are furnished to do so, subject to
   57.53  ** the following conditions:
   57.54 -** 
   57.55 +**
   57.56  ** The above copyright notice and this permission notice shall be included
   57.57  ** in all copies or substantial portions of the Materials.
   57.58 -** 
   57.59 +**
   57.60  ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   57.61  ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   57.62  ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   57.63 @@ -11122,7 +11121,6 @@
   57.64  #endif
   57.65  
   57.66  #endif
   57.67 -/* *INDENT-ON* */
   57.68  #endif /* NO_SDL_GLEXT */
   57.69  
   57.70  #endif /* !__IPHONEOS__ */
    58.1 --- a/include/SDL_opengles.h	Sat May 18 12:48:50 2013 -0700
    58.2 +++ b/include/SDL_opengles.h	Sat May 18 14:17:52 2013 -0700
    58.3 @@ -21,7 +21,7 @@
    58.4  
    58.5  /**
    58.6   *  \file SDL_opengles.h
    58.7 - *  
    58.8 + *
    58.9   *  This is a simple file to encapsulate the OpenGL ES 1.X API headers.
   58.10   */
   58.11  
    59.1 --- a/include/SDL_opengles2.h	Sat May 18 12:48:50 2013 -0700
    59.2 +++ b/include/SDL_opengles2.h	Sat May 18 14:17:52 2013 -0700
    59.3 @@ -21,7 +21,7 @@
    59.4  
    59.5  /**
    59.6   *  \file SDL_opengles.h
    59.7 - *  
    59.8 + *
    59.9   *  This is a simple file to encapsulate the OpenGL ES 2.0 API headers.
   59.10   */
   59.11  
    60.1 --- a/include/SDL_pixels.h	Sat May 18 12:48:50 2013 -0700
    60.2 +++ b/include/SDL_pixels.h	Sat May 18 14:17:52 2013 -0700
    60.3 @@ -21,7 +21,7 @@
    60.4  
    60.5  /**
    60.6   *  \file SDL_pixels.h
    60.7 - *  
    60.8 + *
    60.9   *  Header for the enumerated pixel format definitions.
   60.10   */
   60.11  
   60.12 @@ -31,14 +31,12 @@
   60.13  #include "begin_code.h"
   60.14  /* Set up for C function definitions, even when using C++ */
   60.15  #ifdef __cplusplus
   60.16 -/* *INDENT-OFF* */
   60.17  extern "C" {
   60.18 -/* *INDENT-ON* */
   60.19  #endif
   60.20  
   60.21  /**
   60.22   *  \name Transparency definitions
   60.23 - *  
   60.24 + *
   60.25   *  These define alpha as the opacity of a surface.
   60.26   */
   60.27  /*@{*/
   60.28 @@ -117,11 +115,11 @@
   60.29      ((1 << 28) | ((type) << 24) | ((order) << 20) | ((layout) << 16) | \
   60.30       ((bits) << 8) | ((bytes) << 0))
   60.31  
   60.32 -#define SDL_PIXELFLAG(X)	(((X) >> 28) & 0x0F)
   60.33 -#define SDL_PIXELTYPE(X)	(((X) >> 24) & 0x0F)
   60.34 -#define SDL_PIXELORDER(X)	(((X) >> 20) & 0x0F)
   60.35 -#define SDL_PIXELLAYOUT(X)	(((X) >> 16) & 0x0F)
   60.36 -#define SDL_BITSPERPIXEL(X)	(((X) >> 8) & 0xFF)
   60.37 +#define SDL_PIXELFLAG(X)    (((X) >> 28) & 0x0F)
   60.38 +#define SDL_PIXELTYPE(X)    (((X) >> 24) & 0x0F)
   60.39 +#define SDL_PIXELORDER(X)   (((X) >> 20) & 0x0F)
   60.40 +#define SDL_PIXELLAYOUT(X)  (((X) >> 16) & 0x0F)
   60.41 +#define SDL_BITSPERPIXEL(X) (((X) >> 8) & 0xFF)
   60.42  #define SDL_BYTESPERPIXEL(X) \
   60.43      (SDL_ISPIXELFORMAT_FOURCC(X) ? \
   60.44          ((((X) == SDL_PIXELFORMAT_YUY2) || \
   60.45 @@ -301,9 +299,9 @@
   60.46  
   60.47  /**
   60.48   *  \brief Convert one of the enumerated pixel formats to a bpp and RGBA masks.
   60.49 - *  
   60.50 + *
   60.51   *  \return SDL_TRUE, or SDL_FALSE if the conversion wasn't possible.
   60.52 - *  
   60.53 + *
   60.54   *  \sa SDL_MasksToPixelFormatEnum()
   60.55   */
   60.56  extern DECLSPEC SDL_bool SDLCALL SDL_PixelFormatEnumToMasks(Uint32 format,
   60.57 @@ -315,10 +313,10 @@
   60.58  
   60.59  /**
   60.60   *  \brief Convert a bpp and RGBA masks to an enumerated pixel format.
   60.61 - *  
   60.62 - *  \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion 
   60.63 + *
   60.64 + *  \return The pixel format, or ::SDL_PIXELFORMAT_UNKNOWN if the conversion
   60.65   *          wasn't possible.
   60.66 - *  
   60.67 + *
   60.68   *  \sa SDL_PixelFormatEnumToMasks()
   60.69   */
   60.70  extern DECLSPEC Uint32 SDLCALL SDL_MasksToPixelFormatEnum(int bpp,
   60.71 @@ -338,13 +336,13 @@
   60.72  extern DECLSPEC void SDLCALL SDL_FreeFormat(SDL_PixelFormat *format);
   60.73  
   60.74  /**
   60.75 - *  \brief Create a palette structure with the specified number of color 
   60.76 + *  \brief Create a palette structure with the specified number of color
   60.77   *         entries.
   60.78 - *  
   60.79 + *
   60.80   *  \return A new palette, or NULL if there wasn't enough memory.
   60.81 - *  
   60.82 + *
   60.83   *  \note The palette entries are initialized to white.
   60.84 - *  
   60.85 + *
   60.86   *  \sa SDL_FreePalette()
   60.87   */
   60.88  extern DECLSPEC SDL_Palette *SDLCALL SDL_AllocPalette(int ncolors);
   60.89 @@ -357,12 +355,12 @@
   60.90  
   60.91  /**
   60.92   *  \brief Set a range of colors in a palette.
   60.93 - *  
   60.94 + *
   60.95   *  \param palette    The palette to modify.
   60.96   *  \param colors     An array of colors to copy into the palette.
   60.97   *  \param firstcolor The index of the first palette entry to modify.
   60.98   *  \param ncolors    The number of entries to modify.
   60.99 - *  
  60.100 + *
  60.101   *  \return 0 on success, or -1 if not all of the colors could be set.
  60.102   */
  60.103  extern DECLSPEC int SDLCALL SDL_SetPaletteColors(SDL_Palette * palette,
  60.104 @@ -371,14 +369,14 @@
  60.105  
  60.106  /**
  60.107   *  \brief Free a palette created with SDL_AllocPalette().
  60.108 - *  
  60.109 + *
  60.110   *  \sa SDL_AllocPalette()
  60.111   */
  60.112  extern DECLSPEC void SDLCALL SDL_FreePalette(SDL_Palette * palette);
  60.113  
  60.114  /**
  60.115   *  \brief Maps an RGB triple to an opaque pixel value for a given pixel format.
  60.116 - *  
  60.117 + *
  60.118   *  \sa SDL_MapRGBA
  60.119   */
  60.120  extern DECLSPEC Uint32 SDLCALL SDL_MapRGB(const SDL_PixelFormat * format,
  60.121 @@ -386,7 +384,7 @@
  60.122  
  60.123  /**
  60.124   *  \brief Maps an RGBA quadruple to a pixel value for a given pixel format.
  60.125 - *  
  60.126 + *
  60.127   *  \sa SDL_MapRGB
  60.128   */
  60.129  extern DECLSPEC Uint32 SDLCALL SDL_MapRGBA(const SDL_PixelFormat * format,
  60.130 @@ -395,7 +393,7 @@
  60.131  
  60.132  /**
  60.133   *  \brief Get the RGB components from a pixel of the specified format.
  60.134 - *  
  60.135 + *
  60.136   *  \sa SDL_GetRGBA
  60.137   */
  60.138  extern DECLSPEC void SDLCALL SDL_GetRGB(Uint32 pixel,
  60.139 @@ -404,7 +402,7 @@
  60.140  
  60.141  /**
  60.142   *  \brief Get the RGBA components from a pixel of the specified format.
  60.143 - *  
  60.144 + *
  60.145   *  \sa SDL_GetRGB
  60.146   */
  60.147  extern DECLSPEC void SDLCALL SDL_GetRGBA(Uint32 pixel,
  60.148 @@ -420,9 +418,7 @@
  60.149  
  60.150  /* Ends C function definitions when using C++ */
  60.151  #ifdef __cplusplus
  60.152 -/* *INDENT-OFF* */
  60.153  }
  60.154 -/* *INDENT-ON* */
  60.155  #endif
  60.156  #include "close_code.h"
  60.157  
    61.1 --- a/include/SDL_platform.h	Sat May 18 12:48:50 2013 -0700
    61.2 +++ b/include/SDL_platform.h	Sat May 18 14:17:52 2013 -0700
    61.3 @@ -21,7 +21,7 @@
    61.4  
    61.5  /**
    61.6   *  \file SDL_platform.h
    61.7 - *  
    61.8 + *
    61.9   *  Try to get a standard set of platform defines.
   61.10   */
   61.11  
   61.12 @@ -30,39 +30,39 @@
   61.13  
   61.14  #if defined(_AIX)
   61.15  #undef __AIX__
   61.16 -#define __AIX__		1
   61.17 +#define __AIX__     1
   61.18  #endif
   61.19  #if defined(__BEOS__)
   61.20  #undef __BEOS__
   61.21 -#define __BEOS__	1
   61.22 +#define __BEOS__    1
   61.23  #endif
   61.24  #if defined(__HAIKU__)
   61.25  #undef __HAIKU__
   61.26 -#define __HAIKU__	1
   61.27 +#define __HAIKU__   1
   61.28  #endif
   61.29  #if defined(bsdi) || defined(__bsdi) || defined(__bsdi__)
   61.30  #undef __BSDI__
   61.31 -#define __BSDI__	1
   61.32 +#define __BSDI__    1
   61.33  #endif
   61.34  #if defined(_arch_dreamcast)
   61.35  #undef __DREAMCAST__
   61.36 -#define __DREAMCAST__	1
   61.37 +#define __DREAMCAST__   1
   61.38  #endif
   61.39  #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__)
   61.40  #undef __FREEBSD__
   61.41 -#define __FREEBSD__	1
   61.42 +#define __FREEBSD__ 1
   61.43  #endif
   61.44  #if defined(hpux) || defined(__hpux) || defined(__hpux__)
   61.45  #undef __HPUX__
   61.46 -#define __HPUX__	1
   61.47 +#define __HPUX__    1
   61.48  #endif
   61.49  #if defined(sgi) || defined(__sgi) || defined(__sgi__) || defined(_SGI_SOURCE)
   61.50  #undef __IRIX__
   61.51 -#define __IRIX__	1
   61.52 +#define __IRIX__    1
   61.53  #endif
   61.54  #if defined(linux) || defined(__linux) || defined(__linux__)
   61.55  #undef __LINUX__
   61.56 -#define __LINUX__	1
   61.57 +#define __LINUX__   1
   61.58  #endif
   61.59  #if defined(ANDROID)
   61.60  #undef __ANDROID__
   61.61 @@ -82,53 +82,51 @@
   61.62  #else
   61.63  /* if not compiling for iPhone */
   61.64  #undef __MACOSX__
   61.65 -#define __MACOSX__	1
   61.66 +#define __MACOSX__  1
   61.67  #endif /* TARGET_OS_IPHONE */
   61.68  #endif /* defined(__APPLE__) */
   61.69  
   61.70  #if defined(__NetBSD__)
   61.71  #undef __NETBSD__
   61.72 -#define __NETBSD__	1
   61.73 +#define __NETBSD__  1
   61.74  #endif
   61.75  #if defined(__OpenBSD__)
   61.76  #undef __OPENBSD__
   61.77 -#define __OPENBSD__	1
   61.78 +#define __OPENBSD__ 1
   61.79  #endif
   61.80  #if defined(__OS2__)
   61.81  #undef __OS2__
   61.82 -#define __OS2__		1
   61.83 +#define __OS2__     1
   61.84  #endif
   61.85  #if defined(osf) || defined(__osf) || defined(__osf__) || defined(_OSF_SOURCE)
   61.86  #undef __OSF__
   61.87 -#define __OSF__		1
   61.88 +#define __OSF__     1
   61.89  #endif
   61.90  #if defined(__QNXNTO__)
   61.91  #undef __QNXNTO__
   61.92 -#define __QNXNTO__	1
   61.93 +#define __QNXNTO__  1
   61.94  #endif
   61.95  #if defined(riscos) || defined(__riscos) || defined(__riscos__)
   61.96  #undef __RISCOS__
   61.97 -#define __RISCOS__	1
   61.98 +#define __RISCOS__  1
   61.99  #endif
  61.100  #if defined(__SVR4)
  61.101  #undef __SOLARIS__
  61.102 -#define __SOLARIS__	1
  61.103 +#define __SOLARIS__ 1
  61.104  #endif
  61.105  #if defined(WIN32) || defined(_WIN32)
  61.106  #undef __WIN32__
  61.107 -#define __WIN32__	1
  61.108 +#define __WIN32__   1
  61.109  #endif
  61.110  #if defined(__PSP__)
  61.111  #undef __PSP__
  61.112 -#define __PSP__	1
  61.113 +#define __PSP__ 1
  61.114  #endif
  61.115  
  61.116  #include "begin_code.h"
  61.117  /* Set up for C function definitions, even when using C++ */
  61.118  #ifdef __cplusplus
  61.119 -/* *INDENT-OFF* */
  61.120  extern "C" {
  61.121 -/* *INDENT-ON* */
  61.122  #endif
  61.123  
  61.124  /**
  61.125 @@ -138,9 +136,7 @@
  61.126  
  61.127  /* Ends C function definitions when using C++ */
  61.128  #ifdef __cplusplus
  61.129 -/* *INDENT-OFF* */
  61.130  }
  61.131 -/* *INDENT-ON* */
  61.132  #endif
  61.133  #include "close_code.h"
  61.134  
    62.1 --- a/include/SDL_power.h	Sat May 18 12:48:50 2013 -0700
    62.2 +++ b/include/SDL_power.h	Sat May 18 14:17:52 2013 -0700
    62.3 @@ -24,7 +24,7 @@
    62.4  
    62.5  /**
    62.6   *  \file SDL_power.h
    62.7 - *  
    62.8 + *
    62.9   *  Header for the SDL power management routines.
   62.10   */
   62.11  
   62.12 @@ -33,9 +33,7 @@
   62.13  #include "begin_code.h"
   62.14  /* Set up for C function definitions, even when using C++ */
   62.15  #ifdef __cplusplus
   62.16 -/* *INDENT-OFF* */
   62.17  extern "C" {
   62.18 -/* *INDENT-ON* */
   62.19  #endif
   62.20  
   62.21  /**
   62.22 @@ -53,24 +51,22 @@