1.1 --- a/src/video/directfb/SDL_DirectFB_window.c	Fri Jan 09 20:41:31 2009 +0000
     1.2 +++ b/src/video/directfb/SDL_DirectFB_window.c	Fri Jan 09 20:43:30 2009 +0000
     1.3 @@ -43,11 +43,11 @@
     1.4      SDL_DFB_CALLOC(window->driverdata, 1, sizeof(DFB_WindowData));
     1.5      windata = (DFB_WindowData *) window->driverdata;
     1.6  
     1.7 -    SDL_DFB_CHECKERR(devdata->dfb->
     1.8 -                     SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
     1.9 -    SDL_DFB_CHECKERR(dispdata->layer->
    1.10 -                     SetCooperativeLevel(dispdata->layer,
    1.11 -                                         DLSCL_ADMINISTRATIVE));
    1.12 +    SDL_DFB_CHECKERR(devdata->
    1.13 +                     dfb->SetCooperativeLevel(devdata->dfb, DFSCL_NORMAL));
    1.14 +    SDL_DFB_CHECKERR(dispdata->
    1.15 +                     layer->SetCooperativeLevel(dispdata->layer,
    1.16 +                                                DLSCL_ADMINISTRATIVE));
    1.17  
    1.18      /* Fill the window description. */
    1.19      if (window->x == SDL_WINDOWPOS_CENTERED) {
    1.20 @@ -100,8 +100,9 @@
    1.21      /* DSCAPS_VIDEOONLY has negative impact on performance */
    1.22  
    1.23      /* Create the window. */
    1.24 -    SDL_DFB_CHECKERR(dispdata->layer->
    1.25 -                     CreateWindow(dispdata->layer, &desc, &windata->window));
    1.26 +    SDL_DFB_CHECKERR(dispdata->
    1.27 +                     layer->CreateWindow(dispdata->layer, &desc,
    1.28 +                                         &windata->window));
    1.29  
    1.30      windata->window->GetOptions(windata->window, &wopts);
    1.31  #if (DIRECTFB_MAJOR_VERSION == 1) && (DIRECTFB_MINOR_VERSION >= 0)
    1.32 @@ -119,14 +120,14 @@
    1.33  
    1.34      windata->window->SetOptions(windata->window, wopts);
    1.35      /* Get the window's surface. */
    1.36 -    SDL_DFB_CHECKERR(windata->window->
    1.37 -                     GetSurface(windata->window, &windata->surface));
    1.38 +    SDL_DFB_CHECKERR(windata->
    1.39 +                     window->GetSurface(windata->window, &windata->surface));
    1.40      windata->window->SetOpacity(windata->window, 0xFF);
    1.41 -    SDL_DFB_CHECKERR(windata->window->
    1.42 -                     CreateEventBuffer(windata->window,
    1.43 -                                       &(windata->eventbuffer)));
    1.44 -    SDL_DFB_CHECKERR(windata->window->
    1.45 -                     EnableEvents(windata->window, DWET_ALL));
    1.46 +    SDL_DFB_CHECKERR(windata->window->CreateEventBuffer(windata->window,
    1.47 +                                                        &(windata->
    1.48 +                                                          eventbuffer)));
    1.49 +    SDL_DFB_CHECKERR(windata->
    1.50 +                     window->EnableEvents(windata->window, DWET_ALL));
    1.51  
    1.52      if (window->flags & SDL_WINDOW_FULLSCREEN)
    1.53          windata->window->SetStackingClass(windata->window, DWSC_UPPER);
    1.54 @@ -202,19 +203,21 @@
    1.55          int ch;
    1.56  
    1.57          /* Make sure all events are disabled for this operation ! */
    1.58 -        SDL_DFB_CHECKERR(windata->window->
    1.59 -                         DisableEvents(windata->window, DWET_ALL));
    1.60 +        SDL_DFB_CHECKERR(windata->
    1.61 +                         window->DisableEvents(windata->window, DWET_ALL));
    1.62  
    1.63          SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &cw, &ch));
    1.64          if (cw != window->w || ch != window->h)
    1.65 -            SDL_DFB_CHECKERR(windata->window->
    1.66 -                             Resize(windata->window, window->w, window->h));
    1.67 -        SDL_DFB_CHECKERR(windata->window->
    1.68 -                         EnableEvents(windata->window, DWET_ALL));
    1.69 +            SDL_DFB_CHECKERR(windata->
    1.70 +                             window->Resize(windata->window, window->w,
    1.71 +                                            window->h));
    1.72 +        SDL_DFB_CHECKERR(windata->
    1.73 +                         window->EnableEvents(windata->window, DWET_ALL));
    1.74  
    1.75  #else
    1.76 -        SDL_DFB_CHECKERR(windata->window->
    1.77 -                         Resize(windata->window, window->w, window->h));
    1.78 +        SDL_DFB_CHECKERR(windata->
    1.79 +                         window->Resize(windata->window, window->w,
    1.80 +                                        window->h));
    1.81  #endif
    1.82          SDL_DFB_CHECKERR(windata->window->GetSize(windata->window, &window->w, &window->h));    /* if a window manager should have decided otherwise */
    1.83