diff options
author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 15:35:28 +0000 |
---|---|---|
committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-10-16 15:35:28 +0000 |
commit | bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c (patch) | |
tree | e7ad43c99790b2039a4b5bea8a6e2eb55df9d737 /Gui/wm | |
parent | 1413b42ad56a24ed12631fb43ccd7d44c05ac6a8 (diff) | |
download | mpv-bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c.tar.bz2 mpv-bcc4c6b1ae5d13adcb385fc2fc8ee629eaa26d0c.tar.xz |
- dvd aspect changing bug - fixed
- if codec is not found -> sig11 - fixed
- pp autoq handling bug - fixed
- some warning - fixed
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7752 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/wm')
-rw-r--r-- | Gui/wm/ws.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 744a496e4a..443bc8b958 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -575,11 +575,11 @@ Bool wsEvents( Display * display,XEvent * Event,XPointer arg ) case ClientMessage: if ( Event->xclient.message_type == wsWindowList[l]->AtomProtocols ) { - if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow ) + if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomDeleteWindow ) { i=wsWindowClosed; goto expose; } - if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus ) + if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomTakeFocus ) { i=wsWindowFocusIn; wsWindowList[l]->Focused=wsFocused; goto expose; } - if ( Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle ) + if ( (Atom)Event->xclient.data.l[0] == wsWindowList[l]->AtomRolle ) { mp_msg( MSGT_GPLAYER,MSGL_STATUS,"[ws] rolled.\n" ); } } else { /* try to process DND events */ @@ -776,7 +776,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer ) Atom type; int format; unsigned long nitems, bytesafter; - unsigned char * args = NULL; + Atom * args = NULL; if ( wsWMType == wsWMIceWM ) { @@ -792,7 +792,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer ) } type=XInternAtom( wsDisplay,"_NET_SUPPORTED",False ); - if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **)&args ) && nitems > 0 ) { int i; XEvent e; @@ -806,7 +806,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer ) e.xclient.data.l[1]=XInternAtom( wsDisplay,"_NET_WM_STATE_STAYS_ON_TOP",False ); type=XInternAtom( wsDisplay,"_NET_WM_STATE_FULLSCREEN",False ); - for ( i=0;i < nitems;i++ ) + for ( i=0;(unsigned long)i < nitems;i++ ) if ( args[i] == type ) { e.xclient.data.l[1]=XInternAtom( wsDisplay,"_NET_WM_STATE_FULLSCREEN",False ); break; } e.xclient.data.l[2]=0l; @@ -818,7 +818,7 @@ void wsSetLayer( Display * wsDisplay, Window win, int layer ) return; } type=XInternAtom( wsDisplay,"_WIN_SUPPORTING_WM_CHECK",False ); - if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) + if ( Success == XGetWindowProperty( wsDisplay,wsRootWin,type,0,65536 / sizeof( int32_t ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,(unsigned char **)&args ) && nitems > 0 ) { XClientMessageEvent xev; |