src/video/directfb/SDL_DirectFB_modes.c
changeset 3011 8f4ed5ec2b06
parent 2859 99210400e8b9
child 3013 8cc00819c8d6
     1.1 --- a/src/video/directfb/SDL_DirectFB_modes.c	Fri Jan 09 20:41:31 2009 +0000
     1.2 +++ b/src/video/directfb/SDL_DirectFB_modes.c	Fri Jan 09 20:43:30 2009 +0000
     1.3 @@ -204,8 +204,9 @@
     1.4      DFBDisplayLayerConfigFlags failed;
     1.5      int ret;
     1.6  
     1.7 -    SDL_DFB_CHECKERR(data->layer->
     1.8 -                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
     1.9 +    SDL_DFB_CHECKERR(data->
    1.10 +                     layer->SetCooperativeLevel(data->layer,
    1.11 +                                                DLSCL_ADMINISTRATIVE));
    1.12      config.width = mode->w;
    1.13      config.height = mode->h;
    1.14      config.pixelformat = SDLToDFBPixelFormat(mode->format);
    1.15 @@ -216,8 +217,8 @@
    1.16      }
    1.17      failed = 0;
    1.18      data->layer->TestConfiguration(data->layer, &config, &failed);
    1.19 -    SDL_DFB_CHECKERR(data->layer->
    1.20 -                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
    1.21 +    SDL_DFB_CHECKERR(data->
    1.22 +                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
    1.23      if (failed == 0)
    1.24          SDL_AddDisplayMode(_this->current_display, mode);
    1.25      else
    1.26 @@ -259,19 +260,20 @@
    1.27          screencbdata->vidlayer[i] = -1;
    1.28      }
    1.29  
    1.30 -    SDL_DFB_CHECKERR(devdata->dfb->
    1.31 -                     EnumScreens(devdata->dfb, &cbScreens, screencbdata));
    1.32 +    SDL_DFB_CHECKERR(devdata->
    1.33 +                     dfb->EnumScreens(devdata->dfb, &cbScreens,
    1.34 +                                      screencbdata));
    1.35  
    1.36      for (i = 0; i < screencbdata->numscreens; i++) {
    1.37          IDirectFBScreen *screen;
    1.38  
    1.39 -        SDL_DFB_CHECKERR(devdata->dfb->
    1.40 -                         GetScreen(devdata->dfb, screencbdata->screenid[i],
    1.41 -                                   &screen));
    1.42 +        SDL_DFB_CHECKERR(devdata->
    1.43 +                         dfb->GetScreen(devdata->dfb,
    1.44 +                                        screencbdata->screenid[i], &screen));
    1.45  
    1.46          screencbdata->aux = i;
    1.47 -        SDL_DFB_CHECKERR(screen->
    1.48 -                         EnumDisplayLayers(screen, &cbLayers, screencbdata));
    1.49 +        SDL_DFB_CHECKERR(screen->EnumDisplayLayers
    1.50 +                         (screen, &cbLayers, screencbdata));
    1.51  #if (DIRECTFB_MAJOR_VERSION >= 1)
    1.52          screen->GetSize(screen, &tcw[i], &tch[i]);
    1.53  #else
    1.54 @@ -293,12 +295,12 @@
    1.55      SDL_DFB_DEBUG("Found %d screens\n", screencbdata->numscreens);
    1.56  
    1.57      for (i = 0; i < screencbdata->numscreens; i++) {
    1.58 -        SDL_DFB_CHECKERR(devdata->dfb->
    1.59 -                         GetDisplayLayer(devdata->dfb,
    1.60 -                                         screencbdata->gralayer[i], &layer));
    1.61 +        SDL_DFB_CHECKERR(devdata->dfb->GetDisplayLayer(devdata->dfb,
    1.62 +                                                       screencbdata->
    1.63 +                                                       gralayer[i], &layer));
    1.64  
    1.65 -        SDL_DFB_CHECKERR(layer->
    1.66 -                         SetCooperativeLevel(layer, DLSCL_ADMINISTRATIVE));
    1.67 +        SDL_DFB_CHECKERR(layer->SetCooperativeLevel
    1.68 +                         (layer, DLSCL_ADMINISTRATIVE));
    1.69          layer->EnableCursor(layer, 1);
    1.70          SDL_DFB_CHECKERR(layer->SetCursorOpacity(layer, 0xC0));
    1.71  
    1.72 @@ -381,8 +383,9 @@
    1.73      data.nummodes = 0;
    1.74      /* Enumerate the available fullscreen modes */
    1.75      SDL_DFB_CALLOC(data.modelist, DFB_MAX_MODES, sizeof(SDL_DisplayMode));
    1.76 -    SDL_DFB_CHECKERR(devdata->dfb->
    1.77 -                     EnumVideoModes(devdata->dfb, EnumModesCallback, &data));
    1.78 +    SDL_DFB_CHECKERR(devdata->
    1.79 +                     dfb->EnumVideoModes(devdata->dfb, EnumModesCallback,
    1.80 +                                         &data));
    1.81  
    1.82      for (i = 0; i < data.nummodes; ++i) {
    1.83          mode = data.modelist[i];
    1.84 @@ -419,8 +422,9 @@
    1.85      DFBDisplayLayerConfigFlags fail = 0;
    1.86      DFBResult ret;
    1.87  
    1.88 -    SDL_DFB_CHECKERR(data->layer->
    1.89 -                     SetCooperativeLevel(data->layer, DLSCL_ADMINISTRATIVE));
    1.90 +    SDL_DFB_CHECKERR(data->
    1.91 +                     layer->SetCooperativeLevel(data->layer,
    1.92 +                                                DLSCL_ADMINISTRATIVE));
    1.93  
    1.94      SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &config));
    1.95      config.flags = DLCONF_WIDTH | DLCONF_HEIGHT;
    1.96 @@ -458,8 +462,8 @@
    1.97  
    1.98      /* Double check */
    1.99      SDL_DFB_CHECKERR(data->layer->GetConfiguration(data->layer, &rconfig));
   1.100 -    SDL_DFB_CHECKERR(data->layer->
   1.101 -                     SetCooperativeLevel(data->layer, DLSCL_SHARED));
   1.102 +    SDL_DFB_CHECKERR(data->
   1.103 +                     layer->SetCooperativeLevel(data->layer, DLSCL_SHARED));
   1.104  
   1.105      if ((config.width != rconfig.width) ||
   1.106          (config.height != rconfig.height) ||
   1.107 @@ -502,13 +506,14 @@
   1.108              (DFB_DisplayData *) _this->displays[i].driverdata;
   1.109  
   1.110          if (dispdata->layer) {
   1.111 -            SDL_DFB_CHECK(dispdata->layer->
   1.112 -                          SetCooperativeLevel(dispdata->layer,
   1.113 -                                              DLSCL_ADMINISTRATIVE));
   1.114 -            SDL_DFB_CHECK(dispdata->layer->
   1.115 -                          SetCursorOpacity(dispdata->layer, 0x00));
   1.116 -            SDL_DFB_CHECK(dispdata->layer->
   1.117 -                          SetCooperativeLevel(dispdata->layer, DLSCL_SHARED));
   1.118 +            SDL_DFB_CHECK(dispdata->
   1.119 +                          layer->SetCooperativeLevel(dispdata->layer,
   1.120 +                                                     DLSCL_ADMINISTRATIVE));
   1.121 +            SDL_DFB_CHECK(dispdata->
   1.122 +                          layer->SetCursorOpacity(dispdata->layer, 0x00));
   1.123 +            SDL_DFB_CHECK(dispdata->
   1.124 +                          layer->SetCooperativeLevel(dispdata->layer,
   1.125 +                                                     DLSCL_SHARED));
   1.126          }
   1.127  
   1.128          SDL_DFB_RELEASE(dispdata->layer);