Mercurial > sdl-ios-xcode
diff src/events/SDL_mouse.c @ 3777:54d08ecec1cb gsoc2008_manymouse
Sharpened code looks and a minor events upgrade
| author | Szymon Wilczek <kazeuser@gmail.com> |
|---|---|
| date | Wed, 06 Aug 2008 09:29:32 +0000 |
| parents | a9c2a7071874 |
| children | a9370b995ded |
line wrap: on
line diff
--- a/src/events/SDL_mouse.c Wed Aug 06 08:48:43 2008 +0000 +++ b/src/events/SDL_mouse.c Wed Aug 06 09:29:32 2008 +0000 @@ -338,6 +338,7 @@ SDL_SendProximity(int id, int x, int y, int type) { int index=SDL_GetIndexById(id); + SDL_Mouse* mouse=SDL_GetMouse(index); int posted=0; last_x=x; last_y=y; @@ -347,23 +348,24 @@ event.proximity.which=(Uint8)index; event.proximity.x=x; event.proximity.y=y; + event.proximity.cursor=mouse->current_end; event.type=type; event.proximity.type=type; posted = (SDL_PushEvent(&event) > 0); if(type==SDL_PROXIMITYIN) { - SDL_mice[index]->proximity=SDL_TRUE; + mouse->proximity=SDL_TRUE; } else { - SDL_mice[index]->proximity=SDL_FALSE; + mouse->proximity=SDL_FALSE; } } return posted; } int -SDL_SendMouseMotion(int id, int relative, int x, int y,int z) +SDL_SendMouseMotion(int id, int relative, int x, int y,int pressure) { int index=SDL_GetIndexById(id); SDL_Mouse *mouse = SDL_GetMouse(index); @@ -440,7 +442,7 @@ } mouse->xdelta += xrel; mouse->ydelta += yrel; - mouse->pressure=z; + mouse->pressure=pressure; /* Move the mouse cursor, if needed */ if (mouse->cursor_shown && !mouse->relative_mode && @@ -450,7 +452,8 @@ /* Post the event, if desired */ posted = 0; - if (SDL_ProcessEvents[SDL_MOUSEMOTION] == SDL_ENABLE && SDL_mice[index]->proximity==SDL_TRUE) { + if (SDL_ProcessEvents[SDL_MOUSEMOTION] == SDL_ENABLE && \ + mouse->proximity==SDL_TRUE) { SDL_Event event; event.motion.type = SDL_MOUSEMOTION; event.motion.which = (Uint8) index;