Mercurial > mplayer.hg

diff Gui/wm/ws.c @ 1723:5e4214a7540e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
GUI stuff. now seeking works, and xmga renders to video window
author arpi
date Mon, 27 Aug 2001 23:56:44 +0000
parents a4e0211455d8
children 5e905bf5d715
line wrap: on
line diff
--- a/Gui/wm/ws.c	Mon Aug 27 23:56:15 2001 +0000
+++ b/Gui/wm/ws.c	Mon Aug 27 23:56:44 2001 +0000
@@ -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 ) )
   {