src/video/directfb/SDL_DirectFB_mouse.c
changeset 5199 164f20ba08eb
parent 4636 b196d2758026
child 5246 58265e606e4e
     1.1 --- a/src/video/directfb/SDL_DirectFB_mouse.c	Sat Feb 05 16:02:30 2011 -0800
     1.2 +++ b/src/video/directfb/SDL_DirectFB_mouse.c	Sat Feb 05 16:07:10 2011 -0800
     1.3 @@ -18,7 +18,11 @@
     1.4  
     1.5      Sam Lantinga
     1.6      slouken@libsdl.org
     1.7 +
     1.8 +    SDL1.3 DirectFB driver by couriersud@arcor.de
     1.9 +	
    1.10  */
    1.11 +
    1.12  #include "SDL_config.h"
    1.13  
    1.14  #include "SDL_DirectFB_video.h"
    1.15 @@ -123,8 +127,8 @@
    1.16      Uint32 *p;
    1.17      int pitch, i;
    1.18  
    1.19 -    SDL_DFB_CALLOC(cursor, 1, sizeof(*cursor));
    1.20 -    SDL_DFB_CALLOC(curdata, 1, sizeof(*curdata));
    1.21 +    SDL_DFB_ALLOC_CLEAR(cursor, 1, sizeof(*cursor));
    1.22 +    SDL_DFB_ALLOC_CLEAR(curdata, 1, sizeof(*curdata));
    1.23  
    1.24      dsc.flags =
    1.25          DSDESC_WIDTH | DSDESC_HEIGHT | DSDESC_PIXELFORMAT | DSDESC_CAPS;
    1.26 @@ -175,7 +179,7 @@
    1.27  
    1.28              if (cursor)
    1.29                  SDL_DFB_CHECKERR(windata->window->
    1.30 -                                 SetCursorShape(windata->window,
    1.31 +                                 SetCursorShape(windata->dfbwin,
    1.32                                                  curdata->surf, curdata->hotx,
    1.33                                                  curdata->hoty));
    1.34  
    1.35 @@ -224,7 +228,7 @@
    1.36      DFBResult ret;
    1.37      int cx, cy;
    1.38  
    1.39 -    SDL_DFB_CHECKERR(windata->window->GetPosition(windata->window, &cx, &cy));
    1.40 +    SDL_DFB_CHECKERR(windata->dfbwin->GetPosition(windata->dfbwin, &cx, &cy));
    1.41      SDL_DFB_CHECKERR(dispdata->layer->WarpCursor(dispdata->layer,
    1.42                                                   cx + x + windata->client.x,
    1.43                                                   cy + y + windata->client.y));
    1.44 @@ -253,7 +257,6 @@
    1.45  void
    1.46  DirectFB_QuitMouse(_THIS)
    1.47  {
    1.48 -    //SDL_DFB_DEVICEDATA(_this);
    1.49  }
    1.50  
    1.51