Changeset 2d3e64790dd8e6e7fd384f703ce497d92ac3d32b

Show
Ignore:
Timestamp:
17/03/07 22:20:59 (2 years ago)
Author:
Sam Hocevar <sam@videolan.org>
git-committer:
Sam Hocevar <sam@videolan.org> 1174166459 +0000
git-parent:

[43b0f24c15b32026b1ba620dd7810598821e270a]

git-author:
Sam Hocevar <sam@videolan.org> 1174166459 +0000
Message:
  • modules/video_output/x11/xcommon.c: fix XShm detection on remote X.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/video_output/x11/xcommon.c

    r3ab9ffb r2d3e647  
    27882788static int X11ErrorHandler( Display * display, XErrorEvent * event ) 
    27892789{ 
    2790     /* Ingnore errors on XSetInputFocus() 
    2791     * (they happen when a window is not yet mapped) */ 
    2792     if( event->request_code == X_SetInputFocus ) 
    2793     { 
    2794         fprintf(stderr, "XSetInputFocus failed\n"); 
     2790    switch( event->request_code ) 
     2791    { 
     2792    case X_SetInputFocus: 
     2793        /* Ingnore errors on XSetInputFocus() 
     2794        * (they happen when a window is not yet mapped) */ 
    27952795        return 0; 
    2796     } 
    2797  
    2798     if( event->request_code == 150 /* MIT-SHM */ && 
    2799         event->minor_code == X_ShmAttach ) 
    2800     { 
    2801         fprintf(stderr, "XShmAttach failed\n"); 
    2802         b_shm = VLC_FALSE; 
    2803         return 0; 
     2796 
     2797    case 150: /* MIT-SHM */ 
     2798    case 146: /* MIT-SHM too, what gives? */ 
     2799        if( event->minor_code == X_ShmAttach ) 
     2800        { 
     2801            b_shm = VLC_FALSE; 
     2802            return 0; 
     2803        } 
     2804        break; 
    28042805    } 
    28052806