cnping

Minimal Graphical Ping Tool
git clone https://git.sinitax.com/cnlohr/cnping
Log | Files | Refs | Submodules | README | LICENSE | sfeed.txt

commit 8f49fa77921002f132dc6f56b3a7e54e71c284f8
parent 769934d7e0a513b014cd1b8a4e61715f79b81158
Author: Viktor Druchinin <viknet@icloud.com>
Date:   Wed, 24 May 2017 13:59:07 +0300

OSX support

Diffstat:
ACNFGCocoaCGDriver.m | 350+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
MMakefile | 6++++++
Mping.c | 6+++---
3 files changed, 359 insertions(+), 3 deletions(-)

diff --git a/CNFGCocoaCGDriver.m b/CNFGCocoaCGDriver.m @@ -0,0 +1,350 @@ +//Copyright (c) 2017 <>< David Chapman - Under the MIT/x11 or NewBSD License you choose. +//Copyright (C) 2017 Viknet, MIT/x11 License or NewBSD License you choose. + +#import <Cocoa/Cocoa.h> +#import <Foundation/Foundation.h> + +#define RGB2Color(RGB) (RGB&0xFF)/256., ((RGB>>8)&0xFF)/256., ((RGB>>16)&0xFF)/256. + +#include "CNFGFunctions.h" + +id app_menubar, app_appMenuItem, app_appMenu, app_appName, app_quitMenuItem, app_quitTitle, app_quitMenuItem, app_window; +NSView *app_imageView; +CGColorSpaceRef colorSpace; +CGContextRef bufferContext; +uint32_t *bufferData; + +NSAutoreleasePool *app_pool; +int app_sw=0, app_sh=0; +NSRect frameRect; +int app_mouseX=0, app_mouseY=0; +BOOL inFullscreen = false; + +uint32_t CNFGColor( uint32_t RGB ) +{ + CNFGLastColor = RGB; + unsigned char red = RGB & 0xFF; + unsigned char grn = ( RGB >> 8 ) & 0xFF; + unsigned char blu = ( RGB >> 16 ) & 0xFF; + CGContextSetRGBStrokeColor(bufferContext, RGB2Color(RGB), 1.0); + CGContextSetRGBFillColor(bufferContext, RGB2Color(RGB), 1.0); + return CNFGLastColor; +} + +void CNFGTackPixel( short x, short y ) +{ + y = app_sh - y - 1; + if( x < 0 || y < 0 || x >= app_sw || y >= app_sh ) return; + bufferData[x + app_sw * y] = CNFGLastColor; +} + +// void CNFGTackSegment( short x1, short y1, short x2, short y2 ) +// { +// y1 = app_sh - y1 - 1; +// y2 = app_sh - y2 - 1; +// CGContextBeginPath(bufferContext); +// CGContextMoveToPoint(bufferContext, x1, y1); +// CGContextAddLineToPoint(bufferContext, x2, y2); +// CGContextStrokePath(bufferContext); +// } + +void CNFGTackSegment( short x1, short y1, short x2, short y2 ) +{ + short tx, ty; + float slope, lp; + + short dx = x2 - x1; + short dy = y2 - y1; + + if( dx < 0 ) dx = -dx; + if( dy < 0 ) dy = -dy; + + if( dx > dy ) + { + short minx = (x1 < x2)?x1:x2; + short maxx = (x1 < x2)?x2:x1; + short miny = (x1 < x2)?y1:y2; + short maxy = (x1 < x2)?y2:y1; + float thisy = miny; + slope = (float)(maxy-miny) / (float)(maxx-minx); + + for( tx = minx; tx <= maxx; tx++ ) + { + ty = thisy; + if( tx < 0 || ty < 0 || ty >= app_sh ) continue; + if( tx >= app_sw ) break; + bufferData[ty * app_sw + tx] = CNFGLastColor; + thisy += slope; + } + } + else + { + short minx = (y1 < y2)?x1:x2; + short maxx = (y1 < y2)?x2:x1; + short miny = (y1 < y2)?y1:y2; + short maxy = (y1 < y2)?y2:y1; + float thisx = minx; + slope = (float)(maxx-minx) / (float)(maxy-miny); + + for( ty = miny; ty <= maxy; ty++ ) + { + tx = thisx; + if( ty < 0 || tx < 0 || tx >= app_sw ) continue; + if( ty >= app_sh ) break; + bufferData[ty * app_sw + tx] = CNFGLastColor; + thisx += slope; + } + } +} + +void CNFGTackRectangle( short x1, short y1, short x2, short y2 ) +{ + CGContextFillRect(bufferContext, CGRectMake (x1, app_sh - y1 - 1, x2, app_sh - y2 - 1 )); +} + +void CNFGTackPoly( RDPoint * points, int verts ) +{ + if (verts==0) return; + CGContextBeginPath(bufferContext); + CGContextMoveToPoint(bufferContext, points[0].x, app_sh - points[0].y - 1); + for (int i=1; i<verts; i++){ + CGContextAddLineToPoint(bufferContext, points[i].x, app_sh - points[i].y - 1); + } + CGContextFillPath(bufferContext); +} + +void CNFGGetDimensions( short * x, short * y ) +{ + *x = app_sw; + *y = app_sh; +} + +@interface MyView : NSView +@end +@implementation MyView +- (id)initWithFrame:(NSRect)frame { + self = [super initWithFrame:frame]; + if (self) + { + [self setWantsLayer:YES]; + [self setLayerContentsRedrawPolicy: NSViewLayerContentsRedrawOnSetNeedsDisplay]; + // [self setLayerContentsPlacement: NSViewLayerContentsPlacementCenter]; + } + return self; +} + +- (BOOL) wantsUpdateLayer +{ + return YES; +} +- (void) updateLayer +{ + CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, bufferData, 4*app_sw*app_sh, NULL); + CGImageRef frameImage = CGImageCreate(app_sw, app_sh, 8, 32, 4*app_sw, colorSpace, kCGBitmapByteOrderDefault, provider, NULL, false, kCGRenderingIntentDefault); + + [app_imageView.layer setContents:(id)frameImage]; + + CGImageRelease(frameImage); + CGDataProviderRelease(provider); +} +@end + +CGContextRef createBitmapContext (int pixelsWide, + int pixelsHigh) +{ + int bitmapByteCount; + int bitmapBytesPerRow; + + bitmapBytesPerRow = (pixelsWide * 4); + bitmapByteCount = (bitmapBytesPerRow * pixelsHigh); + + colorSpace = CGColorSpaceCreateWithName(kCGColorSpaceGenericRGBLinear); + bufferData = calloc( bitmapByteCount, sizeof(uint8_t) ); + + CGContextRef context = CGBitmapContextCreate (bufferData, + pixelsWide, + pixelsHigh, + 8, + bitmapBytesPerRow, + colorSpace, + kCGImageAlphaNoneSkipLast); + + CGContextSetInterpolationQuality(context, kCGInterpolationNone); + // CGContextSetShouldAntialias(context, NO); + // CGContextSetLineWidth(context, 0.5); + + return context; +} + +void initApp(){ + [NSApplication sharedApplication]; + [NSApp setActivationPolicy:NSApplicationActivationPolicyRegular]; + app_menubar = [[NSMenu new] autorelease]; + app_appMenuItem = [[NSMenuItem new] autorelease]; + [app_menubar addItem:app_appMenuItem]; + [NSApp setMainMenu:app_menubar]; + app_appMenu = [[NSMenu new] autorelease]; + app_appName = [[NSProcessInfo processInfo] processName]; + app_quitTitle = [@"Quit " stringByAppendingString:app_appName]; + app_quitMenuItem = [[[NSMenuItem alloc] initWithTitle:app_quitTitle + action:@selector(terminate:) keyEquivalent:@"q"] autorelease]; + [app_appMenu addItem:app_quitMenuItem]; + [app_appMenuItem setSubmenu:app_appMenu]; + app_imageView = [MyView new]; +} + +void CNFGSetupFullscreen( const char * WindowName, int screen_number ) +{ + inFullscreen = YES; + initApp(); + + NSDictionary *fullScreenOptions = [NSDictionary dictionaryWithObjectsAndKeys: + [NSNumber numberWithInt: + (NSApplicationPresentationAutoHideMenuBar | NSApplicationPresentationAutoHideDock) ], + NSFullScreenModeApplicationPresentationOptions, nil]; + [app_imageView enterFullScreenMode:[[NSScreen screens] objectAtIndex:screen_number] withOptions:fullScreenOptions]; + frameRect = [app_imageView frame]; + CGSize app_imageSize = frameRect.size; + app_sw = app_imageSize.width; app_sh = app_imageSize.height; + bufferContext = createBitmapContext (app_sw, app_sh); + [NSApp finishLaunching]; + [NSApp updateWindows]; + app_pool = [NSAutoreleasePool new]; +} + +void CNFGSetup( const char * WindowName, int sw, int sh ) +{ + app_sw=sw; app_sh=sh; + frameRect = NSMakeRect(0, 0, app_sw, app_sh); + + initApp(); + + app_window = [[[NSWindow alloc] initWithContentRect:frameRect + styleMask:NSWindowStyleMaskBorderless | NSWindowStyleMaskTitled | NSWindowStyleMaskClosable | NSWindowStyleMaskMiniaturizable backing:NSBackingStoreBuffered defer:NO] + autorelease]; + + NSString *title = [[[NSString alloc] initWithCString: WindowName encoding: NSUTF8StringEncoding] autorelease]; + [app_window setTitle:title]; + [app_window setContentView:app_imageView]; + [app_window cascadeTopLeftFromPoint:NSMakePoint(20,20)]; + [app_window makeKeyAndOrderFront:nil]; + [NSApp activateIgnoringOtherApps:YES]; + bufferContext = createBitmapContext (app_sw, app_sh); + [NSApp finishLaunching]; + [NSApp updateWindows]; + app_pool = [NSAutoreleasePool new]; +} + +#define XK_Left 0xff51 /* Move left, left arrow */ +#define XK_Up 0xff52 /* Move up, up arrow */ +#define XK_Right 0xff53 /* Move right, right arrow */ +#define XK_Down 0xff54 /* Move down, down arrow */ +#define KEY_UNDEFINED 255 +#define KEY_LEFT_MOUSE 0 + +static int keycode(key) +{ + if (key < 256) return key; + switch(key) { + case 63232: return XK_Up; + case 63233: return XK_Down; + case 63234: return XK_Left; + case 63235: return XK_Right; + } + return KEY_UNDEFINED; +} + +void CNFGHandleInput() +{ + [app_pool release]; + app_pool = [NSAutoreleasePool new]; + // Quit if no open windows left + if ([[NSApp windows] count] == 0) [NSApp terminate: nil]; + + //---------------------- + // Peek at the next event + //---------------------- + NSDate *app_currDate = [NSDate new]; + // If we have events, handle them! + NSEvent *event; + for (;(event = [NSApp + nextEventMatchingMask:NSEventMaskAny + untilDate:app_currDate + inMode:NSDefaultRunLoopMode + dequeue:YES]);) + { + NSPoint local_point; + NSEventType type = [event type]; + switch (type) + { + case NSEventTypeKeyDown: + for (int i=0; i<[event.characters length]; i++) { + unichar ch = [event.characters characterAtIndex: i]; + HandleKey(keycode(ch), 1); + } + break; + + case NSEventTypeKeyUp: + for (int i=0; i<[event.characters length]; i++) { + unichar ch = [event.characters characterAtIndex: i]; + HandleKey(keycode(ch), 0); + } + break; + + case NSEventTypeMouseMoved: + case NSEventTypeLeftMouseDragged: + case NSEventTypeRightMouseDragged: + case NSEventTypeOtherMouseDragged: + if (inFullscreen){ + local_point = [NSEvent mouseLocation]; + } else { + if ([event window] == nil) break; + NSPoint event_location = event.locationInWindow; + local_point = [app_imageView convertPoint:event_location fromView:nil]; + } + app_mouseX = fmax(fmin(local_point.x, app_sw), 0); + // Y coordinate must be inversed? + app_mouseY = fmax(fmin(app_sh - local_point.y, app_sh), 0); + HandleMotion(app_mouseX, app_mouseY, [NSEvent pressedMouseButtons]); + break; + + case NSEventTypeLeftMouseDown: + case NSEventTypeRightMouseDown: + case NSEventTypeOtherMouseDown: + // Button number start from 1? + HandleButton(app_mouseX, app_mouseY, event.buttonNumber+1, 1); + break; + + case NSEventTypeLeftMouseUp: + case NSEventTypeRightMouseUp: + case NSEventTypeOtherMouseUp: + HandleButton(app_mouseX, app_mouseY, event.buttonNumber+1, 0); + break; + + default: + break; + } + [NSApp sendEvent:event]; + } + [app_currDate release]; +} + +void CNFGClearFrame() +{ + CGContextSetRGBFillColor(bufferContext, RGB2Color(CNFGBGColor), 1.0); + CGContextFillRect(bufferContext, CGRectMake (0, 0, app_sw, app_sh )); +} + +void CNFGSwapBuffers() +{ + [app_imageView setNeedsDisplay:YES]; +} + +void CNFGUpdateScreenWithBitmap( unsigned long * data, int w, int h ) +{ + CGDataProviderRef provider = CGDataProviderCreateWithData(NULL, data, 4*w*h, NULL); + CGImageRef bitmap = CGImageCreate(w, h, 8, 32, 4*w, colorSpace, kCGBitmapByteOrderDefault, provider, NULL, false, kCGRenderingIntentDefault); + CGContextDrawImage(bufferContext, frameRect, bitmap); + CGImageRelease(bitmap); + CGDataProviderRelease(provider); +} diff --git a/Makefile b/Makefile @@ -20,6 +20,12 @@ cnping : cnping.o CNFGFunctions.o CNFGXDriver.o os_generic.o ping.o cnping-mousey : cnping-mousey.o CNFGFunctions.o CNFGXDriver.o os_generic.o ping.o gcc $(CFLAGS) -o $@ $^ -lX11 -lm -lpthread $(LDFLAGS) +cnping_mac : cnping.c CNFGFunctions.c CNFGCocoaCGDriver.m os_generic.c ping.c + gcc -o cnping $^ -x objective-c -framework Cocoa -framework QuartzCore -lm -lpthread + +cnping-mousey_mac : cnping-mousey.c CNFGFunctions.c CNFGCocoaCGDriver.m os_generic.c ping.c + gcc -o cnping-mousey $^ -x objective-c -framework Cocoa -framework QuartzCore -lm -lpthread + searchnet : os_generic.o ping.o searchnet.o gcc $(CFLAGS) -o $@ $^ -lpthread diff --git a/ping.c b/ping.c @@ -68,7 +68,7 @@ int precise_ping; struct packet { struct icmphdr hdr; - char msg[PACKETSIZE-sizeof(struct icmphdr)]; + unsigned char msg[PACKETSIZE-sizeof(struct icmphdr)]; }; int sd; @@ -112,7 +112,7 @@ void listener() for (;;) { int i; - int addrlenval=sizeof(addr); + socklen_t addrlenval=sizeof(addr); int bytes; #ifdef WIN32 @@ -174,7 +174,7 @@ void ping(struct sockaddr_in *addr ) pckt.hdr.type = ICMP_ECHO; pckt.hdr.un.echo.id = pid; pckt.hdr.un.echo.sequence = cnt++; - pckt.hdr.checksum = checksum(&pckt, sizeof( pckt.hdr ) + rsize ); + pckt.hdr.checksum = checksum((const unsigned char *)&pckt, sizeof( pckt.hdr ) + rsize ); if( sendto(sd, (char*)&pckt, sizeof( pckt.hdr ) + rsize , 0, (struct sockaddr*)addr, sizeof(*addr)) <= 0 ) {