Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

merge

Browse source
This commit is contained in:
rti 2010-11-01 21:57:09 +01:00
commit 041febdfc0
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
code/nel/src/3d/driver/opengl/mac/cocoa_event_emitter.cpp
View file

@ -233,19 +233,18 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
if(!server && !_server) if(!server && !_server)
nlerror("no server to post events to"); nlerror("no server to post events to");
// TODO like internal server in unix event emitter... review!
if(!server) if(!server)
server = _server; server = _server;
NSRect viewRect = [_glView frame]; NSRect viewRect = [_glView frame];
CGPoint mousePos = [_glView convertPoint:event.locationInWindow fromView:nil];
// TODO this code assumes, that the view fills the window mousePos.x /= (float)viewRect.size.width;
// convert the mouse position to NeL style (relative) mousePos.y /= (float)viewRect.size.height;
float mouseX = event.locationInWindow.x / (float)viewRect.size.width;
float mouseY = event.locationInWindow.y / (float)viewRect.size.height;
// if the mouse event was placed outside the view, don't tell NeL :) // if the mouse event was placed outside the view, don't tell NeL :)
if((mouseX < 0.0 || mouseX > 1.0 || mouseY < 0.0 || mouseY > 1.0) && if((mousePos.x < 0.0 || mousePos.x > 1.0 ||
mousePos.y < 0.0 || mousePos.y > 1.0) &&
event.type != NSKeyDown && event.type != NSKeyUp) event.type != NSKeyDown && event.type != NSKeyUp)
{ {
return false; return false;
@ -260,28 +259,28 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
case NSLeftMouseDown: case NSLeftMouseDown:
{ {
server->postEvent(new NLMISC::CEventMouseDown( server->postEvent(new NLMISC::CEventMouseDown(
mouseX, mouseY, mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this)); (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
} }
break; break;
case NSLeftMouseUp: case NSLeftMouseUp:
{ {
server->postEvent(new NLMISC::CEventMouseUp( server->postEvent(new NLMISC::CEventMouseUp(
mouseX, mouseY, mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this)); (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this));
break; break;
} }
case NSRightMouseDown: case NSRightMouseDown:
{ {
server->postEvent(new NLMISC::CEventMouseDown( server->postEvent(new NLMISC::CEventMouseDown(
mouseX, mouseY, mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this)); (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this));
break; break;
} }
case NSRightMouseUp: case NSRightMouseUp:
{ {
server->postEvent(new NLMISC::CEventMouseUp( server->postEvent(new NLMISC::CEventMouseUp(
mouseX, mouseY, mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this)); (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this));
break; break;
} }
@ -297,7 +296,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
// normally send position in a CEventMouseMove // normally send position in a CEventMouseMove
else else
nelEvent = new NLMISC::CEventMouseMove( nelEvent = new NLMISC::CEventMouseMove(
mouseX, mouseY, (NLMISC::TMouseButton)modifiers, this); mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers, this);
server->postEvent(nelEvent); server->postEvent(nelEvent);
break; break;
@ -313,7 +312,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
// normally send position in a CEventMouseMove // normally send position in a CEventMouseMove
else else
nelEvent = new NLMISC::CEventMouseMove(mouseX, mouseY, nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this); (NLMISC::TMouseButton)(NLMISC::leftButton | modifiers), this);
server->postEvent(nelEvent); server->postEvent(nelEvent);
@ -330,7 +329,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
// normally send position in a CEventMouseMove // normally send position in a CEventMouseMove
else else
nelEvent = new NLMISC::CEventMouseMove(mouseX, mouseY, nelEvent = new NLMISC::CEventMouseMove(mousePos.x, mousePos.y,
(NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this); (NLMISC::TMouseButton)(NLMISC::rightButton | modifiers), this);
server->postEvent(nelEvent); server->postEvent(nelEvent);
@ -378,7 +377,7 @@ bool CCocoaEventEmitter::processMessage(NSEvent* event, CEventServer* server)
{ {
if(fabs(event.deltaY) > 0.1) if(fabs(event.deltaY) > 0.1)
server->postEvent(new NLMISC::CEventMouseWheel( server->postEvent(new NLMISC::CEventMouseWheel(
mouseX, mouseY, (NLMISC::TMouseButton)modifiers, mousePos.x, mousePos.y, (NLMISC::TMouseButton)modifiers,
(event.deltaY > 0), this)); (event.deltaY > 0), this));
break; break;
@ -423,6 +422,7 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
if(!event) if(!event)
break; break;
// if there is a driver set up, forward event to it's windowProc
if(_driver) if(_driver)
{ {
cocoaProc proc = (cocoaProc)_driver->getWindowProc(); cocoaProc proc = (cocoaProc)_driver->getWindowProc();
@ -430,15 +430,16 @@ void CCocoaEventEmitter::submitEvents(CEventServer& server, bool /* allWins */)
if(proc) if(proc)
proc(_driver, [event eventRef]); proc(_driver, [event eventRef]);
} }
// without driver, just process the event
else else
{ {
processMessage(event, &server); processMessage(event, &server);
} }
// forward the event to the cocoa application
[NSApp sendEvent:event]; [NSApp sendEvent:event];
} }
// TODO like internal server in unix event emitter... review!
_server = &server; _server = &server;
} }