Mercurial > mplayer.hg
changeset 5998:79977d64bb99
upsz, 10l
| author | pontscho |
|---|---|
| date | Mon, 06 May 2002 15:48:07 +0000 |
| parents | b5fb9a927bf3 |
| children | 792d58595767 |
| files | libvo/x11_common.c libvo/x11_common.h |
| diffstat | 2 files changed, 5 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/libvo/x11_common.c Mon May 06 15:05:07 2002 +0000 +++ b/libvo/x11_common.c Mon May 06 15:48:07 2002 +0000 @@ -3,6 +3,7 @@ #include <stdlib.h> #include "config.h" +#include "mp_msg.h" #ifdef X11_FULLSCREEN @@ -304,7 +305,7 @@ type=XInternAtom( mDisplay,"_NET_SUPPORTED",False ); if ( Success == XGetWindowProperty( mDisplay,mRootWin,type,0,65536 / sizeof( long ),False,AnyPropertyType,&type,&format,&nitems,&bytesafter,&args ) && nitems > 0 ) { - mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" ); + mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is NetWM.\n" ); XFree( args ); vo_wm_type=vo_wm_NetWM; } @@ -570,17 +571,17 @@ if ( !strncmp( name,"_ICEWM_TRAY",11 ) ) { - mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" ); + mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is IceWM.\n" ); vo_wm_type=vo_wm_IceWM; } if ( !strncmp( name,"_KDE_",5 ) ) { - mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); + mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is KDE.\n" ); vo_wm_type=vo_wm_KDE; } if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) ) { - mp_dbg( MSGT_GPLAYER,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); + mp_dbg( MSGT_VO,MSGL_STATUS,"[x11] Detected wm is WindowMaker style.\n" ); vo_wm_type=vo_wm_WMakerStyle; }
--- a/libvo/x11_common.h Mon May 06 15:05:07 2002 +0000 +++ b/libvo/x11_common.h Mon May 06 15:48:07 2002 +0000 @@ -43,9 +43,6 @@ extern void vo_setwindow( Window w,GC g ); extern void vo_x11_putkey(int key); #endif -#ifdef HAVE_GUI - extern Display * vo_display; -#endif void saver_off( Display * ); void saver_on( Display * );