summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-29 22:00:50 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-29 22:00:50 +0000
commit958c31db05a8a6c618b4a18ada856a475530f642 (patch)
treef40e218e7eeda0b823ab66c57723b1161dee47e6 /libvo
parent9ab3c3b38cd1bec3177df1093b3de0fef36c0a8a (diff)
downloadmpv-958c31db05a8a6c618b4a18ada856a475530f642.tar.bz2
mpv-958c31db05a8a6c618b4a18ada856a475530f642.tar.xz
fix fullscreen bug es ilyen libvo not initialized bug with gui igy
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5911 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r--libvo/x11_common.c17
1 files changed, 11 insertions, 6 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 5d80e699bd..268a77bf53 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -542,13 +542,18 @@ int vo_x11_check_events(Display *mydisplay){
break;
#endif
case PropertyNotify:
- if ( !strcmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"_ICEWM_TRAY" ) ||
- !strncmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"_KDE_",5 ) ||
- !strcmp( XGetAtomName( mydisplay,Event.xproperty.atom ),"KWM_WIN_DESKTOP" ) ) vo_wm_type=0;
+ {
+ char * name = XGetAtomName( mydisplay,Event.xproperty.atom );
+ if ( !name ) break;
+ if ( !strncmp( name,"_ICEWM_TRAY",11 ) ||
+ !strncmp( name,"_KDE_",5 ) ||
+ !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) vo_wm_type=0;
fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",
- vo_window,XGetAtomName( mydisplay,Event.xproperty.atom ),Event.xproperty.atom );
-
+ vo_window,name,Event.xproperty.atom );
+
+ XFree( name );
+ }
break;
}
}
@@ -589,7 +594,7 @@ void vo_x11_fullscreen( void )
vo_x11_sizehint( vo_dx,vo_dy,vo_dwidth,vo_dheight,0 );
XMoveResizeWindow( mDisplay,vo_window,vo_dx,vo_dy,vo_dwidth,vo_dheight );
XMapRaised( mDisplay,vo_window );
-
+
XRaiseWindow( mDisplay,vo_window );
XFlush( mDisplay );
}