From 737912cf8b04b4383ffbc0778770faf4adcce751 Mon Sep 17 00:00:00 2001 From: Nicolas Aguirre Date: Tue, 10 Dec 2013 08:24:14 +0100 Subject: [PATCH] ecore_cocoa: remove printf --- src/lib/ecore_cocoa/ecore_cocoa.m | 28 ++++++++++++++++++++++------ 1 file changed, 22 insertions(+), 6 deletions(-) diff --git a/src/lib/ecore_cocoa/ecore_cocoa.m b/src/lib/ecore_cocoa/ecore_cocoa.m index 3f6023af1f..5d8e2882cf 100644 --- a/src/lib/ecore_cocoa/ecore_cocoa.m +++ b/src/lib/ecore_cocoa/ecore_cocoa.m @@ -81,8 +81,13 @@ ecore_cocoa_feed_events(void) { Ecore_Event_Mouse_Move * ev = calloc(1, sizeof(Ecore_Event_Mouse_Move)); if (!ev) return; - ev->x = [event locationInWindow].x; - ev->y = [event locationInWindow].y; + + EcoreCocoaWindow *window = (EcoreCocoaWindow *)[event window]; + NSView *view = [window contentView]; + NSPoint pt = [event locationInWindow]; + + ev->x = pt.x; + ev->y = [view frame].size.height - pt.y; ev->root.x = ev->x; ev->root.y = ev->y; ev->timestamp = time; @@ -100,8 +105,13 @@ ecore_cocoa_feed_events(void) { Ecore_Event_Mouse_Button * ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)); if (!ev) return; - ev->x = [event locationInWindow].x; - ev->y = [event locationInWindow].y; + + EcoreCocoaWindow *window = (EcoreCocoaWindow *)[event window]; + NSView *view = [window contentView]; + NSPoint pt = [event locationInWindow]; + + ev->x = pt.x; + ev->y = [view frame].size.height - pt.y; ev->root.x = ev->x; ev->root.y = ev->y; ev->timestamp = time; @@ -128,8 +138,13 @@ ecore_cocoa_feed_events(void) { Ecore_Event_Mouse_Button * ev = calloc(1, sizeof(Ecore_Event_Mouse_Button)); if (!ev) return; - ev->x = [event locationInWindow].x; - ev->y = [event locationInWindow].y; + + EcoreCocoaWindow *window = (EcoreCocoaWindow *)[event window]; + NSView *view = [window contentView]; + NSPoint pt = [event locationInWindow]; + + ev->x = pt.x; + ev->y = [view frame].size.height - pt.y; ev->root.x = ev->x; ev->root.y = ev->y; ev->timestamp = time; @@ -163,6 +178,7 @@ ecore_cocoa_feed_events(void) { if (keystable[i].code == tolower([[event charactersIgnoringModifiers] characterAtIndex:0])) { + printf("Key pressed : %s\n", keystable[i].name); ev->keyname = keystable[i].name; ev->string = keystable[i].compose;