View | Details | Raw Unified
Collapse All | Expand All

(-) SDL-1.2.10.orig/src/video/x11/SDL_x11modes.c (+6 lines)
 Lines 629-635    Link Here  
#if SDL_VIDEO_DRIVER_X11_VIDMODE
#if SDL_VIDEO_DRIVER_X11_VIDMODE
    /* XVidMode */
    /* XVidMode */
    if ( !use_xrandr &&
    if ( !use_xrandr &&
#if SDL_VIDEO_DRIVER_X11_XINERAMA
 
         (!use_xinerama || xinerama_info.screen_number == 0) &&
         (!use_xinerama || xinerama_info.screen_number == 0) &&
#endif
 
         CheckVidMode(this, &vm_major, &vm_minor) &&
         CheckVidMode(this, &vm_major, &vm_minor) &&
         SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
         SDL_NAME(XF86VidModeGetAllModeLines)(SDL_Display, SDL_Screen,&nmodes,&modes) )
    {
    {
 Lines 901-906    Link Here  
    screen_h = DisplayHeight(SDL_Display, SDL_Screen);
    screen_h = DisplayHeight(SDL_Display, SDL_Screen);

        
#if SDL_VIDEO_DRIVER_X11_VIDMODE
#if SDL_VIDEO_DRIVER_X11_VIDMODE

            

              
              
#if SDL_VIDEO_DRIVER_X11_XINERAMA

            

        
    if ( use_xinerama &&
    if ( use_xinerama &&

        
         window_w <= xinerama_info.width &&
         window_w <= xinerama_info.width &&

        
         window_h <= xinerama_info.height ) {
         window_h <= xinerama_info.height ) {

  

    

    

       Lines 908-913
       
    
  Link Here 
    

  

        
        y = xinerama_info.y_org;
        y = xinerama_info.y_org;

        
    }
    }

        
#endif
#endif

            

              
              
#endif

            

        
    if ( currently_fullscreen ) {
    if ( currently_fullscreen ) {

        
        /* Switch resolution and cover it with the FSwindow */
        /* Switch resolution and cover it with the FSwindow */

        
        move_cursor_to(this, x, y);
        move_cursor_to(this, x, y);

  

    

    

       Lines 963-968
       
    
  Link Here 
    

  

        
    X11_GrabInputNoLock(this, SDL_GRAB_OFF);
    X11_GrabInputNoLock(this, SDL_GRAB_OFF);

        

        
#if SDL_VIDEO_DRIVER_X11_VIDMODE
#if SDL_VIDEO_DRIVER_X11_VIDMODE

            

              
              
#if SDL_VIDEO_DRIVER_X11_XINERAMA

            

        
    if ( use_xinerama &&
    if ( use_xinerama &&

        
         window_w <= xinerama_info.width &&
         window_w <= xinerama_info.width &&

        
         window_h <= xinerama_info.height ) {
         window_h <= xinerama_info.height ) {

  

    

    

       Lines 970-975
       
    
  Link Here 
    

  

        
        y = xinerama_info.y_org;
        y = xinerama_info.y_org;

        
    }
    }

        
#endif
#endif

            

              
              
#endif

            

        
    /* Map the fullscreen window to blank the screen */
    /* Map the fullscreen window to blank the screen */

        
    screen_w = DisplayWidth(SDL_Display, SDL_Screen);
    screen_w = DisplayWidth(SDL_Display, SDL_Screen);

        
    screen_h = DisplayHeight(SDL_Display, SDL_Screen);
    screen_h = DisplayHeight(SDL_Display, SDL_Screen);



(-) SDL-1.2.10.orig/src/video/x11/SDL_x11video.c
      (+2 lines)




  

    

    

       Lines 330-340
       
    
  Link Here 
    

  

        
	XDestroyWindow(SDL_Display, FSwindow);
	XDestroyWindow(SDL_Display, FSwindow);

        

        
#if SDL_VIDEO_DRIVER_X11_VIDMODE
#if SDL_VIDEO_DRIVER_X11_VIDMODE

            

              
              
#if SDL_VIDEO_DRIVER_X11_XINERAMA

            

        
    if ( use_xinerama ) {
    if ( use_xinerama ) {

        
        x = xinerama_info.x_org;
        x = xinerama_info.x_org;

        
        y = xinerama_info.y_org;
        y = xinerama_info.y_org;

        
    }
    }

        
#endif
#endif

            

              
              
#endif

            

        
    xattr.override_redirect = True;
    xattr.override_redirect = True;

        
    xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0;
    xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0;

        
    xattr.border_pixel = 0;
    xattr.border_pixel = 0;