Mercurial > sdl-ios-xcode
diff src/video/qnxgf/SDL_gf_input.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/qnxgf/SDL_gf_input.c Thu Jan 21 05:49:41 2010 +0000 +++ b/src/video/qnxgf/SDL_gf_input.c Thu Jan 21 06:21:52 2010 +0000 @@ -41,7 +41,7 @@ int gf_showcursor(SDL_Cursor * cursor); void gf_movecursor(SDL_Cursor * cursor); void gf_freecursor(SDL_Cursor * cursor); -void gf_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y); +void gf_warpmouse(SDL_Mouse * mouse, SDL_Window * window, int x, int y); void gf_freemouse(SDL_Mouse * mouse); /* HIDDI interacting functions */ @@ -278,7 +278,7 @@ /* Sanity checks */ window = SDL_GetWindowFromID(window_id); if (window != NULL) { - display = SDL_GetDisplayFromWindow(window); + display = window->display; if (display != NULL) { didata = (SDL_DisplayData *) display->driverdata; if (didata == NULL) { @@ -399,7 +399,7 @@ /* Sanity checks */ window = SDL_GetWindowFromID(window_id); if (window != NULL) { - display = SDL_GetDisplayFromWindow(window); + display = window->display; if (display != NULL) { didata = (SDL_DisplayData *) display->driverdata; if (didata == NULL) { @@ -461,19 +461,17 @@ } void -gf_warpmouse(SDL_Mouse * mouse, SDL_WindowID windowID, int x, int y) +gf_warpmouse(SDL_Mouse * mouse, SDL_Window * window, int x, int y) { SDL_VideoDisplay *display; SDL_DisplayData *didata; - SDL_Window *window; uint32_t xmax; uint32_t ymax; int32_t status; /* Sanity checks */ - window = SDL_GetWindowFromID(windowID); if (window != NULL) { - display = SDL_GetDisplayFromWindow(window); + display = window->display; if (display != NULL) { didata = (SDL_DisplayData *) display->driverdata; if (didata == NULL) { @@ -495,7 +493,7 @@ } /* Get window size to clamp maximum coordinates */ - SDL_GetWindowSize(windowID, &xmax, &ymax); + SDL_GetWindowSize(window, &xmax, &ymax); if (x >= xmax) { x = xmax - 1; }