Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.113
diff -u -w -r1.113 x11_common.c
--- x11_common.c	16 Nov 2002 16:08:36 -0000	1.113
+++ x11_common.c	28 Nov 2002 23:06:56 -0000
@@ -1,3 +1,7 @@
+/* Window manager references:
+ * http://www.freedesktop.org/standards/wm-spec.html
+ * http://developer.gnome.org/standards/wm/book1.html
+ */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -132,7 +136,6 @@
   { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); return vo_wm_KDE; }
  if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) )
   { mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); return vo_wm_WMakerStyle; }
-// fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",win,name,xev.xproperty.atom );
  return vo_wm_Unknown;
 }
 
@@ -155,13 +158,13 @@
  type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
  if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,16384,False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 )
   {
-   mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is of class NetWM.\n" );
+   mp_msg( MSGT_VO,MSGL_V,"VO: Detected wm is of class NetWM.\n" );
    XFree( args );
    return vo_wm_NetWM;
   }
 #endif
 // --- other wm
- mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Create window for WM detect ...\n" );
+  mp_msg( MSGT_VO,MSGL_V,"VO: Detected wm is not of class NetWM.\n" );
  win=XCreateSimpleWindow( mDisplay,mRootWin,vo_screenwidth,vo_screenheight,1,1,0,0,0 );
  XSelectInput( mDisplay,win,PropertyChangeMask | StructureNotifyMask );
  XMapWindow( mDisplay,win );
@@ -218,7 +221,7 @@
  mDisplay=XOpenDisplay(dispName);
  if ( !mDisplay )
   {
-   mp_msg(MSGT_VO,MSGL_ERR,"vo: couldn't open the X11 display (%s)!\n",dispName );
+   mp_msg(MSGT_VO,MSGL_ERR,"VO: couldn't open the X11 display (%s)!\n",dispName );
    return 0;
   }
  mScreen=DefaultScreen( mDisplay );     // Screen ID.
@@ -288,7 +291,7 @@
    bpp=mXImage->bits_per_pixel;
    if((vo_depthonscreen+7)/8 != (bpp+7)/8) vo_depthonscreen=bpp; // by A'rpi
    mask=mXImage->red_mask|mXImage->green_mask|mXImage->blue_mask;
-   mp_msg(MSGT_VO,MSGL_V,"vo: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
+   mp_msg(MSGT_VO,MSGL_V,"VO: X11 color mask:  %X  (R:%lX G:%lX B:%lX)\n",
 	    mask,mXImage->red_mask,mXImage->green_mask,mXImage->blue_mask);
    XDestroyImage( mXImage );
  }
@@ -303,7 +306,7 @@
  else if ( strncmp(dispName, "localhost:", 10) == 0)
 		dispName += 9;
  if (*dispName==':' && atoi(dispName+1)<10) mLocalDisplay=1; else mLocalDisplay=0;
- mp_msg(MSGT_VO,MSGL_INFO,"vo: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n",
+ mp_msg(MSGT_VO,MSGL_INFO,"VO: X11 running at %dx%d with depth %d and %d bpp (\"%s\" => %s display)\n",
 	vo_screenwidth,vo_screenheight,
 	depth, vo_depthonscreen,
 	dispName,mLocalDisplay?"local":"remote");
@@ -318,11 +321,11 @@
 {
  if (!mDisplay)
  {
-    mp_msg(MSGT_VO, MSGL_V, "vo: x11 uninit called but X11 not inited..\n");
+    mp_msg(MSGT_VO, MSGL_V, "VO: x11 uninit called but X11 not inited..\n");
     return;
  }
 // if( !vo_depthonscreen ) return;
- mp_msg(MSGT_VO,MSGL_V,"vo: uninit ...\n" );
+ mp_msg(MSGT_VO,MSGL_V,"VO: uninit ...\n" );
  XSetErrorHandler(NULL);
  XCloseDisplay( mDisplay );
  vo_depthonscreen = 0;
@@ -609,8 +612,6 @@
 	    wm=vo_wm_string_test(name);
 	    if ( wm != vo_wm_Unknown ) vo_wm_type=wm;
 
-//          fprintf(stderr,"[ws] PropertyNotify ( 0x%x ) %s ( 0x%x )\n",vo_window,name,Event.xproperty.atom );
-	      
 	    XFree( name );
 	   }
 	   break;
@@ -954,7 +955,7 @@
 			   &nvisuals);
   if (visuals != NULL) {
     for (i = 0; i < nvisuals; i++) {
-      mp_msg(MSGT_VO,MSGL_V,"vo: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
+      mp_msg(MSGT_VO,MSGL_V,"VO: X11 truecolor visual %#x, depth %d, R:%lX G:%lX B:%lX\n",
 	       visuals[i].visualid, visuals[i].depth,
 	       visuals[i].red_mask, visuals[i].green_mask,
 	       visuals[i].blue_mask);