Changeset 581319a16e1ff627213dda52830c5ca7ed470176

Show
Ignore:
Timestamp:
05/21/02 00:30:19 (6 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1021933819 +0000
git-parent:

[50e5262462a38131a0bd84480cb3076d81f2f61f]

git-author:
Sam Hocevar <sam@videolan.org> 1021933819 +0000
Message:
  • ./plugins/x11/xcommon.c: fixed x11 and xvideo alternate fullscreen (gibalou
    on t'aiiiiiiiiimeuh).
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • BUGS

    r966567b r581319a  
    1 List of known vlc bugs $Id: BUGS,v 1.12 2002/05/19 16:01:26 massiot Exp $ 
     1List of known vlc bugs $Id: BUGS,v 1.13 2002/05/20 22:30:19 sam Exp $ 
    22 
    33   Please try to keep this file up to date. Also, grep for FIXME in the 
    …… 
    3737  all plugins. Currently it is only implemented for x11 and SDL. 
    3838 
    39   * The alternate_fullscreen method of the x11 and xvideo plugins will 
    40   sometimes not switch to fullscreen. 
    41  
    4239Chroma transformations: 
    4340 

  • ChangeLog

    rff4bf77 r581319a  
    1010Mon, 20 May 2002 22:53:48 +0200 
    1111 
     12  * ./configure.in: tried to fix the -lavcodec detection. 
     13  * ./plugins/x11/xcommon.c: fixed x11 and xvideo alternate fullscreen. 
    1214  * ./plugins/network/ipv6.c: experimental support for Windows IPv6 
    1315  * ./plugins/a52/a52.c: added an option to disable the dynamic range 

  • plugins/x11/xcommon.c

    rac5c557 r581319a  
    33 ***************************************************************************** 
    44 * Copyright (C) 1998-2001 VideoLAN 
    5  * $Id: xcommon.c,v 1.33 2002/05/18 17:47:47 sam Exp $ 
     5 * $Id: xcommon.c,v 1.34 2002/05/20 22:30:19 sam Exp $ 
    66 * 
    77 * Authors: Vincent Seguin <seguin@via.ecp.fr> 
    …… 
    14161416    mwmhints_t mwmhints; 
    14171417    int i_xpos, i_ypos, i_width, i_height; 
    1418     XEvent xevent; 
    14191418    XSetWindowAttributes attributes; 
    14201419 
    …… 
    15441543    /* We need to unmap and remap the window if we want the window  
    15451544     * manager to take our changes into effect */ 
    1546     XUnmapWindow( p_vout->p_sys->p_display, p_vout->p_sys->window); 
    1547  
    1548     XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1549                   StructureNotifyMask, &xevent ); 
    1550     while( xevent.type != UnmapNotify ) 
    1551         XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1552                       StructureNotifyMask, &xevent ); 
    1553  
    1554     XMapRaised( p_vout->p_sys->p_display, p_vout->p_sys->window); 
    1555  
    1556     while( xevent.type != MapNotify ) 
    1557         XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1558                       StructureNotifyMask, &xevent ); 
    1559  
     1545    XReparentWindow( p_vout->p_sys->p_display, 
     1546                     p_vout->p_sys->window, 
     1547                     DefaultRootWindow( p_vout->p_sys->p_display ), 
     1548                     0, 0 ); 
     1549    XSync( p_vout->p_sys->p_display, True ); 
    15601550    XMoveResizeWindow( p_vout->p_sys->p_display, 
    15611551                       p_vout->p_sys->window, 
    …… 
    15641554                       i_width, 
    15651555                       i_height ); 
    1566  
    1567     /* Purge all ConfigureNotify events, this is needed to fix a bug where we 
    1568      * would lose the original size of the window */ 
    1569     while( xevent.type != ConfigureNotify ) 
    1570         XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1571                       StructureNotifyMask, &xevent ); 
    1572     while( XCheckWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1573                               StructureNotifyMask, &xevent ) ); 
    1574  
     1556    XSync( p_vout->p_sys->p_display, True ); 
    15751557 
    15761558    /* We need to check that the window was really restored where we wanted */ 
    …… 
    15991581                         p_vout->p_sys->i_ypos_backup_2 ); 
    16001582 
    1601             /* Purge all ConfigureNotify events, this is needed to fix a bug 
    1602              * where we would lose the original size of the window */ 
    1603             XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1604                           StructureNotifyMask, &xevent ); 
    1605             while( xevent.type != ConfigureNotify ) 
    1606                 XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1607                               StructureNotifyMask, &xevent ); 
    1608             while( XCheckWindowEvent( p_vout->p_sys->p_display, 
    1609                                       p_vout->p_sys->window, 
    1610                                       StructureNotifyMask, &xevent ) ); 
     1583            XSync( p_vout->p_sys->p_display, True ); 
    16111584        } 
    16121585 
    …… 
    16311604                         p_vout->p_sys->i_height_backup_2 ); 
    16321605 
    1633             /* Purge all ConfigureNotify events, this is needed to fix a bug 
    1634              * where we would lose the original size of the window */ 
    1635             XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1636                           StructureNotifyMask, &xevent ); 
    1637             while( xevent.type != ConfigureNotify ) 
    1638                 XWindowEvent( p_vout->p_sys->p_display, p_vout->p_sys->window, 
    1639                               StructureNotifyMask, &xevent ); 
    1640             while( XCheckWindowEvent( p_vout->p_sys->p_display, 
    1641                                       p_vout->p_sys->window, 
    1642                                       StructureNotifyMask, &xevent ) ); 
    1643         } 
    1644     } 
    1645  
    1646     if( p_vout->p_sys->b_altfullscreen ) 
     1606            XSync( p_vout->p_sys->p_display, True ); 
     1607        } 
     1608    } 
     1609 
     1610    if( p_vout->p_sys->b_altfullscreen && p_vout->b_fullscreen ) 
    16471611        XSetInputFocus(p_vout->p_sys->p_display, 
    16481612                       p_vout->p_sys->window,