[Mplayer-cvslog] CVS: main/Gui/wm ws.c,1.4,1.5 ws.h,1.1,1.2

[Arpi of Ize]

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

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

Index: ws.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ws.c	27 Aug 2001 00:55:25 -0000	1.4
+++ ws.c	27 Aug 2001 23:56:43 -0000	1.5
@@ -130,12 +130,15 @@
  exit( 0 );
 }
 
-void wsXInit( void )
+void wsXInit( void* mDisplay )
 {
- char * DisplayName = ":0.0";
  int    eventbase;
  int    errorbase;
 
+if(mDisplay){
+ wsDisplay=mDisplay;
+} else {
+ char * DisplayName = ":0.0";
  if ( getenv( "DISPLAY" ) ) DisplayName=getenv( "DISPLAY" );
  wsDisplay=XOpenDisplay( DisplayName );
  if ( !wsDisplay )
@@ -143,6 +146,7 @@
    fprintf( stderr,"[ws] couldn't open the display !\n" );
    exit( 0 );
   }
+}
 
  if ( !XShmQueryExtension( wsDisplay ) )
   {

Index: ws.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/wm/ws.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ws.h	25 Aug 2001 21:04:29 -0000	1.1
+++ ws.h	27 Aug 2001 23:56:43 -0000	1.2
@@ -180,7 +180,7 @@
 extern unsigned long        wsKeyTable[512];
 
 extern void wsXDone( void );
-extern void wsXInit( void );
+extern void wsXInit( void* disp );
 
 extern int wsGetDepthOnScreen( void );