comparison libvo/x11_common.c @ 6095:891cff8aba60

some cleanup, gl/gl2 updated to use vo_window

6094:0f4dbbe57c08

	    event->type, event->display, event->resourceid, event->serial);
	printf("Error code: %x, request code: %x, minor code: %x\n",
	    event->error_code, event->request_code, event->minor_code);
    }
    
    exit_player("X11 error");
#undef MSGLEN
}

int vo_wm_string_test( char * name )
{

	    wmClass.res_class = "MPlayer";
	    XSetClassHint(display,window,&wmClass);
}

Window     vo_window = None;
GC         vo_gc;
XSizeHints vo_hint;

#ifdef HAVE_NEW_GUI
 void vo_setwindow( Window w,GC g ) {
   vo_window=w; vo_gc=g;
 }
#endif

int vo_x11_uninit(Display *display, Window window)
{
    vo_showcursor( display,window );

#ifdef HAVE_NEW_GUI
    /* destroy window only if it's not controlled by GUI */
    if ( !use_gui )
#endif
    {
	XSetBackground( mDisplay,vo_gc,0 );
	XClearWindow( mDisplay,vo_window );
  
	/* and -wid is set */
	if (WinID < 0)
	 {
	  XUnmapWindow( display,window );
	  XDestroyWindow(display, window);
	 }
	vo_fs=0;
    }
    return(1);
}

       int vo_mouse_timer_const = 30;
static int vo_mouse_counter = 30;

 static XComposeStatus stat;

// unsigned long  vo_KeyTable[512];

 if ( ( vo_mouse_autohide )&&( --vo_mouse_counter == 0 ) ) vo_hidecursor( mydisplay,vo_window );
 
 while ( XPending( mydisplay ) )
  {
   XNextEvent( mydisplay,&Event );
   #ifdef HAVE_NEW_GUI
    if ( use_gui ) 
     {
      guiGetEvent( 0,(char*)&Event );
      if ( vo_window != Event.xany.window ) continue;
     }
   #endif
    switch( Event.type )
     {
      case Expose:
           ret|=VO_EVENT_EXPOSE;
           break;

6095:891cff8aba60

	    event->type, event->display, event->resourceid, event->serial);
	printf("Error code: %x, request code: %x, minor code: %x\n",
	    event->error_code, event->request_code, event->minor_code);
    }
    
    abort();
    //exit_player("X11 error");
#undef MSGLEN
}

int vo_wm_string_test( char * name )
{

	    wmClass.res_class = "MPlayer";
	    XSetClassHint(display,window,&wmClass);
}

Window     vo_window = None;
GC         vo_gc = NULL;
XSizeHints vo_hint;

#ifdef HAVE_NEW_GUI
 void vo_setwindow( Window w,GC g ) {
   vo_window=w; vo_gc=g;
 }
#endif

void vo_x11_uninit()
{
    if(vo_window!=None) vo_showcursor( mDisplay,vo_window );

#ifdef HAVE_NEW_GUI
    /* destroy window only if it's not controlled by GUI */
    if ( !use_gui )
#endif
    {
	if(vo_gc){
	  XSetBackground( mDisplay,vo_gc,0 );
	  vo_gc=NULL;
	}
	if(vo_window!=None){
	  XClearWindow( mDisplay,vo_window );
	  if (WinID < 0){
	    XUnmapWindow( mDisplay,vo_window );
	    XDestroyWindow(mDisplay, vo_window);
	  }
	  vo_window=None;
	}
	vo_fs=0;
    }
}

       int vo_mouse_timer_const = 30;
static int vo_mouse_counter = 30;

 static XComposeStatus stat;

// unsigned long  vo_KeyTable[512];

 if ( ( vo_mouse_autohide )&&( --vo_mouse_counter == 0 ) ) vo_hidecursor( mydisplay,vo_window );

 while ( XPending( mydisplay ) )
  {
   XNextEvent( mydisplay,&Event );
   #ifdef HAVE_NEW_GUI
    if ( use_gui ) 
     {
      guiGetEvent( 0,(char*)&Event );
      if ( vo_window != Event.xany.window ) continue;
     }
   #endif
//       printf("\rEvent.type=%X  \n",Event.type);
    switch( Event.type )
     {
      case Expose:
           ret|=VO_EVENT_EXPOSE;
           break;