From d5fe99fb9634e2761450e1a6f24b80c3f6247e44 Mon Sep 17 00:00:00 2001 From: June 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 fbd6f011..af4d576a 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 cgit-pink/commit/filters/syntax-highlighting.py?h=1.3.0&id=8149be213f1c8f52b0dbe6c213f6073af57fa954&follow=1'>filters: import more modern scriptsJason A. Donenfeld 2013-05-26readme: use string_list instead of space deliminationsJason A. Donenfeld 2013-05-25ui-summary: Disallow directory traversalJason A. Donenfeld 2013-05-25cgitrc.5: information on directory traversal and multiple readme filesJason A. Donenfeld 2013-05-25readme: Accept multiple candidates and test them.Jason A. Donenfeld 2013-05-25ui-summary: Pass filename to about-filterJason A. Donenfeld 2013-05-25ui-summary: Use default branch for readme if : prefixJason A. Donenfeld 2013-05-25cgit.c: Do not reset HOME after unsetting it.Jason A. Donenfeld 2013-05-25cgit.c: sync repo config printing with struct cgit_repoJason A. Donenfeld 2013-05-25git: update to 1.8.3John Keeping 2013-05-22cache.c: cache ls_cache output properlyJohn Keeping 2013-05-22tests: introduce strip_header() helper functionJohn Keeping 2013-05-22shared.c: use die_errno() where appropriateJohn Keeping 2013-05-22html.c: die when write failsJohn Keeping 2013-05-22ui-log: add <span/> around commit decorationsJohn Keeping 2013-05-22Makefile: fix parallel "make test"John Keeping 2013-05-18cache.c: fix cache_lsJohn Keeping 2013-05-13t0109: "function" is a bash-ismJohn Keeping 2013-05-13New mailing list.Jason A. Donenfeld 2013-04-30ui-snapshot: do not access $HOMEJason A. Donenfeld 2013-04-27t0001: validate Git -rcN version numbers correctlyJohn Keeping 2013-04-27git: update to 1.8.2.2John Keeping 2013-04-17scan-tree: fix regression in section-from-path=-1John Keeping 2013-04-15t0001: ignore ".dirty" suffix on Git versionJohn Keeping 2013-04-15tests: set TEST_OUTPUT_DIRECTORY to the CGit test directoryJohn Keeping 2013-04-15t0109: test more URLsJohn Keeping 2013-04-10cgitrc.5.txt: Specify when scan-path must be defined before.Jason A. Donenfeld 2013-04-10ui-snapshot.c: Prepend "V" when guessing ref namesLukas Fleischer 2013-04-10t0107: Skip ZIP tests if unzip(1) isn't availableLukas Fleischer 2013-04-10tests/: Do not use `sed -i`Lukas Fleischer 2013-04-10Add branch-sort and repo.branch-sort options.Jason A. Donenfeld 2013-04-10t0109: chain operations with &&John Keeping 2013-04-10cgit.c: Do not restore unset environment variablesLukas Fleischer 2013-04-09t0107: Use `tar -z` for gzip'ed archivesLukas Fleischer