Mercurial > mplayer.hg
comparison libvo/x11_common.c @ 7747:ff5d9b3815b5
10l to Dominik - casting at wrong place
author | arpi |
---|---|
date | Wed, 16 Oct 2002 13:31:38 +0000 |
parents | 1f8961f2b34c |
children | 52171f231d4d |
comparison
equal
deleted
inserted
replaced
7746:15ce89ba92cf | 7747:ff5d9b3815b5 |
---|---|
633 void vo_x11_setlayer( int layer ) | 633 void vo_x11_setlayer( int layer ) |
634 { | 634 { |
635 Atom type; | 635 Atom type; |
636 int format; | 636 int format; |
637 unsigned long nitems, bytesafter; | 637 unsigned long nitems, bytesafter; |
638 unsigned char * args = NULL; | 638 Atom * args = NULL; |
639 | 639 |
640 if ( WinID >= 0 ) return; | 640 if ( WinID >= 0 ) return; |
641 | 641 |
642 if ( vo_wm_type == vo_wm_IceWM ) | 642 if ( vo_wm_type == vo_wm_IceWM ) |
643 { | 643 { |
653 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, (XEvent *) &xev); | 653 XSendEvent(mDisplay, mRootWin, False, SubstructureNotifyMask, (XEvent *) &xev); |
654 return; | 654 return; |
655 } | 655 } |
656 | 656 |
657 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); | 657 type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); |
658 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) | 658 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char**)(&args) ) && nitems > 0 ) |
659 { | 659 { |
660 XEvent e; | 660 XEvent e; |
661 int i; | 661 int i; |
662 | 662 |
663 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ).\n",layer ); | 663 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] NET style stay on top ( layer %d ).\n",layer ); |
678 | 678 |
679 XFree( args ); | 679 XFree( args ); |
680 return; | 680 return; |
681 } | 681 } |
682 type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); | 682 type=XInternAtom( mDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); |
683 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) | 683 if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char**)(&args) ) && nitems > 0 ) |
684 { | 684 { |
685 XClientMessageEvent xev; | 685 XClientMessageEvent xev; |
686 | 686 |
687 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Gnome style stay on top ( layer %d ).\n",layer ); | 687 mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Gnome style stay on top ( layer %d ).\n",layer ); |
688 memset( &xev,0,sizeof( xev ) ); | 688 memset( &xev,0,sizeof( xev ) ); |