LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-15 15:51:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge in default

Browse Source 
--HG--
branch : minor
This commit is contained in:
Bart van Strien
2012-10-14 17:23:35 +02:00
parent bddee1753b 33d7115887
commit 8867f6c329
49 changed files with 773 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/event/sdl/Event.cpp
+16 -14
View File
@@ -91,22 +91,24 @@ Message *Event::convert(SDL_Event &e)
switch (e.type)
{
case SDL_KEYDOWN:
if (keys.find(e.key.keysym.sym, key) && love::event::Event::keys.find(key, txt))
{
arg1 = new Variant(txt, strlen(txt));
arg2 = new Variant((double) e.key.keysym.unicode);
msg = new Message("keypressed", arg1, arg2);
arg1->release();
arg2->release();
}
if (!keys.find(e.key.keysym.sym, key))
key = love::keyboard::Keyboard::KEY_UNKNOWN;
if (!love::event::Event::keys.find(key, txt))
txt = "unknown";
arg1 = new Variant(txt, strlen(txt));
arg2 = new Variant((double) e.key.keysym.unicode);
msg = new Message("keypressed", arg1, arg2);
arg1->release();
arg2->release();
break;
case SDL_KEYUP:
if (keys.find(e.key.keysym.sym, key) && love::event::Event::keys.find(key, txt))
{
arg1 = new Variant(txt, strlen(txt));
msg = new Message("keyreleased", arg1);
arg1->release();
}
if (!keys.find(e.key.keysym.sym, key))
key = love::keyboard::Keyboard::KEY_UNKNOWN;
if (!love::event::Event::keys.find(key, txt))
txt = "unknown";
arg1 = new Variant(txt, strlen(txt));
msg = new Message("keyreleased", arg1);
arg1->release();
break;
case SDL_MOUSEBUTTONDOWN:
case SDL_MOUSEBUTTONUP: