From 2755673b51bd73f5b239b077b99d6985ea9b5dd0 Mon Sep 17 00:00:00 2001 From: Robert Lillack Date: Thu, 30 May 2024 18:11:58 +0200 Subject: [PATCH] cocoa: Reformat all Objective C code with `clang-format` --- ui/internal/cocoa/application.h | 2 +- ui/internal/cocoa/application.m | 44 ++-- ui/internal/cocoa/button.h | 12 +- ui/internal/cocoa/button.m | 140 +++++++------ ui/internal/cocoa/combobox.h | 20 +- ui/internal/cocoa/combobox.m | 73 +++---- ui/internal/cocoa/datepicker.h | 16 +- ui/internal/cocoa/datepicker.m | 76 ++++--- ui/internal/cocoa/flippedview.m | 5 +- ui/internal/cocoa/progressIndicator.h | 23 +- ui/internal/cocoa/progressIndicator.m | 171 ++++++++------- ui/internal/cocoa/slider.h | 6 +- ui/internal/cocoa/slider.m | 44 ++-- ui/internal/cocoa/textfield.h | 22 +- ui/internal/cocoa/textfield.m | 143 +++++++------ ui/internal/cocoa/window.h | 15 +- ui/internal/cocoa/window.m | 291 +++++++++++++------------- ui/internal/cocoa/windowdelegate.h | 5 +- 18 files changed, 588 insertions(+), 520 deletions(-) diff --git a/ui/internal/cocoa/application.h b/ui/internal/cocoa/application.h index 876e7fb..d474b14 100644 --- a/ui/internal/cocoa/application.h +++ b/ui/internal/cocoa/application.h @@ -1,5 +1,5 @@ -#include #import +#include void InitSharedApplication(); void RunApplication(); diff --git a/ui/internal/cocoa/application.m b/ui/internal/cocoa/application.m index 572b03b..f1c26d4 100644 --- a/ui/internal/cocoa/application.m +++ b/ui/internal/cocoa/application.m @@ -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); + }); } \ No newline at end of file diff --git a/ui/internal/cocoa/button.h b/ui/internal/cocoa/button.h index fa0a796..173abf3 100644 --- a/ui/internal/cocoa/button.h +++ b/ui/internal/cocoa/button.h @@ -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); diff --git a/ui/internal/cocoa/button.m b/ui/internal/cocoa/button.m index 1ba6bee..5daf52e 100644 --- a/ui/internal/cocoa/button.m +++ b/ui/internal/cocoa/button.m @@ -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) { diff --git a/ui/internal/cocoa/combobox.h b/ui/internal/cocoa/combobox.h index b29163a..453e084 100644 --- a/ui/internal/cocoa/combobox.h +++ b/ui/internal/cocoa/combobox.h @@ -2,23 +2,23 @@ // typedef void (*callback)(void); -@interface ComboBoxHandler : NSObject +@interface ComboBoxHandler : NSObject -@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); - diff --git a/ui/internal/cocoa/combobox.m b/ui/internal/cocoa/combobox.m index 2f96606..307d54f 100644 --- a/ui/internal/cocoa/combobox.m +++ b/ui/internal/cocoa/combobox.m @@ -2,65 +2,68 @@ #include "_cgo_export.h" @implementation ComboBoxHandler --(void) comboBoxSelectionDidChange:(id) sender -{ - onSelectionDidChange([self goComboBoxID]); +- (void)comboBoxSelectionDidChange:(id)sender { + onSelectionDidChange([self goComboBoxID]); } @end - ComboBoxPtr ComboBox_New(int goComboBoxID, int x, int y, int w, int h) { - id nsComboBox = [[[NSComboBox alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; - ComboBoxHandler* handler = [[ComboBoxHandler alloc] init]; - [handler setGoComboBoxID:goComboBoxID]; - [nsComboBox setDelegate:handler]; - [nsComboBox setTarget:handler]; - [nsComboBox setAction:@selector(comboBoxSelectionDidChange:)]; - return (ComboBoxPtr)nsComboBox; + id nsComboBox = + [[[NSComboBox alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; + ComboBoxHandler *handler = [[ComboBoxHandler alloc] init]; + [handler setGoComboBoxID:goComboBoxID]; + [nsComboBox setDelegate:handler]; + [nsComboBox setTarget:handler]; + [nsComboBox setAction:@selector(comboBoxSelectionDidChange:)]; + return (ComboBoxPtr)nsComboBox; } -void ComboBox_AddItem(ComboBoxPtr comboBoxPtr, const char* item) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox addItemWithObjectValue:[NSString stringWithUTF8String:item]]; +void ComboBox_AddItem(ComboBoxPtr comboBoxPtr, const char *item) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox addItemWithObjectValue:[NSString stringWithUTF8String:item]]; } void ComboBox_SetEditable(ComboBoxPtr comboBoxPtr, int editable) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox setEditable:editable]; + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox setEditable:editable]; } int ComboBox_SelectedIndex(ComboBoxPtr comboBoxPtr) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - return (int)[comboBox indexOfSelectedItem]; + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + return (int)[comboBox indexOfSelectedItem]; } -const char* ComboBox_SelectedText(ComboBoxPtr comboBoxPtr) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - return [[comboBox itemObjectValueAtIndex:[comboBox indexOfSelectedItem]] cStringUsingEncoding:NSISOLatin1StringEncoding]; +const char *ComboBox_SelectedText(ComboBoxPtr comboBoxPtr) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + return [[comboBox itemObjectValueAtIndex:[comboBox indexOfSelectedItem]] + cStringUsingEncoding:NSISOLatin1StringEncoding]; } void ComboBox_SetSelectedIndex(ComboBoxPtr comboBoxPtr, int selectedIndex) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox selectItemAtIndex:selectedIndex]; + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox selectItemAtIndex:selectedIndex]; } -void ComboBox_SetSelectedText(ComboBoxPtr comboBoxPtr, const char* selectedText) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox selectItemWithObjectValue:[NSString stringWithUTF8String:selectedText]]; +void ComboBox_SetSelectedText(ComboBoxPtr comboBoxPtr, + const char *selectedText) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox + selectItemWithObjectValue:[NSString stringWithUTF8String:selectedText]]; } -void ComboBox_SetStringValue(ComboBoxPtr comboBoxPtr, const char* stringValue) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox setStringValue:[NSString stringWithUTF8String:stringValue]]; +void ComboBox_SetStringValue(ComboBoxPtr comboBoxPtr, const char *stringValue) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox setStringValue:[NSString stringWithUTF8String:stringValue]]; } -const char* ComboBox_StringValue(ComboBoxPtr comboBoxPtr) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - return [[comboBox stringValue] cStringUsingEncoding:NSISOLatin1StringEncoding]; +const char *ComboBox_StringValue(ComboBoxPtr comboBoxPtr) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + return + [[comboBox stringValue] cStringUsingEncoding:NSISOLatin1StringEncoding]; } void ComboBox_Remove(ComboBoxPtr comboBoxPtr) { - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - [comboBox removeFromSuperview]; - [[comboBox target] release]; + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + [comboBox removeFromSuperview]; + [[comboBox target] release]; } \ No newline at end of file diff --git a/ui/internal/cocoa/datepicker.h b/ui/internal/cocoa/datepicker.h index 5719073..3e15611 100644 --- a/ui/internal/cocoa/datepicker.h +++ b/ui/internal/cocoa/datepicker.h @@ -4,17 +4,21 @@ @interface DatePickerHandler : NSObject -@property (assign) int goDatePickerID; +@property(assign) int goDatePickerID; @end -typedef void* DatePickerPtr; +typedef void *DatePickerPtr; DatePickerPtr DatePicker_New(int goDatePickerID, int x, int y, int w, int h); void DatePicker_SetStyle(DatePickerPtr datePickerPtr, int style); void DatePicker_SetMode(DatePickerPtr datePickerPtr, int mode); -void DatePicker_SetDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat); -void DatePicker_SetMinimumDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat); -void DatePicker_SetMaximumDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat); -const char* DatePicker_Date(DatePickerPtr datePickerPtr, const char* dateFormat); +void DatePicker_SetDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat); +void DatePicker_SetMinimumDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat); +void DatePicker_SetMaximumDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat); +const char *DatePicker_Date(DatePickerPtr datePickerPtr, + const char *dateFormat); void DatePicker_Remove(DatePickerPtr datePickerPtr); diff --git a/ui/internal/cocoa/datepicker.m b/ui/internal/cocoa/datepicker.m index ffbf2c4..207acd0 100644 --- a/ui/internal/cocoa/datepicker.m +++ b/ui/internal/cocoa/datepicker.m @@ -1,63 +1,71 @@ -#import "textfield.h" #include "_cgo_export.h" +#import "textfield.h" @implementation DatePickerHandler @end DatePickerPtr DatePicker_New(int goDatePickerId, int x, int y, int w, int h) { - id nsDatePicker = [[[NSDatePicker alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; + id nsDatePicker = + [[[NSDatePicker alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; - return (DatePickerPtr)nsDatePicker; + return (DatePickerPtr)nsDatePicker; } void DatePicker_SetStyle(DatePickerPtr datePickerPtr, int style) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - [datePicker setDatePickerStyle:style]; + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + [datePicker setDatePickerStyle:style]; } void DatePicker_SetMode(DatePickerPtr datePickerPtr, int mode) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - [datePicker setDatePickerMode:mode]; + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + [datePicker setDatePickerMode:mode]; } -void DatePicker_SetDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; - NSDate *formattedDate = [dateFormatter dateFromString: [NSString stringWithUTF8String:date]]; +void DatePicker_SetDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat) { + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; + NSDate *formattedDate = + [dateFormatter dateFromString:[NSString stringWithUTF8String:date]]; - [datePicker setDateValue:formattedDate]; + [datePicker setDateValue:formattedDate]; } -void DatePicker_SetMinimumDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; - NSDate *formattedDate = [dateFormatter dateFromString: [NSString stringWithUTF8String:date]]; +void DatePicker_SetMinimumDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat) { + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; + NSDate *formattedDate = + [dateFormatter dateFromString:[NSString stringWithUTF8String:date]]; - [datePicker setMinDate:formattedDate]; + [datePicker setMinDate:formattedDate]; } -void DatePicker_SetMaximumDate(DatePickerPtr datePickerPtr, const char* date, const char* dateFormat) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; - NSDate *formattedDate = [dateFormatter dateFromString: [NSString stringWithUTF8String:date]]; +void DatePicker_SetMaximumDate(DatePickerPtr datePickerPtr, const char *date, + const char *dateFormat) { + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; + NSDate *formattedDate = + [dateFormatter dateFromString:[NSString stringWithUTF8String:date]]; - [datePicker setMaxDate:formattedDate]; + [datePicker setMaxDate:formattedDate]; } -const char* DatePicker_Date(DatePickerPtr datePickerPtr, const char* dateFormat) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; - dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; +const char *DatePicker_Date(DatePickerPtr datePickerPtr, + const char *dateFormat) { + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + NSDateFormatter *dateFormatter = [[NSDateFormatter alloc] init]; + dateFormatter.dateFormat = [NSString stringWithUTF8String:dateFormat]; - NSDate *selectedDate = datePicker.dateValue; - NSString *stringFromDate = [dateFormatter stringFromDate:selectedDate]; - return [stringFromDate cStringUsingEncoding:NSASCIIStringEncoding]; + NSDate *selectedDate = datePicker.dateValue; + NSString *stringFromDate = [dateFormatter stringFromDate:selectedDate]; + return [stringFromDate cStringUsingEncoding:NSASCIIStringEncoding]; } void DatePicker_Remove(DatePickerPtr datePickerPtr) { - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - [datePicker removeFromSuperview]; + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + [datePicker removeFromSuperview]; } \ No newline at end of file diff --git a/ui/internal/cocoa/flippedview.m b/ui/internal/cocoa/flippedview.m index 8b15aa0..6a6370b 100644 --- a/ui/internal/cocoa/flippedview.m +++ b/ui/internal/cocoa/flippedview.m @@ -2,9 +2,8 @@ @implementation FlippedView -- (BOOL) isFlipped -{ - return YES; +- (BOOL)isFlipped { + return YES; } @end \ No newline at end of file diff --git a/ui/internal/cocoa/progressIndicator.h b/ui/internal/cocoa/progressIndicator.h index 0b83d8e..9f1af10 100644 --- a/ui/internal/cocoa/progressIndicator.h +++ b/ui/internal/cocoa/progressIndicator.h @@ -2,25 +2,32 @@ // typedef void (*callback)(void); -typedef void* ProgressIndicatorPtr; +typedef void *ProgressIndicatorPtr; ProgressIndicatorPtr ProgressIndicator_New(int x, int y, int width, int height); -void ProgressIndicator_StartAnimation(ProgressIndicatorPtr progressIndicatorPtr); +void ProgressIndicator_StartAnimation( + ProgressIndicatorPtr progressIndicatorPtr); void ProgressIndicator_StopAnimation(ProgressIndicatorPtr progressIndicatorPtr); -void ProgressIndicator_SetLimits(ProgressIndicatorPtr progressIndicatorPtr, double minValue, double maxValue); +void ProgressIndicator_SetLimits(ProgressIndicatorPtr progressIndicatorPtr, + double minValue, double maxValue); -void ProgressIndicator_SetValue(ProgressIndicatorPtr progressIndicatorPtr, double value); +void ProgressIndicator_SetValue(ProgressIndicatorPtr progressIndicatorPtr, + double value); -void ProgressIndicator_IncrementBy(ProgressIndicatorPtr progressIndicatorPtr, double value); +void ProgressIndicator_IncrementBy(ProgressIndicatorPtr progressIndicatorPtr, + double value); -void ProgressIndicator_SetIsIndeterminate(ProgressIndicatorPtr progressIndicatorPtr, int value); +void ProgressIndicator_SetIsIndeterminate( + ProgressIndicatorPtr progressIndicatorPtr, int value); -int ProgressIndicator_IsIndeterminate(ProgressIndicatorPtr progressIndicatorPtr); +int ProgressIndicator_IsIndeterminate( + ProgressIndicatorPtr progressIndicatorPtr); -void ProgressIndicator_SetDisplayedWhenStopped(ProgressIndicatorPtr progressIndicatorPtr, int value); +void ProgressIndicator_SetDisplayedWhenStopped( + ProgressIndicatorPtr progressIndicatorPtr, int value); void ProgressIndicator_Show(ProgressIndicatorPtr progressIndicatorPtr); diff --git a/ui/internal/cocoa/progressIndicator.m b/ui/internal/cocoa/progressIndicator.m index d342017..5744bd0 100644 --- a/ui/internal/cocoa/progressIndicator.m +++ b/ui/internal/cocoa/progressIndicator.m @@ -1,106 +1,117 @@ #import "progressIndicator.h" #include "_cgo_export.h" -ProgressIndicatorPtr ProgressIndicator_New(int x, int y, int width, int height) { - id nsProgressIndicator = [[NSProgressIndicator alloc] init]; - [nsProgressIndicator setFrame: NSMakeRect(x, y, width, height)]; - //[nsProgressIndicator setBounds: NSMakeRect(x, y, width, height)]; - [nsProgressIndicator setUsesThreadedAnimation:YES]; - [nsProgressIndicator autorelease]; - return (ProgressIndicatorPtr)nsProgressIndicator; +ProgressIndicatorPtr ProgressIndicator_New(int x, int y, int width, + int height) { + id nsProgressIndicator = [[NSProgressIndicator alloc] init]; + [nsProgressIndicator setFrame:NSMakeRect(x, y, width, height)]; + //[nsProgressIndicator setBounds: NSMakeRect(x, y, width, height)]; + [nsProgressIndicator setUsesThreadedAnimation:YES]; + [nsProgressIndicator autorelease]; + return (ProgressIndicatorPtr)nsProgressIndicator; } -void ProgressIndicator_StartAnimation(ProgressIndicatorPtr progressIndicatorPtr) -{ - dispatch_async(dispatch_get_main_queue(), ^{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - [progressIndicator startAnimation:nil]; - [progressIndicator setNeedsDisplay:YES]; - }); +void ProgressIndicator_StartAnimation( + ProgressIndicatorPtr progressIndicatorPtr) { + dispatch_async(dispatch_get_main_queue(), ^{ + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + [progressIndicator startAnimation:nil]; + [progressIndicator setNeedsDisplay:YES]; + }); } -void ProgressIndicator_StopAnimation(ProgressIndicatorPtr progressIndicatorPtr) -{ - dispatch_async(dispatch_get_main_queue(), ^{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - [progressIndicator stopAnimation:nil]; - [progressIndicator setNeedsDisplay:YES]; - }); +void ProgressIndicator_StopAnimation( + ProgressIndicatorPtr progressIndicatorPtr) { + dispatch_async(dispatch_get_main_queue(), ^{ + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + [progressIndicator stopAnimation:nil]; + [progressIndicator setNeedsDisplay:YES]; + }); } -void ProgressIndicator_SetLimits(ProgressIndicatorPtr progressIndicatorPtr, double minValue, double maxValue) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - [progressIndicator setMinValue:minValue]; - [progressIndicator setMaxValue:maxValue]; +void ProgressIndicator_SetLimits(ProgressIndicatorPtr progressIndicatorPtr, + double minValue, double maxValue) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + [progressIndicator setMinValue:minValue]; + [progressIndicator setMaxValue:maxValue]; } -void ProgressIndicator_SetValue(ProgressIndicatorPtr progressIndicatorPtr, double value) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - dispatch_async(dispatch_get_main_queue(), ^{ - [progressIndicator setDoubleValue:value]; - // NSLog(@"progressIndicator value is %.2f", value); - [progressIndicator setNeedsDisplay:YES]; - }); +void ProgressIndicator_SetValue(ProgressIndicatorPtr progressIndicatorPtr, + double value) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + dispatch_async(dispatch_get_main_queue(), ^{ + [progressIndicator setDoubleValue:value]; + // NSLog(@"progressIndicator value is %.2f", value); + [progressIndicator setNeedsDisplay:YES]; + }); } -void ProgressIndicator_IncrementBy(ProgressIndicatorPtr progressIndicatorPtr, double value) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - dispatch_async(dispatch_get_main_queue(), ^{ - [progressIndicator incrementBy:value]; - NSLog(@"increasing progressIndicator value by %.2f", value); - [progressIndicator setNeedsDisplay:YES]; - }); +void ProgressIndicator_IncrementBy(ProgressIndicatorPtr progressIndicatorPtr, + double value) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + dispatch_async(dispatch_get_main_queue(), ^{ + [progressIndicator incrementBy:value]; + NSLog(@"increasing progressIndicator value by %.2f", value); + [progressIndicator setNeedsDisplay:YES]; + }); } -void ProgressIndicator_SetIsIndeterminate(ProgressIndicatorPtr progressIndicatorPtr, int value) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - if(value > 0) { - [progressIndicator setIndeterminate: YES]; - } else { - [progressIndicator setIndeterminate: NO]; - } +void ProgressIndicator_SetIsIndeterminate( + ProgressIndicatorPtr progressIndicatorPtr, int value) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + if (value > 0) { + [progressIndicator setIndeterminate:YES]; + } else { + [progressIndicator setIndeterminate:NO]; + } } -int ProgressIndicator_IsIndeterminate(ProgressIndicatorPtr progressIndicatorPtr) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - if ([progressIndicator isIndeterminate]) { - return 1; - } - return 0; +int ProgressIndicator_IsIndeterminate( + ProgressIndicatorPtr progressIndicatorPtr) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + if ([progressIndicator isIndeterminate]) { + return 1; + } + return 0; } -void ProgressIndicator_SetDisplayedWhenStopped(ProgressIndicatorPtr progressIndicatorPtr, int value) { - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - if(value > 0) { - [progressIndicator setDisplayedWhenStopped: YES]; - } else { - [progressIndicator setDisplayedWhenStopped: NO]; - } +void ProgressIndicator_SetDisplayedWhenStopped( + ProgressIndicatorPtr progressIndicatorPtr, int value) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + if (value > 0) { + [progressIndicator setDisplayedWhenStopped:YES]; + } else { + [progressIndicator setDisplayedWhenStopped:NO]; + } } -void ProgressIndicator_Show(ProgressIndicatorPtr progressIndicatorPtr) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - dispatch_async(dispatch_get_main_queue(), ^{ - progressIndicator.hidden = NO; - }); +void ProgressIndicator_Show(ProgressIndicatorPtr progressIndicatorPtr) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + dispatch_async(dispatch_get_main_queue(), ^{ + progressIndicator.hidden = NO; + }); } -void ProgressIndicator_Hide(ProgressIndicatorPtr progressIndicatorPtr){ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - [NSThread sleepForTimeInterval:1.0]; - dispatch_async(dispatch_get_main_queue(), ^{ - progressIndicator.hidden = YES; - }); +void ProgressIndicator_Hide(ProgressIndicatorPtr progressIndicatorPtr) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + [NSThread sleepForTimeInterval:1.0]; + dispatch_async(dispatch_get_main_queue(), ^{ + progressIndicator.hidden = YES; + }); } -void ProgressIndicator_Remove(ProgressIndicatorPtr progressIndicatorPtr) -{ - NSProgressIndicator* progressIndicator = (NSProgressIndicator*)progressIndicatorPtr; - [progressIndicator removeFromSuperview]; +void ProgressIndicator_Remove(ProgressIndicatorPtr progressIndicatorPtr) { + NSProgressIndicator *progressIndicator = + (NSProgressIndicator *)progressIndicatorPtr; + [progressIndicator removeFromSuperview]; } diff --git a/ui/internal/cocoa/slider.h b/ui/internal/cocoa/slider.h index 01369cd..2504a3b 100644 --- a/ui/internal/cocoa/slider.h +++ b/ui/internal/cocoa/slider.h @@ -4,12 +4,12 @@ @interface SliderHandler : NSObject -@property (assign) int goSliderID; --(void) sliderValueChanged:(id) sender; +@property(assign) int goSliderID; +- (void)sliderValueChanged:(id)sender; @end -typedef void* SliderPtr; +typedef void *SliderPtr; SliderPtr Slider_New(int goSliderID, int x, int y, int w, int h); void Slider_SetMaximumValue(SliderPtr sliderPtr, double val); diff --git a/ui/internal/cocoa/slider.m b/ui/internal/cocoa/slider.m index 425086a..22b0298 100644 --- a/ui/internal/cocoa/slider.m +++ b/ui/internal/cocoa/slider.m @@ -2,50 +2,50 @@ #include "_cgo_export.h" @implementation SliderHandler --(void) sliderValueChanged:(id) sender -{ - onSliderValueChanged([self goSliderID]); +- (void)sliderValueChanged:(id)sender { + onSliderValueChanged([self goSliderID]); } @end SliderPtr Slider_New(int goSliderID, int x, int y, int w, int h) { - id nsSlider = [[[NSSlider alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; + id nsSlider = + [[[NSSlider alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; - SliderHandler* handler = [[SliderHandler alloc] init]; - [handler setGoSliderID:goSliderID]; - [nsSlider setTarget:handler]; - [nsSlider setAction:@selector(sliderValueChanged:)]; + SliderHandler *handler = [[SliderHandler alloc] init]; + [handler setGoSliderID:goSliderID]; + [nsSlider setTarget:handler]; + [nsSlider setAction:@selector(sliderValueChanged:)]; - return (SliderPtr)nsSlider; + return (SliderPtr)nsSlider; } void Slider_SetMaximumValue(SliderPtr sliderPtr, double val) { - NSSlider* slider = (NSSlider*)sliderPtr; - [slider setMaxValue:val]; + NSSlider *slider = (NSSlider *)sliderPtr; + [slider setMaxValue:val]; } void Slider_SetMinimumValue(SliderPtr sliderPtr, double val) { - NSSlider* slider = (NSSlider*)sliderPtr; - [slider setMinValue:val]; + NSSlider *slider = (NSSlider *)sliderPtr; + [slider setMinValue:val]; } void Slider_SetValue(SliderPtr sliderPtr, double val) { - NSSlider* slider = (NSSlider*)sliderPtr; - [slider setDoubleValue:val]; + NSSlider *slider = (NSSlider *)sliderPtr; + [slider setDoubleValue:val]; } double Slider_Value(SliderPtr sliderPtr) { - NSSlider* slider = (NSSlider*)sliderPtr; - return slider.doubleValue; + NSSlider *slider = (NSSlider *)sliderPtr; + return slider.doubleValue; } void Slider_SetSliderType(SliderPtr sliderPtr, int sliderType) { - NSSlider* slider = (NSSlider*)sliderPtr; - [slider setSliderType:sliderType]; + NSSlider *slider = (NSSlider *)sliderPtr; + [slider setSliderType:sliderType]; } void Slider_Remove(SliderPtr sliderPtr) { - NSSlider* slider = (NSSlider*)sliderPtr; - [slider removeFromSuperview]; - [[slider target] release]; + NSSlider *slider = (NSSlider *)sliderPtr; + [slider removeFromSuperview]; + [[slider target] release]; } \ No newline at end of file diff --git a/ui/internal/cocoa/textfield.h b/ui/internal/cocoa/textfield.h index 315cafa..7824925 100644 --- a/ui/internal/cocoa/textfield.h +++ b/ui/internal/cocoa/textfield.h @@ -4,29 +4,33 @@ @interface TextFieldHandler : NSObject -@property (assign) int goTextFieldId; +@property(assign) int goTextFieldId; @end -typedef void* TextFieldPtr; +typedef void *TextFieldPtr; TextFieldPtr TextField_New(int goTextFieldId, int x, int y, int w, int h); -const char* TextField_StringValue(TextFieldPtr textFieldPtr); -void TextField_SetStringValue(TextFieldPtr textFieldPtr, const char* text); +const char *TextField_StringValue(TextFieldPtr textFieldPtr); +void TextField_SetStringValue(TextFieldPtr textFieldPtr, const char *text); void TextField_Remove(TextFieldPtr textFieldPtr); const int TextField_Enabled(TextFieldPtr textFieldPtr); void TextField_SetEnabled(TextFieldPtr textFieldPtr, int enabled); const int TextField_Editable(TextFieldPtr textFieldPtr); void TextField_SetEditable(TextFieldPtr textFieldPtr, int editable); -void TextField_SetFontFamily(TextFieldPtr textFieldPtr, const char* fontFamily); +void TextField_SetFontFamily(TextFieldPtr textFieldPtr, const char *fontFamily); void TextField_SetFontSize(TextFieldPtr textFieldPtr, const int fontSize); -void TextField_SetColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a); -void TextField_SetBackgroundColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a); -void TextField_SetBorderColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a); +void TextField_SetColor(TextFieldPtr textFieldPtr, const int r, const int g, + const int b, const int a); +void TextField_SetBackgroundColor(TextFieldPtr textFieldPtr, const int r, + const int g, const int b, const int a); +void TextField_SetBorderColor(TextFieldPtr textFieldPtr, const int r, + const int g, const int b, const int a); void TextField_SetBorderWidth(TextFieldPtr textFieldPtr, const int borderWidth); void TextField_SetBezeled(TextFieldPtr textFieldPtr, const int bezeled); -void TextField_SetDrawsBackground(TextFieldPtr textFieldPtr, const int drawsBackground); +void TextField_SetDrawsBackground(TextFieldPtr textFieldPtr, + const int drawsBackground); void TextField_SetSelectable(TextFieldPtr textFieldPtr, const int selectable); void TextField_SetAlignmentCenter(TextFieldPtr textFieldPtr); void TextField_SetAlignmentLeft(TextFieldPtr textFieldPtr); diff --git a/ui/internal/cocoa/textfield.m b/ui/internal/cocoa/textfield.m index 697e2d9..2cd0aba 100644 --- a/ui/internal/cocoa/textfield.m +++ b/ui/internal/cocoa/textfield.m @@ -1,121 +1,140 @@ #import "textfield.h" -#import "textfielddelegate.h" #include "_cgo_export.h" +#import "textfielddelegate.h" @implementation TextFieldHandler @end TextFieldPtr TextField_New(int goTextFieldId, int x, int y, int w, int h) { - /* create the NSTextField and add it to the window */ - id nsTextField = [[[NSTextField alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; + /* create the NSTextField and add it to the window */ + id nsTextField = + [[[NSTextField alloc] initWithFrame:NSMakeRect(x, y, w, h)] autorelease]; - id d = [[TextFieldDelegate alloc] init]; - [d setGoTextFieldId:goTextFieldId]; - [nsTextField setDelegate:d]; + id d = [[TextFieldDelegate alloc] init]; + [d setGoTextFieldId:goTextFieldId]; + [nsTextField setDelegate:d]; - return (TextFieldPtr)nsTextField; + return (TextFieldPtr)nsTextField; } -const char* TextField_StringValue(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - return [[textField stringValue] cStringUsingEncoding:NSISOLatin1StringEncoding]; +const char *TextField_StringValue(TextFieldPtr textFieldPtr) { + NSTextField *textField = (NSTextField *)textFieldPtr; + return + [[textField stringValue] cStringUsingEncoding:NSISOLatin1StringEncoding]; } -void TextField_SetStringValue(TextFieldPtr textFieldPtr, const char* text) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setStringValue:[NSString stringWithUTF8String:text]]; +void TextField_SetStringValue(TextFieldPtr textFieldPtr, const char *text) { + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setStringValue:[NSString stringWithUTF8String:text]]; } void TextField_Remove(TextFieldPtr textFieldPtr) { - NSTextField* tf = (NSTextField*)textFieldPtr; - [tf removeFromSuperview]; - [[tf delegate] release]; + NSTextField *tf = (NSTextField *)textFieldPtr; + [tf removeFromSuperview]; + [[tf delegate] release]; } const int TextField_Enabled(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - return textField.enabled ? 1 : 0; + NSTextField *textField = (NSTextField *)textFieldPtr; + return textField.enabled ? 1 : 0; } void TextField_SetEnabled(TextFieldPtr textFieldPtr, int enabled) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField becomeFirstResponder]; - textField.enabled = enabled ? YES : NO; - [textField resignFirstResponder]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField becomeFirstResponder]; + textField.enabled = enabled ? YES : NO; + [textField resignFirstResponder]; } const int TextField_Editable(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - return textField.editable; + NSTextField *textField = (NSTextField *)textFieldPtr; + return textField.editable; } void TextField_SetEditable(TextFieldPtr textFieldPtr, int editable) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField becomeFirstResponder]; - textField.editable = editable ? YES : NO; - [textField resignFirstResponder]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField becomeFirstResponder]; + textField.editable = editable ? YES : NO; + [textField resignFirstResponder]; } -void TextField_SetFontFamily(TextFieldPtr textFieldPtr, const char* fontFamily) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.font = [NSFont fontWithName:[NSString stringWithUTF8String:fontFamily] size:textField.font.pointSize]; +void TextField_SetFontFamily(TextFieldPtr textFieldPtr, + const char *fontFamily) { + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.font = + [NSFont fontWithName:[NSString stringWithUTF8String:fontFamily] + size:textField.font.pointSize]; } void TextField_SetFontSize(TextFieldPtr textFieldPtr, const int fontSize) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.font = [NSFont fontWithName:textField.font.fontName size:fontSize]; + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.font = [NSFont fontWithName:textField.font.fontName size:fontSize]; } -void TextField_SetColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.textColor = [NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f]; +void TextField_SetColor(TextFieldPtr textFieldPtr, const int r, const int g, + const int b, const int a) { + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.textColor = [NSColor colorWithCalibratedRed:r / 255.f + green:g / 255.f + blue:b / 255.f + alpha:a / 255.f]; } -void TextField_SetBackgroundColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.drawsBackground = true; - textField.backgroundColor = [NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f]; +void TextField_SetBackgroundColor(TextFieldPtr textFieldPtr, const int r, + const int g, const int b, const int a) { + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.drawsBackground = true; + textField.backgroundColor = [NSColor colorWithCalibratedRed:r / 255.f + green:g / 255.f + blue:b / 255.f + alpha:a / 255.f]; } -void TextField_SetBorderColor(TextFieldPtr textFieldPtr, const int r, const int g, const int b, const int a) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.wantsLayer = true; - textField.layer.borderColor = [[NSColor colorWithCalibratedRed:r/255.f green:g/255.f blue:b/255.f alpha:a/255.f] CGColor]; +void TextField_SetBorderColor(TextFieldPtr textFieldPtr, const int r, + const int g, const int b, const int a) { + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.wantsLayer = true; + textField.layer.borderColor = + [[NSColor colorWithCalibratedRed:r / 255.f + green:g / 255.f + blue:b / 255.f + alpha:a / 255.f] CGColor]; } -void TextField_SetBorderWidth(TextFieldPtr textFieldPtr, const int borderWidth) { - NSTextField* textField = (NSTextField*)textFieldPtr; - textField.wantsLayer = true; - textField.layer.borderWidth = borderWidth; +void TextField_SetBorderWidth(TextFieldPtr textFieldPtr, + const int borderWidth) { + NSTextField *textField = (NSTextField *)textFieldPtr; + textField.wantsLayer = true; + textField.layer.borderWidth = borderWidth; } void TextField_SetBezeled(TextFieldPtr textFieldPtr, const int bezeled) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setBezeled:bezeled]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setBezeled:bezeled]; } -void TextField_SetDrawsBackground(TextFieldPtr textFieldPtr, const int drawsBackground) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setDrawsBackground:drawsBackground]; +void TextField_SetDrawsBackground(TextFieldPtr textFieldPtr, + const int drawsBackground) { + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setDrawsBackground:drawsBackground]; } void TextField_SetSelectable(TextFieldPtr textFieldPtr, const int selectable) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setSelectable:selectable]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setSelectable:selectable]; } void TextField_SetAlignmentCenter(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setAlignment:NSTextAlignmentCenter]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setAlignment:NSTextAlignmentCenter]; } void TextField_SetAlignmentLeft(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setAlignment:NSTextAlignmentLeft]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setAlignment:NSTextAlignmentLeft]; } void TextField_SetAlignmentRight(TextFieldPtr textFieldPtr) { - NSTextField* textField = (NSTextField*)textFieldPtr; - [textField setAlignment:NSTextAlignmentRight]; + NSTextField *textField = (NSTextField *)textFieldPtr; + [textField setAlignment:NSTextAlignmentRight]; } - diff --git a/ui/internal/cocoa/window.h b/ui/internal/cocoa/window.h index 594c11e..e063343 100644 --- a/ui/internal/cocoa/window.h +++ b/ui/internal/cocoa/window.h @@ -4,15 +4,17 @@ #include "combobox.h" #include "datepicker.h" #include "imageview.h" -#include "textview.h" -#include "textfield.h" #include "progressIndicator.h" #include "slider.h" #include "stepper.h" #include "tableview.h" +#include "textfield.h" +#include "textview.h" -void* Window_New(int goWindowID, int x, int y, int width, int height, const char* title); -void* Centered_Window_New(int goWindowID, int width, int height, const char* title); +void *Window_New(int goWindowID, int x, int y, int width, int height, + const char *title); +void *Centered_Window_New(int goWindowID, int width, int height, + const char *title); int Screen_Center_X(void *wndPtr); int Screen_Center_Y(void *wndPtr); int Screen_X(void *wndPtr); @@ -22,14 +24,15 @@ void Window_AddButton(void *wndPtr, ButtonPtr btnPtr); void Window_AddDatePicker(void *wndPtr, DatePickerPtr datePickerPtr); void Window_AddTextView(void *wndPtr, TextViewPtr tvPtr); void Window_AddTextField(void *wndPtr, TextFieldPtr tfPtr); -void Window_AddProgressIndicator(void *wndPtr, ProgressIndicatorPtr progressIndicatorPtr); +void Window_AddProgressIndicator(void *wndPtr, + ProgressIndicatorPtr progressIndicatorPtr); void Window_AddImageView(void *wndPtr, ImageViewPtr imageViewPtr); void Window_AddSlider(void *wndPtr, SliderPtr sliderPtr); void Window_AddStepper(void *wndPtr, StepperPtr ptr); void Window_AddComboBox(void *wndPtr, ComboBoxPtr comboBoxPtr); void Window_AddTableView(void *wndPtr, TableViewPtr tableViewPtr); void Window_Update(void *wndPtr); -void Window_SetTitle(void *wndPtr, const char* title); +void Window_SetTitle(void *wndPtr, const char *title); void Window_SetMiniaturizeButtonEnabled(void *wndPtr, int enabled); void Window_SetZoomButtonEnabled(void *wndPtr, int enabled); void Window_SetCloseButtonEnabled(void *wndPtr, int enabled); diff --git a/ui/internal/cocoa/window.m b/ui/internal/cocoa/window.m index bfb7e3b..a91e019 100644 --- a/ui/internal/cocoa/window.m +++ b/ui/internal/cocoa/window.m @@ -1,202 +1,199 @@ #import "window.h" -#import "windowdelegate.h" -#import "flippedview.h" #include "_cgo_export.h" +#import "flippedview.h" +#import "windowdelegate.h" WindowDelegate *gocoa_windowDelegate = nil; -void* Window_New(int goWindowID, int x, int y, int width, int height, const char* title) -{ - NSRect windowRect = NSMakeRect(x, y, width, height); - id window = [[NSWindow alloc] initWithContentRect:windowRect - styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable) - backing:NSBackingStoreBuffered - defer:NO]; - [window setContentView: [[FlippedView alloc] initWithFrame:windowRect]]; - [window setTitle:[NSString stringWithUTF8String:title]]; - [window autorelease]; - - gocoa_windowDelegate = [[WindowDelegate alloc] init]; - [gocoa_windowDelegate setGoWindowID:goWindowID]; - [window setDelegate:gocoa_windowDelegate]; - return window; -} - -void* Centered_Window_New(int goWindowID, int width, int height, const char* title) -{ - NSRect windowRect = NSMakeRect(0, 0, width, height); - id window = [[NSWindow alloc] initWithContentRect:windowRect - styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskResizable | NSWindowStyleMaskMiniaturizable) - backing:NSBackingStoreBuffered - defer:NO]; - [window setContentView: [[FlippedView alloc] initWithFrame:windowRect]]; - [window setTitle:[NSString stringWithUTF8String:title]]; - [window autorelease]; - CGFloat xPos = NSWidth([[window screen] frame])/2 - NSWidth([window frame])/2; - CGFloat yPos = NSHeight([[window screen] frame])/2 - NSHeight([window frame])/2; - gocoa_windowDelegate = [[WindowDelegate alloc] init]; - [gocoa_windowDelegate setGoWindowID:goWindowID]; - [window setDelegate:gocoa_windowDelegate]; - [window setFrame:NSMakeRect(xPos, yPos, NSWidth([window frame]), NSHeight([window frame])) display:YES]; - - return window; +void *Window_New(int goWindowID, int x, int y, int width, int height, + const char *title) { + NSRect windowRect = NSMakeRect(x, y, width, height); + id window = [[NSWindow alloc] + initWithContentRect:windowRect + styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | + NSWindowStyleMaskResizable | + NSWindowStyleMaskMiniaturizable) + backing:NSBackingStoreBuffered + defer:NO]; + [window setContentView:[[FlippedView alloc] initWithFrame:windowRect]]; + [window setTitle:[NSString stringWithUTF8String:title]]; + [window autorelease]; + + gocoa_windowDelegate = [[WindowDelegate alloc] init]; + [gocoa_windowDelegate setGoWindowID:goWindowID]; + [window setDelegate:gocoa_windowDelegate]; + return window; +} + +void *Centered_Window_New(int goWindowID, int width, int height, + const char *title) { + NSRect windowRect = NSMakeRect(0, 0, width, height); + id window = [[NSWindow alloc] + initWithContentRect:windowRect + styleMask:(NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | + NSWindowStyleMaskResizable | + NSWindowStyleMaskMiniaturizable) + backing:NSBackingStoreBuffered + defer:NO]; + [window setContentView:[[FlippedView alloc] initWithFrame:windowRect]]; + [window setTitle:[NSString stringWithUTF8String:title]]; + [window autorelease]; + CGFloat xPos = + NSWidth([[window screen] frame]) / 2 - NSWidth([window frame]) / 2; + CGFloat yPos = + NSHeight([[window screen] frame]) / 2 - NSHeight([window frame]) / 2; + gocoa_windowDelegate = [[WindowDelegate alloc] init]; + [gocoa_windowDelegate setGoWindowID:goWindowID]; + [window setDelegate:gocoa_windowDelegate]; + [window setFrame:NSMakeRect(xPos, yPos, NSWidth([window frame]), + NSHeight([window frame])) + display:YES]; + + return window; } -int Screen_Center_X(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - CGFloat xPos = NSWidth([[window screen] frame])/2 - NSWidth([window frame])/2; - return (int)(xPos); +int Screen_Center_X(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + CGFloat xPos = + NSWidth([[window screen] frame]) / 2 - NSWidth([window frame]) / 2; + return (int)(xPos); } -int Screen_Center_Y(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - CGFloat yPos = NSHeight([[window screen] frame])/2 - NSHeight([window frame])/2; - return (int)(yPos); +int Screen_Center_Y(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + CGFloat yPos = + NSHeight([[window screen] frame]) / 2 - NSHeight([window frame]) / 2; + return (int)(yPos); } -int Screen_X(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - CGFloat xPos = NSWidth([[window screen] frame]); - return (int)(xPos); +int Screen_X(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + CGFloat xPos = NSWidth([[window screen] frame]); + return (int)(xPos); } -int Screen_Y(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - CGFloat yPos = NSHeight([[window screen] frame]); - return (int)(yPos); +int Screen_Y(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + CGFloat yPos = NSHeight([[window screen] frame]); + return (int)(yPos); } -void Window_MakeKeyAndOrderFront(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - [window makeKeyAndOrderFront:nil]; +void Window_MakeKeyAndOrderFront(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + [window makeKeyAndOrderFront:nil]; } -void Window_AddButton(void *wndPtr, ButtonPtr btnPtr) -{ - NSButton* button = (NSButton*)btnPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:button]; +void Window_AddButton(void *wndPtr, ButtonPtr btnPtr) { + NSButton *button = (NSButton *)btnPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:button]; } -void Window_AddDatePicker(void *wndPtr, DatePickerPtr datePickerPtr) -{ - NSDatePicker* datePicker = (NSDatePicker*)datePickerPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:datePicker]; +void Window_AddDatePicker(void *wndPtr, DatePickerPtr datePickerPtr) { + NSDatePicker *datePicker = (NSDatePicker *)datePickerPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:datePicker]; } -void Window_AddTextView(void *wndPtr, TextViewPtr tvPtr) -{ - NSTextView* textview = (NSTextView*)tvPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:textview]; +void Window_AddTextView(void *wndPtr, TextViewPtr tvPtr) { + NSTextView *textview = (NSTextView *)tvPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:textview]; } -void Window_AddTextField(void *wndPtr, TextFieldPtr tfPtr) -{ - NSTextField* textfield = (NSTextField*)tfPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:textfield]; +void Window_AddTextField(void *wndPtr, TextFieldPtr tfPtr) { + NSTextField *textfield = (NSTextField *)tfPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:textfield]; } -void Window_AddProgressIndicator(void *wndPtr, ProgressIndicatorPtr progressIndicatorPtr) -{ - NSProgressIndicator* indicator = (NSProgressIndicator*)progressIndicatorPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:indicator]; +void Window_AddProgressIndicator(void *wndPtr, + ProgressIndicatorPtr progressIndicatorPtr) { + NSProgressIndicator *indicator = (NSProgressIndicator *)progressIndicatorPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:indicator]; } -void Window_AddImageView(void *wndPtr, ImageViewPtr imageViewPtr) -{ - NSImageView* imageView = (NSImageView*)imageViewPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:imageView]; +void Window_AddImageView(void *wndPtr, ImageViewPtr imageViewPtr) { + NSImageView *imageView = (NSImageView *)imageViewPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:imageView]; } -void Window_AddSlider(void *wndPtr, SliderPtr sliderPtr) -{ - NSSlider* slider = (NSSlider*)sliderPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:slider]; +void Window_AddSlider(void *wndPtr, SliderPtr sliderPtr) { + NSSlider *slider = (NSSlider *)sliderPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:slider]; } -void Window_AddStepper(void *wndPtr, StepperPtr ptr) -{ - NSStepper* stepper = (NSStepper*)ptr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:stepper]; +void Window_AddStepper(void *wndPtr, StepperPtr ptr) { + NSStepper *stepper = (NSStepper *)ptr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:stepper]; } -void Window_AddComboBox(void *wndPtr, ComboBoxPtr comboBoxPtr) -{ - NSComboBox* comboBox = (NSComboBox*)comboBoxPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:comboBox]; +void Window_AddComboBox(void *wndPtr, ComboBoxPtr comboBoxPtr) { + NSComboBox *comboBox = (NSComboBox *)comboBoxPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:comboBox]; } -void Window_AddTableView(void *wndPtr, TableViewPtr tableViewPtr) -{ - NSScrollView* tableView = (NSScrollView*)tableViewPtr; - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] addSubview:tableView]; +void Window_AddTableView(void *wndPtr, TableViewPtr tableViewPtr) { + NSScrollView *tableView = (NSScrollView *)tableViewPtr; + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] addSubview:tableView]; } -void Window_Update(void *wndPtr) -{ - NSWindow* window = (NSWindow*)wndPtr; - [[window contentView] setNeedsDisplay:YES]; +void Window_Update(void *wndPtr) { + NSWindow *window = (NSWindow *)wndPtr; + [[window contentView] setNeedsDisplay:YES]; } -void Window_SetTitle(void *wndPtr, const char* title) -{ - NSWindow* window = (NSWindow*)wndPtr; - [window setTitle:[NSString stringWithUTF8String:title]]; +void Window_SetTitle(void *wndPtr, const char *title) { + NSWindow *window = (NSWindow *)wndPtr; + [window setTitle:[NSString stringWithUTF8String:title]]; } void Window_SetMiniaturizeButtonEnabled(void *wndPtr, int enabled) { - NSWindow* window = (NSWindow*)wndPtr; - NSButton *button = [window standardWindowButton:NSWindowMiniaturizeButton]; - [button setEnabled: enabled]; + NSWindow *window = (NSWindow *)wndPtr; + NSButton *button = [window standardWindowButton:NSWindowMiniaturizeButton]; + [button setEnabled:enabled]; } void Window_SetZoomButtonEnabled(void *wndPtr, int enabled) { - NSWindow* window = (NSWindow*)wndPtr; - NSButton *button = [window standardWindowButton:NSWindowZoomButton]; - [button setEnabled: enabled]; + NSWindow *window = (NSWindow *)wndPtr; + NSButton *button = [window standardWindowButton:NSWindowZoomButton]; + [button setEnabled:enabled]; } void Window_SetCloseButtonEnabled(void *wndPtr, int enabled) { - NSWindow* window = (NSWindow*)wndPtr; - NSButton *button = [window standardWindowButton:NSWindowCloseButton]; - [button setEnabled: enabled]; + NSWindow *window = (NSWindow *)wndPtr; + NSButton *button = [window standardWindowButton:NSWindowCloseButton]; + [button setEnabled:enabled]; } void Window_SetAllowsResizing(void *wndPtr, int allowsResizing) { - NSWindow* window = (NSWindow*)wndPtr; - if(allowsResizing) { - window.styleMask |= NSWindowStyleMaskResizable; - } else { - window.styleMask &= ~NSWindowStyleMaskResizable; - } + NSWindow *window = (NSWindow *)wndPtr; + if (allowsResizing) { + window.styleMask |= NSWindowStyleMaskResizable; + } else { + window.styleMask &= ~NSWindowStyleMaskResizable; + } } void Window_AddDefaultQuitMenu(void *wndPtr) { - NSWindow* window = (NSWindow*)wndPtr; - - id menubar = [[NSMenu new] autorelease]; - id appMenuItem = [[NSMenuItem new] autorelease]; - [menubar addItem:appMenuItem]; - [NSApp setMainMenu:menubar]; - id appMenu = [[NSMenu new] autorelease]; - id appName = [[NSProcessInfo processInfo] processName]; - id quitTitle = [@"Quit " stringByAppendingString:appName]; - id quitMenuItem = [[[NSMenuItem alloc] initWithTitle:quitTitle - action:@selector(terminate:) keyEquivalent:@"q"] autorelease]; - [appMenu addItem:quitMenuItem]; - [appMenuItem setSubmenu:appMenu]; + NSWindow *window = (NSWindow *)wndPtr; + + id menubar = [[NSMenu new] autorelease]; + id appMenuItem = [[NSMenuItem new] autorelease]; + [menubar addItem:appMenuItem]; + [NSApp setMainMenu:menubar]; + id appMenu = [[NSMenu new] autorelease]; + id appName = [[NSProcessInfo processInfo] processName]; + id quitTitle = [@"Quit " stringByAppendingString:appName]; + id quitMenuItem = [[[NSMenuItem alloc] initWithTitle:quitTitle + action:@selector(terminate:) + keyEquivalent:@"q"] autorelease]; + [appMenu addItem:quitMenuItem]; + [appMenuItem setSubmenu:appMenu]; } diff --git a/ui/internal/cocoa/windowdelegate.h b/ui/internal/cocoa/windowdelegate.h index 49bbe8d..6a6b8e9 100644 --- a/ui/internal/cocoa/windowdelegate.h +++ b/ui/internal/cocoa/windowdelegate.h @@ -2,8 +2,9 @@ @interface WindowDelegate : NSObject -@property (assign) int goWindowID; +@property(assign) int goWindowID; @end -void triggerEvent(int goWindowID, NSWindow *movedWindow, NSString *eventTitle, const int eventId); \ No newline at end of file +void triggerEvent(int goWindowID, NSWindow *movedWindow, NSString *eventTitle, + const int eventId); \ No newline at end of file