From 0c47483ab5b71c4ac618ea6eac7c8ec47dc74033 Mon Sep 17 00:00:00 2001 From: Curtis McEnroe Date: Sat, 3 Feb 2018 23:21:47 -0500 Subject: Apparently this is how people write Objective-C --- bin/gfcocoa.m | 71 ++++++++++++++++++++++++----------------------------------- 1 file changed, 29 insertions(+), 42 deletions(-) diff --git a/bin/gfcocoa.m b/bin/gfcocoa.m index ae2a1445..04410820 100644 --- a/bin/gfcocoa.m +++ b/bin/gfcocoa.m @@ -28,52 +28,41 @@ extern void input(char in); static size_t size = 4 * WIDTH * HEIGHT; static uint32_t buf[WIDTH * HEIGHT]; -@interface BufferView : NSView { } +@interface BufferView : NSView { +} @end @implementation BufferView -- (void) drawRect: (NSRect) dirtyRect { +- (void)drawRect:(NSRect)dirtyRect { CGContextRef ctx = [[NSGraphicsContext currentContext] CGContext]; CGColorSpaceRef rgb = CGColorSpaceCreateDeviceRGB(); CGDataProviderRef data = CGDataProviderCreateWithData(NULL, buf, size, NULL); - CGImageRef image = CGImageCreate( - WIDTH, - HEIGHT, - 8, - 32, - WIDTH * 4, - rgb, + CGImageRef image = + CGImageCreate(WIDTH, HEIGHT, 8, 32, WIDTH * 4, rgb, kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst, - data, - NULL, - false, - kCGRenderingIntentDefault - ); + data, NULL, false, kCGRenderingIntentDefault); CGContextDrawImage(ctx, CGRectMake(0, 0, WIDTH, HEIGHT), image); CGImageRelease(image); CGDataProviderRelease(data); CGColorSpaceRelease(rgb); } -- (BOOL) acceptsFirstResponder { +- (BOOL)acceptsFirstResponder { return YES; } -- (void) keyDown: (NSEvent *) event { +- (void)keyDown:(NSEvent *)event { char in; - [ - [event characters] - getBytes: &in - maxLength: 1 - usedLength: NULL - encoding: NSASCIIStringEncoding - options: NSStringEncodingConversionAllowLossy - range: NSMakeRange(0, 1) - remainingRange: NULL - ]; + [[event characters] getBytes:&in + maxLength:1 + usedLength:NULL + encoding:NSASCIIStringEncoding + options:NSStringEncodingConversionAllowLossy + range:NSMakeRange(0, 1) + remainingRange:NULL]; input(in); draw(buf, WIDTH, HEIGHT); - [self setNeedsDisplay: YES]; + [self setNeedsDisplay:YES]; } @end @@ -81,25 +70,23 @@ int main(int argc, char *argv[]) { int error = init(argc, argv); if (error) return error; + draw(buf, WIDTH, HEIGHT); + [NSApplication sharedApplication]; - [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular]; + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; - NSWindow *window = [ - [NSWindow alloc] - initWithContentRect: NSMakeRect(0, 0, 640, 480) - styleMask: NSTitledWindowMask | NSClosableWindowMask - backing: NSBackingStoreBuffered - defer: NO - ]; - [window setTitle: [[NSString alloc] initWithUTF8String: argv[0]]]; + NSWindow *window = [[NSWindow alloc] + initWithContentRect:NSMakeRect(0, 0, 640, 480) + styleMask:NSTitledWindowMask | NSClosableWindowMask + backing:NSBackingStoreBuffered + defer:NO]; + [window setTitle:[[NSString alloc] initWithUTF8String:argv[0]]]; [window center]; - BufferView *view = [[BufferView alloc] initWithFrame: [window frame]]; - [window setContentView: view]; - - draw(buf, WIDTH, HEIGHT); + BufferView *view = [[BufferView alloc] initWithFrame:[window frame]]; + [window setContentView:view]; - [window makeKeyAndOrderFront: nil]; - [NSApp activateIgnoringOtherApps: YES]; + [window makeKeyAndOrderFront:nil]; + [NSApp activateIgnoringOtherApps:YES]; [NSApp run]; } -- cgit 1.4.1 ity by slot in TF2June McEnroe 2019-06-15Add AcceptanceJune McEnroe 2019-06-07Add variables to bitJune McEnroe 2019-06-05Add A Closed and Common OrbitJune McEnroe 2019-06-02Add RebornJune McEnroe 2019-05-30Add bit to bin.7June McEnroe 2019-05-30Simplify and build bitJune McEnroe 2019-05-29Add xx -p optionJune McEnroe 2019-05-27Add FrontierJune McEnroe 2019-05-27Break nicks with ZWNJJune McEnroe 2019-05-26Add DawnJune McEnroe 2019-05-20Declare vasprintf(3) for GNUJune McEnroe 2019-05-20Fix comparison warning in ttpreJune McEnroe 2019-05-20Add AuthorityJune McEnroe 2019-05-19Specify precedence of unary versions of operatorsJune McEnroe 2019-05-18Add compound assignment operators to orderJune McEnroe 2019-05-15Support simple assignment in orderJune McEnroe 2019-05-15Implement sizeof in orderJune McEnroe 2019-05-15Add orderJune McEnroe 2019-05-12Add T suffix in bitJune McEnroe 2019-05-10Highlight yacc and lex files as CJune McEnroe 2019-05-10Use val instead of suboptargJune McEnroe 2019-05-09Add Parable of the SowerJune McEnroe 2019-05-07Add bit without buildJune McEnroe 2019-05-04Fix MANDIR typoJune McEnroe 2019-05-04Move relay to binJune McEnroe