comparison libvo/vo_xmga.c @ 1723:5e4214a7540e

GUI stuff. now seeking works, and xmga renders to video window

1722:9e23ceba3f65

static void set_window(){

         XGetGeometry( mDisplay,mWindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
         drwX=0; drwY=0; // drwWidth=wndWidth; drwHeight=wndHeight;
         XTranslateCoordinates( mDisplay,mWindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
         //fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );

         #ifdef HAVE_GUI
          if ( vo_window != None )
           {
            mFullscreen=0;

   case 16: fgColor=0xf81fL; break;
   case 15: fgColor=0x7c1fL; break;
   default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
  }

#ifdef HAVE_GUI
 if ( vo_window == None )
  {
#endif
   if ( mFullscreen )
    {

   hint.base_width=wndWidth; hint.base_height=wndHeight;
   hint.flags=USPosition | USSize;
   XSetNormalHints( mDisplay,mWindow,&hint );
   XStoreName( mDisplay,mWindow,mTitle );
   XMapWindow( mDisplay,mWindow );
#ifdef HAVE_GUI
  }
  else
    {
     mWindow=vo_window;
     fprintf( stderr,"[xmga] width: %d height: %d d_width: %d d_height: %d\n",width,height,d_width,d_height );

      {
       XMoveWindow( mDisplay,mWindow,( vo_screenwidth - d_width ) / 2,( vo_screenheight - d_height ) / 2 );
       XResizeWindow( mDisplay,mWindow,d_width,d_height );
      }
      else mFullscreen=1;
    }
#endif
 mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );

 set_window();

 mga_vid_config.src_width=width;
 mga_vid_config.src_height=height;

 mga_vid_config.colkey_green=0;
 mga_vid_config.colkey_blue=255;

 if(mga_init()) return -1;

#ifdef HAVE_GUI
 if ( vo_window == None )
  {
#endif
   XFlush( mDisplay );
   XSync( mDisplay,False );
#ifdef HAVE_GUI
  }
#endif

 saver_off(mDisplay);

 return 0;
}

1723:5e4214a7540e

static void set_window(){

         XGetGeometry( mDisplay,mWindow,&mRoot,&drwX,&drwY,&drwWidth,&drwHeight,&drwBorderWidth,&drwDepth );
         drwX=0; drwY=0; // drwWidth=wndWidth; drwHeight=wndHeight;
         XTranslateCoordinates( mDisplay,mWindow,mRoot,0,0,&drwcX,&drwcY,&mRoot );
         fprintf( stderr,"[xmga] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight );

         #ifdef HAVE_GUI
          if ( vo_window != None )
           {
            mFullscreen=0;

   case 16: fgColor=0xf81fL; break;
   case 15: fgColor=0x7c1fL; break;
   default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
  }

#ifdef HAVE_NEW_GUI
 if ( vo_window == None )
  {
#endif
   if ( mFullscreen )
    {

   hint.base_width=wndWidth; hint.base_height=wndHeight;
   hint.flags=USPosition | USSize;
   XSetNormalHints( mDisplay,mWindow,&hint );
   XStoreName( mDisplay,mWindow,mTitle );
   XMapWindow( mDisplay,mWindow );
   mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
#ifdef HAVE_NEW_GUI
  }
  else
    {
     mWindow=vo_window;
     fprintf( stderr,"[xmga] width: %d height: %d d_width: %d d_height: %d\n",width,height,d_width,d_height );

      {
       XMoveWindow( mDisplay,mWindow,( vo_screenwidth - d_width ) / 2,( vo_screenheight - d_height ) / 2 );
       XResizeWindow( mDisplay,mWindow,d_width,d_height );
      }
      else mFullscreen=1;
      mGC=vo_gc; //XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
    }
#endif

 set_window();

 mga_vid_config.src_width=width;
 mga_vid_config.src_height=height;

 mga_vid_config.colkey_green=0;
 mga_vid_config.colkey_blue=255;

 if(mga_init()) return -1;

#ifdef HAVE_NEW_GUI
 if ( vo_window == None )
#endif
 {
   XFlush( mDisplay );
   XSync( mDisplay,False );
 }
 saver_off(mDisplay);

 return 0;
}