Mercurial > sdl-ios-xcode
diff src/video/photon/SDL_photon.c @ 3685:64ce267332c6
Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Thu, 21 Jan 2010 06:21:52 +0000 |
| parents | 4b594623401b |
| children | f7b03b6838cb |
line wrap: on
line diff
--- a/src/video/photon/SDL_photon.c Thu Jan 21 05:49:41 2010 +0000 +++ b/src/video/photon/SDL_photon.c Thu Jan 21 06:21:52 2010 +0000 @@ -777,7 +777,7 @@ { SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; SDL_WindowData *wdata; PhDim_t winsize; PhPoint_t winpos; @@ -997,7 +997,7 @@ PtFlush(); /* By default last created window got a input focus */ - SDL_SetKeyboardFocus(0, window->id); + SDL_SetKeyboardFocus(0, window); /* Emit focus gained event, because photon is not sending it */ SDL_OnWindowFocusGained(window); @@ -1055,7 +1055,7 @@ { SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; PhPoint_t winpos; int32_t status; @@ -1223,7 +1223,7 @@ { SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; int32_t status; @@ -1414,7 +1414,7 @@ SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; EGLBoolean status; int32_t gfstatus; EGLint configs; @@ -1941,7 +1941,7 @@ SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; PhRect_t dst_rect; PhRect_t src_rect; int32_t status; @@ -2050,7 +2050,7 @@ SDL_VideoData *phdata = (SDL_VideoData *) _this->driverdata; SDL_WindowData *wdata = (SDL_WindowData *) window->driverdata; SDL_DisplayData *didata = - (SDL_DisplayData *) SDL_GetDisplayFromWindow(window)->driverdata; + (SDL_DisplayData *) window->display->driverdata; SDL_bool makecurrent=SDL_FALSE; int32_t gfstatus; @@ -2199,10 +2199,10 @@ { /* Mouse cursor over handled window */ if (window != NULL) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_ENTER, 0, 0); - SDL_SetMouseFocus(0, window->id); + SDL_SetMouseFocus(0, window); } } break; @@ -2210,7 +2210,7 @@ { /* Mouse cursor out of handled window */ if (window != NULL) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_LEAVE, 0, 0); } @@ -2682,7 +2682,7 @@ case Ph_WM_CLOSE: { if (window != NULL) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_CLOSE, 0, 0); } @@ -2695,10 +2695,10 @@ if (window != NULL) { PhRegion_t wregion; - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_GAINED, 0, 0); - SDL_SetKeyboardFocus(0, window->id); + SDL_SetKeyboardFocus(0, window); /* Set window region sensible to mouse motion events */ PhRegionQuery(PtWidgetRid @@ -2712,7 +2712,7 @@ &wregion, NULL, NULL); /* If window got a focus, then it is visible */ - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_SHOWN, 0, 0); } @@ -2722,7 +2722,7 @@ if (window != NULL) { PhRegion_t wregion; - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_FOCUS_LOST, 0, 0); @@ -2743,7 +2743,7 @@ case Ph_WM_MOVE: { if (window != NULL) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, wmevent->pos.x, wmevent->pos.y); @@ -2754,7 +2754,7 @@ { if (window != NULL) { /* Set new window position after resize */ - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MOVED, wmevent->pos.x, wmevent->pos.y); @@ -2766,7 +2766,7 @@ } /* Set new window size after resize */ - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESIZED, wmevent->size.w, wmevent->size.h); @@ -2777,11 +2777,11 @@ { if (window != NULL) { /* Send new window state: minimized */ - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MINIMIZED, 0, 0); /* In case window is minimized, then it is hidden */ - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_HIDDEN, 0, 0); } @@ -2792,7 +2792,7 @@ if (window != NULL) { if ((window->flags & SDL_WINDOW_RESIZABLE)==SDL_WINDOW_RESIZABLE) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_MAXIMIZED, 0, 0); } @@ -2806,7 +2806,7 @@ case Ph_WM_RESTORE: { if (window != NULL) { - SDL_SendWindowEvent(window->id, + SDL_SendWindowEvent(window, SDL_WINDOWEVENT_RESTORED, 0, 0); }