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 /libvo | |
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 'libvo')
-rw-r--r-- | libvo/vo_xmga.c | 18 | ||||
-rw-r--r-- | libvo/x11_common.c | 12 | ||||
-rw-r--r-- | libvo/x11_common.h | 9 |
3 files changed, 20 insertions, 19 deletions
diff --git a/libvo/vo_xmga.c b/libvo/vo_xmga.c index 35d7f7911c..4089d26fad 100644 --- a/libvo/vo_xmga.c +++ b/libvo/vo_xmga.c @@ -108,7 +108,7 @@ 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 ); + 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 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ 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 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ 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 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ 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 @@ static uint32_t init( uint32_t width, uint32_t height, uint32_t d_width, uint32_ 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; diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 2f0b6ab52a..c2a16037fe 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -227,15 +227,17 @@ void vo_x11_classhint( Display * display,Window window,char *name ){ 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 @@ int vo_x11_check_events(Display *mydisplay){ static XComposeStatus stat; // unsigned long vo_KeyTable[512]; -#ifdef HAVE_GUI +#ifdef HAVE_NEW_GUI if ( vo_xeventhandling ) { #endif @@ -270,7 +272,7 @@ int vo_x11_check_events(Display *mydisplay){ break; } } -#ifdef HAVE_GUI +#ifdef HAVE_NEW_GUI } else { diff --git a/libvo/x11_common.h b/libvo/x11_common.h index 575b06d627..cd4f11508e 100644 --- a/libvo/x11_common.h +++ b/libvo/x11_common.h @@ -20,15 +20,16 @@ void vo_x11_classhint( Display * display,Window window,char *name ); 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 * ); |