[Mplayer-cvslog] CVS: main/libvo x11_common.c,1.67,1.68

Zoltan Ponekker pontscho at mplayerhq.hu
Tue Apr 30 00:00:53 CEST 2002


Update of /cvsroot/mplayer/main/libvo
In directory mail:/var/tmp.root/cvs-serv19770/libvo

Modified Files:
	x11_common.c 
Log Message:
fix fullscreen bug es ilyen libvo not initialized bug with gui igy

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- x11_common.c	25 Apr 2002 21:52:47 -0000	1.67
+++ x11_common.c	29 Apr 2002 22:00:50 -0000	1.68
@@ -542,13 +542,18 @@
            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 @@
  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 );
 }




More information about the MPlayer-cvslog mailing list