diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-27 23:56:44 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-08-27 23:56:44 +0000 |
| commit | 855050e68a778e200aa1a1a6310d5d346e64ec71 (patch) | |
| tree | 39a12d7afc05e3a01cf7c6ceb19700b4d9caeca9 /Gui/wm/ws.c | |
| parent | f777d845b308144a828e334648ff1f5b2bfb21d5 (diff) | |
| download | mpv-855050e68a778e200aa1a1a6310d5d346e64ec71.tar.bz2 mpv-855050e68a778e200aa1a1a6310d5d346e64ec71.tar.xz | |
GUI stuff. now seeking works, and xmga renders to video window
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@1724 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui/wm/ws.c')
| -rw-r--r-- | Gui/wm/ws.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Gui/wm/ws.c b/Gui/wm/ws.c index 4922d8998a..b3c86a4b7b 100644 --- a/Gui/wm/ws.c +++ b/Gui/wm/ws.c @@ -130,12 +130,15 @@ int wsErrorHandler( Display * dpy,XErrorEvent * Event ) 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 @@ void wsXInit( void ) fprintf( stderr,"[ws] couldn't open the display !\n" ); exit( 0 ); } +} if ( !XShmQueryExtension( wsDisplay ) ) { |