From a3a427a7c463bb26c509f6e7c67fd197bb479638 Mon Sep 17 00:00:00 2001 From: June McEnroe Date: Sun, 4 Feb 2018 11:04:40 -0500 Subject: Switch back to sane Objective-C style --- bin/gfcocoa.m | 78 +++++++++++++++++++++++++++++++++-------------------------- 1 file changed, 44 insertions(+), 34 deletions(-) diff --git a/bin/gfcocoa.m b/bin/gfcocoa.m index cfd3d2ad..6f8b0e5e 100644 --- a/bin/gfcocoa.m +++ b/bin/gfcocoa.m @@ -32,37 +32,48 @@ static uint32_t buf[WIDTH * HEIGHT]; @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, - kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst, - data, NULL, false, kCGRenderingIntentDefault); + CGDataProviderRef data = CGDataProviderCreateWithData(NULL, buf, size, NULL); + CGImageRef image = CGImageCreate( + WIDTH, + HEIGHT, + 8, + 32, + WIDTH * 4, + rgb, + kCGBitmapByteOrder32Little | kCGImageAlphaNoneSkipFirst, + 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 @@ -70,36 +81,35 @@ static uint32_t buf[WIDTH * HEIGHT]; @end @implementation Delegate -- (BOOL)applicationShouldTerminateAfterLastWindowClosed: - (NSApplication *)sender { +- (BOOL) applicationShouldTerminateAfterLastWindowClosed: (NSApplication *) sender { return YES; } @end int main(int argc, char *argv[]) { int error = init(argc, argv); - if (error) - return error; + if (error) return error; draw(buf, WIDTH, HEIGHT); [NSApplication sharedApplication]; - [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; - [NSApp setDelegate:[Delegate new]]; + [NSApp setActivationPolicy: NSApplicationActivationPolicyRegular]; + [NSApp setDelegate: [Delegate new]]; - NSWindow *window = [[NSWindow alloc] - initWithContentRect:NSMakeRect(0, 0, WIDTH, HEIGHT) - styleMask:NSTitledWindowMask | NSClosableWindowMask | - NSMiniaturizableWindowMask | NSResizableWindowMask - backing:NSBackingStoreBuffered - defer:YES]; + NSWindow *window = [ + [NSWindow alloc] + initWithContentRect: NSMakeRect(0, 0, WIDTH, HEIGHT) + styleMask: NSTitledWindowMask | NSClosableWindowMask | NSMiniaturizableWindowMask | NSResizableWindowMask + backing: NSBackingStoreBuffered + defer: YES + ]; - BufferView *view = [[BufferView alloc] initWithFrame:[window frame]]; - [window setContentView:view]; + BufferView *view = [[BufferView alloc] initWithFrame: [window frame]]; + [window setContentView: view]; - [window setTitle:[NSString stringWithUTF8String:argv[0]]]; + [window setTitle: [NSString stringWithUTF8String: argv[0]]]; [window center]; - [window makeKeyAndOrderFront:nil]; - [NSApp activateIgnoringOtherApps:YES]; + [window makeKeyAndOrderFront: nil]; + [NSApp activateIgnoringOtherApps: YES]; [NSApp run]; } -- cgit 1.4.1 ;follow=1'>Import /usr/src/bin/test from FreeBSD 12.1-RELEASEJune McEnroe 2020-03-09Import /usr/src/bin/kill from FreeBSD 12.1-RELEASEJune McEnroe 2020-03-09Remove extraneous files from sh sourcesJune McEnroe 2020-03-09Import /usr/src/bin/sh from FreeBSD 12.1-RELEASEJune McEnroe 2020-03-09Remove 1sh sourcesJune McEnroe I'm going to recreate it from fresh sh sources for clean git history. 2020-03-08Add The Stone SkyJune McEnroe 2020-03-08Publish "How I Relay Chat"June McEnroe 2020-03-03Don't use $ inside $(())June McEnroe 2020-03-03Remove setoptJune McEnroe 2020-03-03Use getopts in shell scriptsJune McEnroe WTF why did no one tell me about this? 2020-02-27Style %T outside of Rs in italicJune McEnroe 2020-02-26Add Fierce Femmes and Notorious LiarsJune McEnroe 2020-02-23Add This Is How You Lose the Time WarJune McEnroe 2020-02-22Add See Ya LaterJune McEnroe 2020-02-20Remove wiki scriptJune McEnroe Wikipedia seems to have removed the one-sentence extracts from the opensearch results. Too bad. It's not a wiki script, what we need is a command that fetches single-sentence summaries of articles on Wikipedia. 2020-02-19Add The Obelisk GateJune McEnroe 2020-02-17Add Four Tet — HandsJune McEnroe One from the cafe that caught my attention. 2020-02-12Simplify macOS notify-sendJune McEnroe 2020-02-12Add imbox and notemap to pageJune McEnroe 2020-02-12Collapse simple linksJune McEnroe 2020-02-12Move catgirl up the pageJune McEnroe 2020-02-12Update catgirl pty grabJune McEnroe 2020-02-12Link to cgit /about pages where appropriateJune McEnroe 2020-02-11Separate LINKS from BINS for html to workJune McEnroe 2020-02-11Add margin to Bl-bullet itemsJune McEnroe 2020-02-10Match URLs inside parens or with paired parens insideJune McEnroe 2020-02-10Duplicate effective URL before passing it back to curlJune McEnroe Apparently sometimes it didn't like receiving its own internal storage to parse again. Understandable. 2020-02-09Add To Be Taught, If FortunateJune McEnroe 2020-02-04Add The Future of Another TimelineJune McEnroe Wow. One of the best I've read. 2020-01-31Reorganize the Makefile for the umpteenth timeJune McEnroe Broke out LDLIBS for each bin, and made everything more uniform. 2020-01-28Change scout sensitivity to 1.4June McEnroe idk it seems to work. 2020-01-28Import shows.txtJune McEnroe