We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch that adds hint to disable the idle timeout on iOS

2.diff (text/plain), 10.31 KB, created by Tim Angus on 2011-06-15 02:26:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tim Angus

Created: 2011-06-15 02:26:26 UTC

Size: 10.31 KB

patch

obsolete

># HG changeset patch
># User Tim Angus <tim@blackcompanystudios.co.uk>
># Date 1308129653 -3600
># Node ID d328e8b6f78ffd400f75f934fe60a405e317a97f
># Parent  aef5532df5cc90b9121371647b1862bc15961d6a
>* SDL_IOS_IDLE_TIMER_DISABLED hint
>
>diff -r aef5532df5cc -r d328e8b6f78f VisualC/SDL/SDL_VS2005.vcproj
>--- a/VisualC/SDL/SDL_VS2005.vcproj	Fri Jun 10 14:23:24 2011 +0100
>+++ b/VisualC/SDL/SDL_VS2005.vcproj	Wed Jun 15 10:20:53 2011 +0100
>@@ -908,6 +908,10 @@
> 			>
> 		</File>
> 		<File
>+			RelativePath="..\..\src\SDL_hints_c.h"
>+			>
>+		</File>
>+		<File
> 			RelativePath="..\..\src\stdlib\SDL_iconv.c"
> 			>
> 		</File>
>diff -r aef5532df5cc -r d328e8b6f78f VisualC/SDL/SDL_VS2008.vcproj
>--- a/VisualC/SDL/SDL_VS2008.vcproj	Fri Jun 10 14:23:24 2011 +0100
>+++ b/VisualC/SDL/SDL_VS2008.vcproj	Wed Jun 15 10:20:53 2011 +0100
>@@ -897,6 +897,10 @@
> 			>
> 		</File>
> 		<File
>+			RelativePath="..\..\src\SDL_hints_c.h"
>+			>
>+		</File>
>+		<File
> 			RelativePath="..\..\src\stdlib\SDL_iconv.c"
> 			>
> 		</File>
>diff -r aef5532df5cc -r d328e8b6f78f VisualC/SDL/SDL_VS2010.vcxproj
>--- a/VisualC/SDL/SDL_VS2010.vcxproj	Fri Jun 10 14:23:24 2011 +0100
>+++ b/VisualC/SDL/SDL_VS2010.vcxproj	Wed Jun 15 10:20:53 2011 +0100
>@@ -281,6 +281,7 @@
>     <ClInclude Include="..\..\src\audio\dummy\SDL_dummyaudio.h" />
>     <ClInclude Include="..\..\src\audio\windx5\SDL_dx5audio.h" />
>     <ClInclude Include="..\..\src\SDL_error_c.h" />
>+    <ClInclude Include="..\..\src\SDL_hints_c.h" />
>     <ClInclude Include="..\..\src\events\SDL_events_c.h" />
>     <ClInclude Include="..\..\src\SDL_fatal.h" />
>     <ClInclude Include="..\..\src\video\SDL_glesfuncs.h" />
>@@ -436,4 +437,4 @@
>   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
>   <ImportGroup Label="ExtensionTargets">
>   </ImportGroup>
>-</Project>
>\ No newline at end of file
>+</Project>
>diff -r aef5532df5cc -r d328e8b6f78f Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
>--- a/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Fri Jun 10 14:23:24 2011 +0100
>+++ b/Xcode-iPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Wed Jun 15 10:20:53 2011 +0100
>@@ -122,6 +122,7 @@
> 		04FFAB8C12E23B8D00BA343D /* SDL_spinlock.c in Sources */ = {isa = PBXBuildFile; fileRef = 04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */; };
> 		04FFAB9612E23BDC00BA343D /* SDL_blendmode.h in Headers */ = {isa = PBXBuildFile; fileRef = 04FFAB9312E23BDC00BA343D /* SDL_blendmode.h */; settings = {ATTRIBUTES = (Public, ); }; };
> 		04FFAB9812E23BDC00BA343D /* SDL_shape.h in Headers */ = {isa = PBXBuildFile; fileRef = 04FFAB9512E23BDC00BA343D /* SDL_shape.h */; settings = {ATTRIBUTES = (Public, ); }; };
>+		22C905CD13A22646003FE4E4 /* SDL_hints_c.h in Headers */ = {isa = PBXBuildFile; fileRef = 22C905CC13A22646003FE4E4 /* SDL_hints_c.h */; };
> 		56ED04E1118A8EE200A56AA6 /* SDL_power.c in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E0118A8EE200A56AA6 /* SDL_power.c */; };
> 		56ED04E3118A8EFD00A56AA6 /* SDL_syspower.m in Sources */ = {isa = PBXBuildFile; fileRef = 56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */; };
> 		FD24846D0E5655AE0021E198 /* SDL_uikitkeyboard.h in Headers */ = {isa = PBXBuildFile; fileRef = FD24846B0E5655AE0021E198 /* SDL_uikitkeyboard.h */; };
>@@ -376,6 +377,7 @@
> 		04FFAB8A12E23B8D00BA343D /* SDL_spinlock.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_spinlock.c; sourceTree = "<group>"; };
> 		04FFAB9312E23BDC00BA343D /* SDL_blendmode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_blendmode.h; path = ../../include/SDL_blendmode.h; sourceTree = SOURCE_ROOT; };
> 		04FFAB9512E23BDC00BA343D /* SDL_shape.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_shape.h; path = ../../include/SDL_shape.h; sourceTree = SOURCE_ROOT; };
>+		22C905CC13A22646003FE4E4 /* SDL_hints_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_hints_c.h; path = ../../src/SDL_hints_c.h; sourceTree = "<group>"; };
> 		56ED04E0118A8EE200A56AA6 /* SDL_power.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_power.c; path = ../../src/power/SDL_power.c; sourceTree = SOURCE_ROOT; };
> 		56ED04E2118A8EFD00A56AA6 /* SDL_syspower.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SDL_syspower.m; path = ../../src/power/uikit/SDL_syspower.m; sourceTree = SOURCE_ROOT; };
> 		FD0BBFEF0E3933DD00D833B1 /* SDL_uikitview.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_uikitview.h; sourceTree = "<group>"; };
>@@ -971,6 +973,7 @@
> 				FD99B9D60DD52EDC00FB1D6B /* SDL_fatal.c */,
> 				FD99B9D70DD52EDC00FB1D6B /* SDL_fatal.h */,
> 				0442EC5412FE1C3F004C9285 /* SDL_hints.c */,
>+				22C905CC13A22646003FE4E4 /* SDL_hints_c.h */,
> 				04BAC09B1300C1290055DE28 /* SDL_log.c */,
> 				FD99B9D80DD52EDC00FB1D6B /* SDL.c */,
> 			);
>@@ -1241,6 +1244,7 @@
> 				04BAC0991300C0F70055DE28 /* SDL_log.h in Headers */,
> 				04BAC09C1300C1290055DE28 /* SDL_assert_c.h in Headers */,
> 				0417A516130C988500578583 /* SDL_keycode.h in Headers */,
>+				22C905CD13A22646003FE4E4 /* SDL_hints_c.h in Headers */,
> 			);
> 			runOnlyForDeploymentPostprocessing = 0;
> 		};
>diff -r aef5532df5cc -r d328e8b6f78f include/SDL_hints.h
>--- a/include/SDL_hints.h	Fri Jun 10 14:23:24 2011 +0100
>+++ b/include/SDL_hints.h	Wed Jun 15 10:20:53 2011 +0100
>@@ -120,6 +120,20 @@
> #define SDL_HINT_RENDER_VSYNC               "SDL_RENDER_VSYNC"
> 	
> /**
>+ *  \brief  A variable controlling whether the idle timer is disabled on iOS.
>+ *
>+ *  When an iOS app does not receive touches for some time, the screen is
>+ *  dimmed automatically. For games where the accelerometer is the only input
>+ *  this is problematic. This functionality can be disabled by setting this
>+ *  hint.
>+ *
>+ *  This variable can be set to the following values:
>+ *    "0"       - Enable idle timer
>+ *    "1"       - Disable idle timer
>+ */
>+#define SDL_HINT_IDLE_TIMER_DISABLED "SDL_IOS_IDLE_TIMER_DISABLED"
>+	
>+/**
>  *  \brief  A variable controlling which orientations are allowed on iOS.
>  *
>  *  In some circumstances it is necessary to be able to explicitly control
>diff -r aef5532df5cc -r d328e8b6f78f src/SDL_hints.c
>--- a/src/SDL_hints.c	Fri Jun 10 14:23:24 2011 +0100
>+++ b/src/SDL_hints.c	Wed Jun 15 10:20:53 2011 +0100
>@@ -21,6 +21,7 @@
> #include "SDL_config.h"
> 
> #include "SDL_hints.h"
>+#include "SDL_hints_c.h"
> 
> 
> /* Assuming there aren't many hints set and they aren't being queried in
>@@ -30,11 +31,26 @@
>     char *name;
>     char *value;
>     SDL_HintPriority priority;
>+    SDL_HintChangedCb callback;
>     struct SDL_Hint *next;
> } SDL_Hint;
> 
> static SDL_Hint *SDL_hints;
> 
>+SDL_bool
>+SDL_RegisterHintChangedCb(const char *name, SDL_HintChangedCb hintCb)
>+{
>+    SDL_Hint *hint;
>+	
>+    for (hint = SDL_hints; hint; hint = hint->next) {
>+        if (SDL_strcmp(name, hint->name) == 0) {
>+            hint->callback = hintCb;
>+            return SDL_TRUE;
>+        }
>+    }
>+	
>+    return SDL_FALSE;
>+}
> 
> SDL_bool
> SDL_SetHintWithPriority(const char *name, const char *value,
>@@ -59,6 +75,9 @@
>                 return SDL_FALSE;
>             }
>             if (SDL_strcmp(hint->value, value) != 0) {
>+                if (hint->callback != NULL) {
>+                    (*hint->callback)(name, hint->value, value);
>+                }
>                 SDL_free(hint->value);
>                 hint->value = SDL_strdup(value);
>             }
>@@ -75,6 +94,7 @@
>     hint->name = SDL_strdup(name);
>     hint->value = SDL_strdup(value);
>     hint->priority = priority;
>+    hint->callback = NULL;
>     hint->next = SDL_hints;
>     SDL_hints = hint;
>     return SDL_TRUE;
>diff -r aef5532df5cc -r d328e8b6f78f src/SDL_hints_c.h
>--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
>+++ b/src/SDL_hints_c.h	Wed Jun 15 10:20:53 2011 +0100
>@@ -0,0 +1,34 @@
>+/*
>+ Simple DirectMedia Layer
>+ Copyright (C) 1997-2011 Sam Lantinga <slouken@libsdl.org>
>+ 
>+ This software is provided 'as-is', without any express or implied
>+ warranty.  In no event will the authors be held liable for any damages
>+ arising from the use of this software.
>+ 
>+ Permission is granted to anyone to use this software for any purpose,
>+ including commercial applications, and to alter it and redistribute it
>+ freely, subject to the following restrictions:
>+ 
>+ 1. The origin of this software must not be misrepresented; you must not
>+ claim that you wrote the original software. If you use this software
>+ in a product, an acknowledgment in the product documentation would be
>+ appreciated but is not required.
>+ 2. Altered source versions must be plainly marked as such, and must not be
>+ misrepresented as being the original software.
>+ 3. This notice may not be removed or altered from any source distribution.
>+ */
>+
>+#ifndef _SDL_hints_c_h
>+#define _SDL_hints_c_h
>+
>+/**
>+ *  \brief  A callback function that is optionally called when a hint changes
>+ */
>+typedef void (*SDL_HintChangedCb)(const char *name, const char *oldValue, const char *newValue);
>+
>+extern SDL_bool SDL_RegisterHintChangedCb(const char *name, SDL_HintChangedCb hintCb);
>+
>+#endif /* _SDL_hints_c_h */
>+
>+/* vi: set ts=4 sw=4 expandtab: */
>\ No newline at end of file
>diff -r aef5532df5cc -r d328e8b6f78f src/video/uikit/SDL_uikitappdelegate.m
>--- a/src/video/uikit/SDL_uikitappdelegate.m	Fri Jun 10 14:23:24 2011 +0100
>+++ b/src/video/uikit/SDL_uikitappdelegate.m	Wed Jun 15 10:20:53 2011 +0100
>@@ -20,6 +20,9 @@
> */
> 
> #import "../SDL_sysvideo.h"
>+#import "SDL_assert.h"
>+#import "SDL_hints.h"
>+#import "../../SDL_hints_c.h"
> 
> #import "SDL_uikitappdelegate.h"
> #import "SDL_uikitopenglview.h"
>@@ -55,6 +58,13 @@
>     return 0;
> }
> 
>+static void SDL_IdleTimerDisabledChanged(const char *name, const char *oldValue, const char *newValue) {
>+    SDL_assert(SDL_strcmp(name, SDL_HINT_IDLE_TIMER_DISABLED) == 0);
>+    
>+    BOOL disable = (*newValue != '0');
>+    [UIApplication sharedApplication].idleTimerDisabled = disable;
>+}
>+
> @implementation SDLUIKitDelegate
> 
> /* convenience method */
>@@ -75,6 +85,10 @@
> }
> 
> - (void)postFinishLaunch {
>+    
>+    /* register a callback for the idletimer hint */
>+    SDL_SetHint(SDL_HINT_IDLE_TIMER_DISABLED, "0");
>+    SDL_RegisterHintChangedCb(SDL_HINT_IDLE_TIMER_DISABLED, &SDL_IdleTimerDisabledChanged);
> 
>     /* run the user's application, passing argc and argv */
>     int exit_status = SDL_main(forward_argc, forward_argv);

Actions: View | Diff

Attachments on bug 1221: 621 | 626 | 627

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.