mirror of
https://github.com/mpv-player/mpv
synced 2025-02-07 15:41:55 +00:00
upsz, 10l
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5999 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
92009fc2f5
commit
48da357ce5
@ -3,6 +3,7 @@
|
|||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "config.h"
|
#include "config.h"
|
||||||
|
#include "mp_msg.h"
|
||||||
|
|
||||||
#ifdef X11_FULLSCREEN
|
#ifdef X11_FULLSCREEN
|
||||||
|
|
||||||
@ -304,7 +305,7 @@ int vo_init( void )
|
|||||||
type=XInternAtom( mDisplay,"_NET_SUPPORTED",False );
|
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 )
|
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 );
|
XFree( args );
|
||||||
vo_wm_type=vo_wm_NetWM;
|
vo_wm_type=vo_wm_NetWM;
|
||||||
}
|
}
|
||||||
@ -570,17 +571,17 @@ int vo_x11_check_events(Display *mydisplay){
|
|||||||
|
|
||||||
if ( !strncmp( name,"_ICEWM_TRAY",11 ) )
|
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;
|
vo_wm_type=vo_wm_IceWM;
|
||||||
}
|
}
|
||||||
if ( !strncmp( name,"_KDE_",5 ) )
|
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;
|
vo_wm_type=vo_wm_KDE;
|
||||||
}
|
}
|
||||||
if ( !strncmp( name,"KWM_WIN_DESKTOP",15 ) )
|
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;
|
vo_wm_type=vo_wm_WMakerStyle;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -43,9 +43,6 @@ extern XSizeHints vo_hint;
|
|||||||
extern void vo_setwindow( Window w,GC g );
|
extern void vo_setwindow( Window w,GC g );
|
||||||
extern void vo_x11_putkey(int key);
|
extern void vo_x11_putkey(int key);
|
||||||
#endif
|
#endif
|
||||||
#ifdef HAVE_GUI
|
|
||||||
extern Display * vo_display;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void saver_off( Display * );
|
void saver_off( Display * );
|
||||||
void saver_on( Display * );
|
void saver_on( Display * );
|
||||||
|
Loading…
Reference in New Issue
Block a user