Mercurial > sdl-ios-xcode
changeset 1089:b3f7c4af00e0
Don't use both mouse events for the same task
| author | Patrice Mandin <patmandin@gmail.com> |
|---|---|
| date | Thu, 07 Jul 2005 13:38:22 +0000 |
| parents | 6091b9ca1a97 |
| children | 37fc855580af |
| files | src/video/gem/SDL_gemevents.c |
| diffstat | 1 files changed, 14 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/video/gem/SDL_gemevents.c Thu Jul 07 12:10:30 2005 +0000 +++ b/src/video/gem/SDL_gemevents.c Thu Jul 07 13:38:22 2005 +0000 @@ -142,21 +142,26 @@ short buffer[8], kc; short x2,y2,w2,h2; - quit = 0; + quit = + mouse_event = + x2=y2=w2=h2 = 0; event_mask = MU_MESAG|MU_TIMER|MU_KEYBD; if (!GEM_fullscreen && (GEM_handle>=0)) { wind_get (GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2); - event_mask |= MU_M1|MU_M2; - } else { - x2=y2=w2=h2=0; + event_mask |= MU_M1; + if ( (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { + mouse_event = MO_LEAVE; + } else { + mouse_event = MO_ENTER; + } } resultat = evnt_multi( event_mask, 0,0,0, - MO_ENTER,x2,y2,w2,h2, - MO_LEAVE,x2,y2,w2,h2, + mouse_event,x2,y2,w2,h2, + 0,0,0,0,0, buffer, 10, &dummy,&dummy,&dummy,&kstate,&kc,&dummy @@ -179,18 +184,13 @@ /* Mouse entering/leaving window */ if (resultat & MU_M1) { if (this->input_grab == SDL_GRAB_OFF) { - if ( !(SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { + if (SDL_GetAppState() & SDL_APPMOUSEFOCUS) { + SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); + } else { SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); } } } - if (resultat & MU_M2) { - if (this->input_grab == SDL_GRAB_OFF) { - if ( (SDL_GetAppState() & SDL_APPMOUSEFOCUS) ) { - SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); - ] - } - } /* Timer event ? */ if ((resultat & MU_TIMER) || quit)