From 18a366d491939a6976c95b2c301f67c16b65e504 Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Sun, 4 Nov 2012 19:07:49 +0100 Subject: [PATCH] gem: revert back to graf_mkstate usage to get mouse state --- src/video/gem/SDL_gemevents.c | 32 +++++++++++--------------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c index 6b9a373b7..bff48cf08 100644 --- a/src/video/gem/SDL_gemevents.c +++ b/src/video/gem/SDL_gemevents.c @@ -87,25 +87,22 @@ void GEM_PumpEvents(_THIS) quit = 0; resultat = evnt_multi( - MU_MESAG|MU_TIMER|MU_KEYBD|MU_BUTTON|MU_M1, - 0x101,7,prevmb, - MO_LEAVE,prevmx,prevmy,1,1, + MU_MESAG|MU_TIMER|MU_KEYBD, + 0,0,0, + 0,0,0,0,0, 0,0,0,0,0, buffer, 10, - &mousex,&mousey,&mouseb,&kstate,&kc,&dummy + &dummy,&dummy,&dummy,&kstate,&kc,&dummy ); /* Message event ? */ if (resultat & MU_MESAG) quit = do_messages(this, buffer); - /* Special keys ? */ - if (resultat & (MU_KEYBD|MU_BUTTON)) - do_keyboard_special(kstate); - /* Keyboard event ? */ if (resultat & MU_KEYBD) { + do_keyboard_special(kstate); if (prevkc != kc) { do_keyboard(kc); prevkc = kc; @@ -115,24 +112,17 @@ void GEM_PumpEvents(_THIS) } } - /* Mouse motion event ? */ - if (resultat & MU_M1) { - do_mouse_motion(this, mousex, mousey); - prevmx = mousex; - prevmy = mousey; - } - - /* Mouse button event ? */ - if (resultat & MU_BUTTON) { - do_mouse_buttons(this, mouseb); - prevmb = mouseb & 7; - } - /* Timer event ? */ if ((resultat & MU_TIMER) || quit) break; } + /* Update mouse state */ + graf_mkstate(&mousex, &mousey, &mouseb, &kstate); + do_keyboard_special(kstate); + do_mouse_motion(this, mousex, mousey); + do_mouse_buttons(this, mouseb); + /* Now generate keyboard events */ for (i=0; i