mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-10-16 06:45:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update for SDL3 coding style (#6717)

Browse Source 
I updated .clang-format and ran clang-format 14 over the src and test directories to standardize the code base.

In general I let clang-format have it's way, and added markup to prevent formatting of code that would break or be completely unreadable if formatted.

The script I ran for the src directory is added as build-scripts/clang-format-src.sh

This fixes:
#6592
#6593
#6594
This commit is contained in:
Sam Lantinga
2022-11-30 12:51:59 -08:00
committed by GitHub
parent 14b902faca
commit 5750bcb174
781 changed files with 51659 additions and 55763 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/video/uikit/SDL_uikitviewcontroller.m
View File

@@ -34,22 +34,20 @@
#include "SDL_uikitopengles.h"
#if TARGET_OS_TV
static void SDLCALL
SDL_AppleTVControllerUIHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
static void SDLCALL SDL_AppleTVControllerUIHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
{
@autoreleasepool {
SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *) userdata;
SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *)userdata;
viewcontroller.controllerUserInteractionEnabled = hint && (*hint != '0');
}
}
#endif
#if !TARGET_OS_TV
static void SDLCALL
SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
static void SDLCALL SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *oldValue, const char *hint)
{
@autoreleasepool {
SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *) userdata;
SDL_uikitviewcontroller *viewcontroller = (__bridge SDL_uikitviewcontroller *)userdata;
viewcontroller.homeIndicatorHidden = (hint && *hint) ? SDL_atoi(hint) : -1;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wunguarded-availability-new"
@@ -62,10 +60,11 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
}
#endif
@implementation SDL_uikitviewcontroller {
@implementation SDL_uikitviewcontroller
{
CADisplayLink *displayLink;
int animationInterval;
void (*animationCallback)(void*);
void (*animationCallback)(void *);
void *animationCallbackParam;
#if SDL_IPHONE_KEYBOARD
@@ -95,13 +94,13 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
#if TARGET_OS_TV
SDL_AddHintCallback(SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS,
SDL_AppleTVControllerUIHintChanged,
(__bridge void *) self);
(__bridge void *)self);
#endif
#if !TARGET_OS_TV
SDL_AddHintCallback(SDL_HINT_IOS_HIDE_HOME_INDICATOR,
SDL_HideHomeIndicatorHintChanged,
(__bridge void *) self);
(__bridge void *)self);
#endif
}
return self;
@@ -116,19 +115,19 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
#if TARGET_OS_TV
SDL_DelHintCallback(SDL_HINT_APPLE_TV_CONTROLLER_UI_EVENTS,
SDL_AppleTVControllerUIHintChanged,
(__bridge void *) self);
(__bridge void *)self);
#endif
#if !TARGET_OS_TV
SDL_DelHintCallback(SDL_HINT_IOS_HIDE_HOME_INDICATOR,
SDL_HideHomeIndicatorHintChanged,
(__bridge void *) self);
(__bridge void *)self);
#endif
}
- (void)setAnimationCallback:(int)interval
callback:(void (*)(void*))callback
callbackParam:(void*)callbackParam
callback:(void (*)(void *))callback
callbackParam:(void *)callbackParam
{
[self stopAnimation];
@@ -146,11 +145,9 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
displayLink = [CADisplayLink displayLinkWithTarget:self selector:@selector(doLoop:)];
#ifdef __IPHONE_10_3
SDL_WindowData *data = (__bridge SDL_WindowData *) window->driverdata;
SDL_WindowData *data = (__bridge SDL_WindowData *)window->driverdata;
if ([displayLink respondsToSelector:@selector(preferredFramesPerSecond)]
&& data != nil && data.uiwindow != nil
&& [data.uiwindow.screen respondsToSelector:@selector(maximumFramesPerSecond)]) {
if ([displayLink respondsToSelector:@selector(preferredFramesPerSecond)] && data != nil && data.uiwindow != nil && [data.uiwindow.screen respondsToSelector:@selector(maximumFramesPerSecond)]) {
displayLink.preferredFramesPerSecond = data.uiwindow.screen.maximumFramesPerSecond / animationInterval;
} else
#endif
@@ -169,7 +166,7 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
displayLink = nil;
}
- (void)doLoop:(CADisplayLink*)sender
- (void)doLoop:(CADisplayLink *)sender
{
/* Don't run the game loop while a messagebox is up */
if (!UIKit_ShowingMessageBox()) {
@@ -190,8 +187,8 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
- (void)viewDidLayoutSubviews
{
const CGSize size = self.view.bounds.size;
int w = (int) size.width;
int h = (int) size.height;
int w = (int)size.width;
int h = (int)size.height;
SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, w, h);
}
@@ -204,7 +201,7 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
- (BOOL)prefersStatusBarHidden
{
BOOL hidden = (window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) != 0;
BOOL hidden = (window->flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS)) != 0;
return hidden;
}
@@ -228,7 +225,7 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
}
/* By default, fullscreen and borderless windows get all screen gestures */
if ((window->flags & (SDL_WINDOW_FULLSCREEN|SDL_WINDOW_BORDERLESS)) != 0) {
if ((window->flags & (SDL_WINDOW_FULLSCREEN | SDL_WINDOW_BORDERLESS)) != 0) {
return UIRectEdgeAll;
} else {
return UIRectEdgeNone;
@@ -275,10 +272,16 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
#if !TARGET_OS_TV
[center addObserver:self selector:@selector(keyboardWillShow:) name:UIKeyboardWillShowNotification object:nil];
[center addObserver:self
selector:@selector(keyboardWillShow:)
name:UIKeyboardWillShowNotification
object:nil];
[center addObserver:self selector:@selector(keyboardWillHide:) name:UIKeyboardWillHideNotification object:nil];
#endif
[center addObserver:self selector:@selector(textFieldTextDidChange:) name:UITextFieldTextDidChangeNotification object:nil];
[center addObserver:self
selector:@selector(textFieldTextDidChange:)
name:UITextFieldTextDidChangeNotification
object:nil];
}
- (NSArray *)keyCommands
@@ -329,20 +332,26 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
{
[super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
rotatingOrientation = YES;
[coordinator animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {}
completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
self->rotatingOrientation = NO;
}];
[coordinator
animateAlongsideTransition:^(id<UIViewControllerTransitionCoordinatorContext> context) {
}
completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
self->rotatingOrientation = NO;
}];
}
- (void)deinitKeyboard
{
NSNotificationCenter *center = [NSNotificationCenter defaultCenter];
#if !TARGET_OS_TV
[center removeObserver:self name:UIKeyboardWillShowNotification object:nil];
[center removeObserver:self
name:UIKeyboardWillShowNotification
object:nil];
[center removeObserver:self name:UIKeyboardWillHideNotification object:nil];
#endif
[center removeObserver:self name:UITextFieldTextDidChangeNotification object:nil];
[center removeObserver:self
name:UITextFieldTextDidChangeNotification
object:nil];
}
/* reveal onscreen virtual keyboard */
@@ -469,12 +478,12 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
}
/* Terminates the editing session */
- (BOOL)textFieldShouldReturn:(UITextField*)_textField
- (BOOL)textFieldShouldReturn:(UITextField *)_textField
{
SDL_SendKeyboardKeyAutoRelease(SDL_SCANCODE_RETURN);
if (keyboardVisible &&
SDL_GetHintBoolean(SDL_HINT_RETURN_KEY_HIDES_IME, SDL_FALSE)) {
SDL_StopTextInput();
SDL_StopTextInput();
}
return YES;
}
@@ -486,8 +495,7 @@ SDL_HideHomeIndicatorHintChanged(void *userdata, const char *name, const char *o
/* iPhone keyboard addition functions */
#if SDL_IPHONE_KEYBOARD
static SDL_uikitviewcontroller *
GetWindowViewController(SDL_Window * window)
static SDL_uikitviewcontroller *GetWindowViewController(SDL_Window *window)
{
if (!window || !window->driverdata) {
SDL_SetError("Invalid window");
@@ -505,8 +513,7 @@ UIKit_HasScreenKeyboardSupport(_THIS)
return SDL_TRUE;
}
void
UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window)
void UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window)
{
@autoreleasepool {
SDL_uikitviewcontroller *vc = GetWindowViewController(window);
@@ -514,8 +521,7 @@ UIKit_ShowScreenKeyboard(_THIS, SDL_Window *window)
}
}
void
UIKit_HideScreenKeyboard(_THIS, SDL_Window *window)
void UIKit_HideScreenKeyboard(_THIS, SDL_Window *window)
{
@autoreleasepool {
SDL_uikitviewcontroller *vc = GetWindowViewController(window);
@@ -535,8 +541,7 @@ UIKit_IsScreenKeyboardShown(_THIS, SDL_Window *window)
}
}
void
UIKit_SetTextInputRect(_THIS, const SDL_Rect *rect)
void UIKit_SetTextInputRect(_THIS, const SDL_Rect *rect)
{
if (!rect) {
SDL_InvalidParamError("rect");
@@ -555,7 +560,6 @@ UIKit_SetTextInputRect(_THIS, const SDL_Rect *rect)
}
}
#endif /* SDL_IPHONE_KEYBOARD */
#endif /* SDL_VIDEO_DRIVER_UIKIT */