[Mplayer-cvslog] CVS: main/libvo vo_xmga.c,1.26,1.27 x11_common.c,1.30,1.31 x11_common.h,1.7,1.8

[Arpi of Ize]

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

Modified Files:
	vo_xmga.c x11_common.c x11_common.h 
Log Message:
GUI stuff. now seeking works, and xmga renders to video window

Index: vo_xmga.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_xmga.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- vo_xmga.c	22 Aug 2001 21:34:27 -0000	1.26
+++ vo_xmga.c	27 Aug 2001 23:56:44 -0000	1.27
@@ -108,7 +108,7 @@
          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 );
+         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 )
@@ -249,7 +249,7 @@
    default: printf( "Sorry, this (%d) color depth not supported.\n",vo_depthonscreen ); return -1;
   }
 
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
  if ( vo_window == None )
   {
 #endif
@@ -289,7 +289,8 @@
    XSetNormalHints( mDisplay,mWindow,&hint );
    XStoreName( mDisplay,mWindow,mTitle );
    XMapWindow( mDisplay,mWindow );
-#ifdef HAVE_GUI
+   mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
+#ifdef HAVE_NEW_GUI
   }
   else
     {
@@ -301,9 +302,9 @@
        XResizeWindow( mDisplay,mWindow,d_width,d_height );
       }
       else mFullscreen=1;
+      mGC=vo_gc; //XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
     }
 #endif
- mGC=XCreateGC( mDisplay,mWindow,GCForeground,&wGCV );
 
  set_window();
 
@@ -317,16 +318,13 @@
 
  if(mga_init()) return -1;
 
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
  if ( vo_window == None )
-  {
 #endif
+ {
    XFlush( mDisplay );
    XSync( mDisplay,False );
-#ifdef HAVE_GUI
-  }
-#endif
-
+ }
  saver_off(mDisplay);
 
  return 0;

Index: x11_common.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- x11_common.c	13 Aug 2001 11:08:18 -0000	1.30
+++ x11_common.c	27 Aug 2001 23:56:44 -0000	1.31
@@ -227,15 +227,17 @@
 	    XSetClassHint(display,window,&wmClass);
 }
 
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
  Window    vo_window = None;
  GC        vo_gc;
  int       vo_xeventhandling = 1;
  int       vo_resize = 0;
  int       vo_expose = 0;
 
- void vo_setwindow( Window w,GC g )
- { vo_window=w; vo_gc=g; }
+ void vo_setwindow( Window w,GC g ) {
+   vo_window=w; vo_gc=g;
+   vo_xeventhandling=0;
+ }
 #endif
 
 int vo_x11_check_events(Display *mydisplay){
@@ -246,7 +248,7 @@
  static XComposeStatus stat;
 // unsigned long  vo_KeyTable[512];
 
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
  if ( vo_xeventhandling )
    {
 #endif
@@ -270,7 +272,7 @@
                break;
          }
       }
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
     }
     else
      {

Index: x11_common.h
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/x11_common.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- x11_common.h	17 Jun 2001 01:22:09 -0000	1.7
+++ x11_common.h	27 Aug 2001 23:56:44 -0000	1.8
@@ -20,15 +20,16 @@
 int vo_x11_check_events(Display *mydisplay);
 #endif
 
-#ifdef HAVE_GUI
+#ifdef HAVE_NEW_GUI
  extern Window    vo_window;
- extern Display * vo_display;
  extern GC        vo_gc;
+ extern void vo_setwindow( Window w,GC g );
  extern int       vo_xeventhandling;
  extern int       vo_expose;
  extern int       vo_resize;
-
- extern void vo_setwindow( Window w,GC g );
+#endif
+#ifdef HAVE_GUI
+ extern Display * vo_display;
 #endif
 
 void saver_off( Display * );