ObjFW/ObjGameKit.old
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass the display on events.

Browse source
This commit is contained in:
Jonathan Schleifer 2012-08-20 03:18:05 +02:00
parent 7e755a78c9
commit b72b6c8ac7
6 changed files with 128 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

78
src/OGKEventQueue.m
View file

@ -63,36 +63,64 @@ static int mouse_retain_count = 0;
object_setClass(event, [OGKCloseEvent class]);
if ([delegate respondsToSelector:
@selector(displayWasClosed:)])
[delegate displayWasClosed:
(OGKCloseEvent*)event];
@selector(display:wasClosed:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->display.source];
OGKCloseEvent *closeEvent =
(OGKCloseEvent*)event;
[delegate display: display
wasClosed: closeEvent];
}
break;
case ALLEGRO_EVENT_KEY_DOWN:
object_setClass(event, [OGKKeyPressEvent class]);
if ([delegate respondsToSelector:
@selector(keyWasPressed:)])
[delegate keyWasPressed:
(OGKKeyPressEvent*)event];
@selector(keyWasPressed:display:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->keyboard.display];
OGKKeyPressEvent *keyPressEvent =
(OGKKeyPressEvent*)event;
[delegate keyWasPressed: keyPressEvent
display: display];
}
break;
case ALLEGRO_EVENT_KEY_UP:
object_setClass(event, [OGKKeyReleaseEvent class]);
if ([delegate respondsToSelector:
@selector(keyWasReleased:)])
[delegate keyWasReleased:
(OGKKeyReleaseEvent*)event];
@selector(keyWasReleased:display:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->keyboard.display];
OGKKeyReleaseEvent *keyReleaseEvent =
(OGKKeyReleaseEvent*)event;
[delegate keyWasReleased: keyReleaseEvent
display: display];
}
break;
case ALLEGRO_EVENT_MOUSE_AXES:
object_setClass(event, [OGKMouseMovedEvent class]);
if ([delegate respondsToSelector:
@selector(mouseWasMoved:)])
[delegate mouseWasMoved:
(OGKMouseMovedEvent*)event];
@selector(mouseWasMoved:display:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->mouse.display];
OGKMouseMovedEvent *mouseMovedEvent =
(OGKMouseMovedEvent*)event;
[delegate mouseWasMoved: mouseMovedEvent
display: display];
}
break;
case ALLEGRO_EVENT_MOUSE_BUTTON_DOWN:
@ -100,9 +128,16 @@ static int mouse_retain_count = 0;
[OGKMouseButtonPressedEvent class]);
if ([delegate respondsToSelector:
@selector(mouseButtonWasPressed:)])
[delegate mouseButtonWasPressed:
(OGKMouseButtonPressedEvent*)event];
@selector(mouseButtonWasPressed:display:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->mouse.display];
OGKMouseButtonPressedEvent *pressedEvent =
(OGKMouseButtonPressedEvent*)event;
[delegate mouseButtonWasPressed: pressedEvent
display: display];
}
break;
case ALLEGRO_EVENT_MOUSE_BUTTON_UP:
@ -110,9 +145,16 @@ static int mouse_retain_count = 0;
[OGKMouseButtonReleasedEvent class]);
if ([delegate respondsToSelector:
@selector(mouseButtonWasReleased:)])
[delegate mouseButtonWasReleased:
(OGKMouseButtonReleasedEvent*)event];
@selector(mouseButtonWasReleased:display:)]) {
OGKDisplay *display = [OGKDisplay
OGK_displayForAllegroDisplay:
allegroEvent->mouse.display];
OGKMouseButtonReleasedEvent *releasedEvent =
(OGKMouseButtonReleasedEvent*)event;
[delegate mouseButtonWasReleased: releasedEvent
display: display];
}
break;
}