Mercurial > sdl-ios-xcode
diff src/video/directfb/SDL_DirectFB_mouse.c @ 5202:164f20ba08eb
Updated the DirectFB support, from Couriersud
attached is a working directfb driver diff which works with the current
changes. There are a number of changes around it as well, e.g.
configure.in.
The directfb renderdriver right now still depends on a some "includes"
from src/video/directfb. That's why it is not yet moved to the new
render folder.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Sat, 05 Feb 2011 16:07:10 -0800 |
| parents | b196d2758026 |
| children | 58265e606e4e |
line wrap: on
line diff
--- a/src/video/directfb/SDL_DirectFB_mouse.c Sat Feb 05 16:02:30 2011 -0800 +++ b/src/video/directfb/SDL_DirectFB_mouse.c Sat Feb 05 16:07:10 2011 -0800 @@ -18,7 +18,11 @@ Sam Lantinga slouken@libsdl.org + + SDL1.3 DirectFB driver by couriersud@arcor.de + */ + #include "SDL_config.h" #include "SDL_DirectFB_video.h" @@ -123,8 +127,8 @@ Uint32 *p; int pitch, i; - SDL_DFB_CALLOC(cursor, 1, sizeof(*cursor)); - SDL_DFB_CALLOC(curdata, 1, sizeof(*curdata)); + SDL_DFB_ALLOC_CLEAR(cursor, 1, sizeof(*cursor)); + SDL_DFB_ALLOC_CLEAR(curdata, 1, sizeof(*curdata)); dsc.flags = DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS; @@ -175,7 +179,7 @@ if (cursor) SDL_DFB_CHECKERR(windata->window-> - SetCursorShape(windata->window, + SetCursorShape(windata->dfbwin, curdata->surf, curdata->hotx, curdata->hoty)); @@ -224,7 +228,7 @@ DFBResult ret; int cx, cy; - SDL_DFB_CHECKERR(windata->window->GetPosition(windata->window, &cx, &cy)); + SDL_DFB_CHECKERR(windata->dfbwin->GetPosition(windata->dfbwin, &cx, &cy)); SDL_DFB_CHECKERR(dispdata->layer->WarpCursor(dispdata->layer, cx + x + windata->client.x, cy + y + windata->client.y)); @@ -253,7 +257,6 @@ void DirectFB_QuitMouse(_THIS) { - //SDL_DFB_DEVICEDATA(_this); }