Skip to content

Commit

Permalink
cocoa: Reformat all Objective C code with clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@roblillack
roblillack committed May 30, 2024
1 parent 0db2ef7 commit 2755673
Show file tree
Hide file tree
Showing 18 changed files with 588 additions and 520 deletions.
2 changes: 1 addition & 1 deletion ui/internal/cocoa/application.h
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#include <stdint.h>
#import <Cocoa/Cocoa.h>
#include <stdint.h>

void InitSharedApplication();
void RunApplication();
Expand Down
44 changes: 21 additions & 23 deletions ui/internal/cocoa/application.m
View file
Original file line number Diff line number Diff line change
@@ -1,41 +1,39 @@
#import "application.h"
#import "appdelegate.h"
#include "_cgo_export.h"
#import "appdelegate.h"

AppDelegate *gocoa_applicationDelegate = nil;

// InitSharedApplication calls NSApplication.sharedApplication() which initializes the
// global application instance NSApp.
// InitSharedApplication calls NSApplication.sharedApplication() which
// initializes the global application instance NSApp.
void InitSharedApplication() {
static bool hasBeenInitialized = false; // false first time function is called
if (hasBeenInitialized)
return;
[NSApplication sharedApplication];
gocoa_applicationDelegate = [[AppDelegate alloc] init];
[NSApp setDelegate:gocoa_applicationDelegate];
hasBeenInitialized = true;
static bool hasBeenInitialized = false; // false first time function is called
if (hasBeenInitialized)
return;
[NSApplication sharedApplication];
gocoa_applicationDelegate = [[AppDelegate alloc] init];
[NSApp setDelegate:gocoa_applicationDelegate];
hasBeenInitialized = true;
}

void releaseSharedApplication() {
if (gocoa_applicationDelegate != nil) {
[gocoa_applicationDelegate release];
}
if (gocoa_applicationDelegate != nil) {
[gocoa_applicationDelegate release];
}
}

void RunApplication() {
@autoreleasepool {
[NSApp run];
releaseSharedApplication();
}
@autoreleasepool {
[NSApp run];
releaseSharedApplication();
}
}

void TerminateApplication() {
[NSApp terminate:nil];
}
void TerminateApplication() { [NSApp terminate:nil]; }

extern void go_callback(uintptr_t h);
void RunOnMainLoop(uintptr_t h) {
dispatch_async(dispatch_get_main_queue(), ^{
go_callback(h);
});
dispatch_async(dispatch_get_main_queue(), ^{
go_callback(h);
});
}
12 changes: 6 additions & 6 deletions ui/internal/cocoa/button.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@

@interface ButtonHandler : NSObject

@property (assign) int goButtonID;
-(void) buttonClicked:(id) sender;
@property(assign) int goButtonID;
- (void)buttonClicked:(id)sender;

@end

typedef void* ButtonPtr;
typedef void *ButtonPtr;

ButtonPtr Button_New(int goButtonID, int x, int y, int w, int h);
void Button_SetTitle(ButtonPtr btnPtr, const char* title);
void Button_SetTitle(ButtonPtr btnPtr, const char *title);
void Button_Remove(ButtonPtr btnPtr);
const char* Button_Title(ButtonPtr btnPtr);
const char *Button_Title(ButtonPtr btnPtr);
void Button_SetButtonType(ButtonPtr btnPtr, int buttonType);
void Button_SetBezelStyle(ButtonPtr btnPtr, int bezelStyle);
void Button_SetFontFamily(ButtonPtr btnPtr, const char* fontFamily);
void Button_SetFontFamily(ButtonPtr btnPtr, const char *fontFamily);
void Button_SetFontSize(ButtonPtr btnPtr, int fontSize);
void Button_SetColor(ButtonPtr btnPtr, int r, int g, int b, int a);
void Button_SetBackgroundColor(ButtonPtr btnPtr, int r, int g, int b, int a);
Expand Down
140 changes: 77 additions & 63 deletions ui/internal/cocoa/button.m
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,111 +2,125 @@
#include "_cgo_export.h"

@implementation ButtonHandler
-(void) buttonClicked:(id) sender
{
onButtonClicked([self goButtonID]);
- (void)buttonClicked:(id)sender {
onButtonClicked([self goButtonID]);
}
@end

ButtonPtr Button_New(int goButtonID, int x, int y, int w, int h) {
id nsButton = [[[NSButton alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease];
ButtonHandler* handler = [[ButtonHandler alloc] init];
[handler setGoButtonID:goButtonID];
[nsButton setTarget:handler];
[nsButton setAction:@selector(buttonClicked:)];
id nsButton =
[[[NSButton alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease];
ButtonHandler *handler = [[ButtonHandler alloc] init];
[handler setGoButtonID:goButtonID];
[nsButton setTarget:handler];
[nsButton setAction:@selector(buttonClicked:)];

[nsButton setButtonType:NSButtonTypeMomentaryLight];
[nsButton setBezelStyle:NSBezelStyleRounded];
[nsButton setButtonType:NSButtonTypeMomentaryLight];
[nsButton setBezelStyle:NSBezelStyleRounded];

return (ButtonPtr)nsButton;
return (ButtonPtr)nsButton;
}

void Button_SetTitle(ButtonPtr btnPtr, const char* title) {
NSButton* button = (NSButton*)btnPtr;
[button setTitle:[NSString stringWithUTF8String:title]];
void Button_SetTitle(ButtonPtr btnPtr, const char *title) {
NSButton *button = (NSButton *)btnPtr;
[button setTitle:[NSString stringWithUTF8String:title]];
}

void Button_Remove(ButtonPtr btnPtr) {
NSButton* button = (NSButton*)btnPtr;
[button removeFromSuperview];
[[button target] release];
NSButton *button = (NSButton *)btnPtr;
[button removeFromSuperview];
[[button target] release];
}

const char* Button_Title(ButtonPtr btnPtr) {
NSButton* button = (NSButton*)btnPtr;
return [[button title] cStringUsingEncoding:NSASCIIStringEncoding];
const char *Button_Title(ButtonPtr btnPtr) {
NSButton *button = (NSButton *)btnPtr;
return [[button title] cStringUsingEncoding:NSASCIIStringEncoding];
}

void Button_SetButtonType(ButtonPtr btnPtr, int buttonType) {
NSButton* button = (NSButton*)btnPtr;
[button setButtonType:buttonType];
NSButton *button = (NSButton *)btnPtr;
[button setButtonType:buttonType];
}

void Button_SetBezelStyle(ButtonPtr btnPtr, int bezelStyle) {
NSButton* button = (NSButton*)btnPtr;
[button setBezelStyle:bezelStyle];
NSButton *button = (NSButton *)btnPtr;
[button setBezelStyle:bezelStyle];
}

void Button_SetFontFamily(ButtonPtr btnPtr, const char* fontFamily) {
NSButton* button = (NSButton*)btnPtr;
button.font = [NSFont fontWithName:[NSString stringWithUTF8String:fontFamily] size:button.font.pointSize];
void Button_SetFontFamily(ButtonPtr btnPtr, const char *fontFamily) {
NSButton *button = (NSButton *)btnPtr;
button.font = [NSFont fontWithName:[NSString stringWithUTF8String:fontFamily]
size:button.font.pointSize];
}

void Button_SetFontSize(ButtonPtr btnPtr, int fontSize) {
NSButton* button = (NSButton*)btnPtr;
button.font = [NSFont fontWithName:button.font.fontName size:fontSize];
NSButton *button = (NSButton *)btnPtr;
button.font = [NSFont fontWithName:button.font.fontName size:fontSize];
}

void Button_SetColor(ButtonPtr btnPtr, int r, int g, int b, int a) {
NSButton* button = (NSButton*)btnPtr;
NSMutableAttributedString *attrTitle =[[NSMutableAttributedString alloc] initWithString:[NSString stringWithUTF8String:Button_Title(btnPtr)]];
NSUInteger len = [attrTitle length];
NSRange range = NSMakeRange(0, len);
[attrTitle addAttribute:NSForegroundColorAttributeName value:[NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f] range:range];
[attrTitle addAttribute:NSFontAttributeName value:button.font range:range];
[attrTitle fixAttributesInRange:range];
[button setAttributedTitle:attrTitle];
NSButton *button = (NSButton *)btnPtr;
NSMutableAttributedString *attrTitle = [[NSMutableAttributedString alloc]
initWithString:[NSString stringWithUTF8String:Button_Title(btnPtr)]];
NSUInteger len = [attrTitle length];
NSRange range = NSMakeRange(0, len);
[attrTitle addAttribute:NSForegroundColorAttributeName
value:[NSColor colorWithCalibratedRed:r / 255.f
green:g / 255.f
blue:b / 255.f
alpha:a / 255.f]
range:range];
[attrTitle addAttribute:NSFontAttributeName value:button.font range:range];
[attrTitle fixAttributesInRange:range];
[button setAttributedTitle:attrTitle];
}

void Button_SetBackgroundColor(ButtonPtr btnPtr, int r, int g, int b, int a) {
NSButton* button = (NSButton*)btnPtr;
[button setBordered:false]; // required, otherwise can't set background
[[button cell] setBackgroundColor:[NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f]];
NSButton *button = (NSButton *)btnPtr;
[button setBordered:false]; // required, otherwise can't set background
[[button cell] setBackgroundColor:[NSColor colorWithCalibratedRed:r / 255.f
green:g / 255.f
blue:b / 255.f
alpha:a / 255.f]];
}

void Button_SetBorderColor(ButtonPtr btnPtr, int r, int g, int b, int a) {
NSButton* button = (NSButton*)btnPtr;
button.wantsLayer = true;
button.layer.borderColor = [[NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f] CGColor];
NSButton *button = (NSButton *)btnPtr;
button.wantsLayer = true;
button.layer.borderColor =
[[NSColor colorWithCalibratedRed:r / 255.f
green:g / 255.f
blue:b / 255.f
alpha:a / 255.f] CGColor];
}

void Button_SetBorderWidth(ButtonPtr btnPtr, int borderWidth) {
NSButton* button = (NSButton*)btnPtr;
button.wantsLayer = true;
button.layer.borderWidth = borderWidth;
NSButton *button = (NSButton *)btnPtr;
button.wantsLayer = true;
button.layer.borderWidth = borderWidth;
}

void Button_SetState(ButtonPtr btnPtr, int state) {
NSButton* button = (NSButton*)btnPtr;
button.wantsLayer = true;
if(state == 0) {
button.state = NSControlStateValueOff;
} else if(state == 1) {
button.state = NSControlStateValueOn;
} else {
button.state = NSControlStateValueMixed;
}
NSButton *button = (NSButton *)btnPtr;
button.wantsLayer = true;
if (state == 0) {
button.state = NSControlStateValueOff;
} else if (state == 1) {
button.state = NSControlStateValueOn;
} else {
button.state = NSControlStateValueMixed;
}
}

int Button_State(ButtonPtr btnPtr) {
NSButton* button = (NSButton*)btnPtr;
if(button.state == NSControlStateValueOn) {
return 1;
} else if(button.state == NSControlStateValueOff) {
return 0;
} else {
return 3;
}
NSButton *button = (NSButton *)btnPtr;
if (button.state == NSControlStateValueOn) {
return 1;
} else if (button.state == NSControlStateValueOff) {
return 0;
} else {
return 3;
}
}

void Button_SetImage(ButtonPtr ptr, ImagePtr imagePtr) {
Expand Down
20 changes: 10 additions & 10 deletions ui/internal/cocoa/combobox.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,23 @@

// typedef void (*callback)(void);

@interface ComboBoxHandler : NSObject<NSComboBoxDelegate>
@interface ComboBoxHandler : NSObject <NSComboBoxDelegate>

@property (assign) int goComboBoxID;
-(void) comboBoxSelectionDidChange:(id) sender;
@property(assign) int goComboBoxID;
- (void)comboBoxSelectionDidChange:(id)sender;

@end

typedef void* ComboBoxPtr;
typedef void *ComboBoxPtr;

ComboBoxPtr ComboBox_New(int goComboBoxID, int x, int y, int w, int h);
void ComboBox_AddItem(ComboBoxPtr comboBoxPtr, const char* item);
void ComboBox_AddItem(ComboBoxPtr comboBoxPtr, const char *item);
void ComboBox_SetEditable(ComboBoxPtr comboBoxPtr, int editable);
void ComboBox_SetSelectedIndex(ComboBoxPtr comboBoxPtr, int selectedIndex);
void ComboBox_SetSelectedText(ComboBoxPtr comboBoxPtr, const char* selectedText);
void ComboBox_SetStringValue(ComboBoxPtr comboBoxPtr, const char* stringValue);
void ComboBox_SetSelectedText(ComboBoxPtr comboBoxPtr,
const char *selectedText);
void ComboBox_SetStringValue(ComboBoxPtr comboBoxPtr, const char *stringValue);
int ComboBox_SelectedIndex(ComboBoxPtr comboBoxPtr);
const char* ComboBox_SelectedText(ComboBoxPtr comboBoxPtr);
const char* ComboBox_StringValue(ComboBoxPtr comboBoxPtr);
const char *ComboBox_SelectedText(ComboBoxPtr comboBoxPtr);
const char *ComboBox_StringValue(ComboBoxPtr comboBoxPtr);
void ComboBox_Remove(ComboBoxPtr comboBoxPtr);

Loading

0 comments on commit 2755673

Please sign in to comment.