Update ui/cocoa

ui/cocoa/cocoa.go

@@ -5,16 +5,20 @@ package cocoa
 //
 // #include <stdlib.h>
 //
-// void Run(size_t width, size_t height, size_t scale);
+// void Run(size_t width, size_t height, size_t scale, const char* title);
 //
 import "C"
 import (
 	"github.com/hajimehoshi/go.ebiten"
 	_ "github.com/hajimehoshi/go.ebiten/graphics"
 	_ "github.com/hajimehoshi/go.ebiten/graphics/opengl"
+	"unsafe"
 )
 
 func Run(game ebiten.Game, screenWidth, screenHeight, screenScale int,
 	title string) {
-	C.Run(C.size_t(screenWidth), C.size_t(screenHeight), C.size_t(screenScale))
+	cTitle := C.CString(title)
+	defer C.free(unsafe.Pointer(cTitle))
+
+	C.Run(C.size_t(screenWidth), C.size_t(screenHeight), C.size_t(screenScale), cTitle)
 }

ui/cocoa/ebiten_controller.c

@@ -8,8 +8,7 @@
 }
 
 - (id)initWithWindow:(NSWindow*)window {
-  self = [super init];
+  if (self = [super init]) {
-  if (self != nil) {
     self->window_ = window;
   }
   return self;

ui/cocoa/ebiten_opengl_view.c

@@ -30,7 +30,6 @@ EbitenDisplayLinkCallback(CVDisplayLinkRef displayLink,
   CVDisplayLinkRef displayLink_;
   updating* updating_;
   //ebiten::input* input_;
-  bool isTerminated_;
 }
 
 - (id)init {
@@ -47,7 +46,6 @@ EbitenDisplayLinkCallback(CVDisplayLinkRef displayLink,
 
 - (void)prepareOpenGL {
   [super prepareOpenGL];
-  self->isTerminated_ = false;
   NSOpenGLContext* openGLContext = [self openGLContext];
   assert(openGLContext != nil);
   GLint const swapInterval = 1;
@@ -141,12 +139,4 @@ EbitenDisplayLinkCallback(CVDisplayLinkRef displayLink,
     }*/
 }
 
-- (void)terminate {
-  self->isTerminated_ = true;
-}
-
-- (bool)isTerminated {
-  return self->isTerminated_;
-}
-
 @end

ui/cocoa/ebiten_opengl_view.h

@@ -12,8 +12,6 @@ typedef bool updating(void);
 
 - (CVReturn)getFrameForTime:(CVTimeStamp const*)outputTime;
 - (void)setUpdatingFunc:(updating*)updatingFunc;
-- (void)terminate;
-- (bool)isTerminated;
 
 @end
 

ui/cocoa/ebiten_window.c

@@ -52,8 +52,7 @@
   (void)alert;
   (void)contextInfo;
   if (returnCode == NSAlertDefaultReturn) {
-    EbitenOpenGLView* glView = [self contentView];
+    [NSApp terminate:nil];
-    [glView terminate];
   }
 }
 

ui/cocoa/run.c

@@ -30,7 +30,7 @@ static NSWindow* generateWindow(size_t width, size_t height) {
   return window;
 }
 
-void Run(size_t width, size_t height, size_t scale) {
+void Run(size_t width, size_t height, size_t scale, const char* title) {
   @autoreleasepool {
     NSWindow* window = generateWindow(width * scale, height * scale);
     EbitenController* controller = [[EbitenController alloc]