diff -u main/libvo/vo_gl.c x11/libvo/vo_gl.c
--- main/libvo/vo_gl.c	Thu Apr 18 20:35:45 2002
+++ x11/libvo/vo_gl.c	Sat May 11 17:20:47 2002
@@ -52,7 +52,7 @@
 
 /* X11 related variables */
 //static Display *mydisplay;
-static Window mywindow;
+//static Window vo_window;
 //static GC mygc;
 //static XImage *myximage;
 //static int depth,mode;
@@ -160,30 +160,30 @@
 	xswamask = CWBackPixel | CWBorderPixel | CWColormap;
 //  xswamask = CWBackPixel | CWBorderPixel | CWColormap | CWEventMask | CWCursor | CWOverrideRedirect | CWSaveUnder | CWX | CWY | CWWidth | CWHeight;
 
-  mywindow = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen),
+  vo_window = XCreateWindow(mDisplay, RootWindow(mDisplay,mScreen),
     hint.x, hint.y, hint.width, hint.height, 4, vinfo->depth,CopyFromParent,vinfo->visual,xswamask,&xswa);
 
-  vo_x11_classhint( mDisplay,mywindow,"gl" );
-  vo_hidecursor(mDisplay,mywindow);
+  vo_x11_classhint( mDisplay,vo_window,"gl" );
+  vo_hidecursor(mDisplay,vo_window);
 
   wsGLXContext=glXCreateContext( mDisplay,vinfo,NULL,True );
 //  XStoreName( wsDisplay,wsMyWin,wsSysName );
 
 //  printf("GLXcontext ok\n");
 
-  if ( flags&0x01 ) vo_x11_decoration( mDisplay,mywindow,0 );
+  if ( flags&0x01 ) vo_x11_decoration( mDisplay,vo_window,0 );
 
-	XSelectInput(mDisplay, mywindow, StructureNotifyMask);
+	XSelectInput(mDisplay, vo_window, StructureNotifyMask);
 
 	/* Tell other applications about this window */
 
-	XSetStandardProperties(mDisplay, mywindow, hello, hello, None, NULL, 0, &hint);
+	XSetStandardProperties(mDisplay, vo_window, hello, hello, None, NULL, 0, &hint);
 
 	/* Map window. */
 
-	XMapWindow(mDisplay, mywindow);
+	XMapWindow(mDisplay, vo_window);
 #ifdef HAVE_XINERAMA
-	vo_x11_xinerama_move(mDisplay,mywindow);
+	vo_x11_xinerama_move(mDisplay,vo_window);
 #endif
 
 	/* Wait for map. */
@@ -191,24 +191,24 @@
 	{
 		XNextEvent(mDisplay, &xev);
 	}
-	while (xev.type != MapNotify || xev.xmap.event != mywindow);
+	while (xev.type != MapNotify || xev.xmap.event != vo_window);
 
-	XSelectInput(mDisplay, mywindow, NoEventMask);
+	XSelectInput(mDisplay, vo_window, NoEventMask);
 
-  glXMakeCurrent( mDisplay,mywindow,wsGLXContext );
+  glXMakeCurrent( mDisplay,vo_window,wsGLXContext );
 
 	XFlush(mDisplay);
 	XSync(mDisplay, False);
 
-//	mygc = XCreateGC(mDisplay, mywindow, 0L, &xgcv);
+//	mygc = XCreateGC(mDisplay, vo_window, 0L, &xgcv);
 
-//		myximage = XGetImage(mDisplay, mywindow, 0, 0,
+//		myximage = XGetImage(mDisplay, vo_window, 0, 0,
 //		width, image_height, AllPlanes, ZPixmap);
 //		ImageData = myximage->data;
 //	bpp = myximage->bits_per_pixel;
 
-	//XSelectInput(mDisplay, mywindow, StructureNotifyMask); // !!!!
-        XSelectInput(mDisplay, mywindow, StructureNotifyMask | KeyPressMask | PointerMotionMask
+	//XSelectInput(mDisplay, vo_window, StructureNotifyMask); // !!!!
+        XSelectInput(mDisplay, vo_window, StructureNotifyMask | KeyPressMask | PointerMotionMask
 #ifdef HAVE_NEW_INPUT
 		     | ButtonPressMask | ButtonReleaseMask
 #endif
@@ -325,7 +325,7 @@
 
 //  glFlush();
   glFinish();
-  glXSwapBuffers( mDisplay,mywindow );
+  glXSwapBuffers( mDisplay,vo_window );
   
 }
 
@@ -471,7 +471,7 @@
 {
   saver_on(mDisplay); // screen saver back on
 
-  vo_x11_uninit(mDisplay, mywindow);
+  vo_x11_uninit(mDisplay, vo_window);
 }
 
 static uint32_t preinit(const char *arg)