diff options
author | laaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-10 00:00:04 +0000 |
---|---|---|
committer | laaz <laaz@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-04-10 00:00:04 +0000 |
commit | 473f1b7b0780d24799a1bf54929118073709df4d (patch) | |
tree | c59b550f1c52b78ebbfa397cdc3863f7dbe549e2 /libvo/vo_xv.c | |
parent | fd9595e99bf039bcc053c3e52d026001314c649d (diff) | |
download | mpv-473f1b7b0780d24799a1bf54929118073709df4d.tar.bz2 mpv-473f1b7b0780d24799a1bf54929118073709df4d.tar.xz |
Szebb es jobb screensaver-kikapcsolo resz
xmga, xv, x11 support (sdl comming soon)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@325 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo/vo_xv.c')
-rw-r--r-- | libvo/vo_xv.c | 43 |
1 files changed, 2 insertions, 41 deletions
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c index d0629b3908..b7e1e18970 100644 --- a/libvo/vo_xv.c +++ b/libvo/vo_xv.c @@ -24,7 +24,6 @@ LIBVO_EXTERN(xv) #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/extensions/XShm.h> -#include <X11/extensions/dpms.h> #include <errno.h> #include "x11_common.h" @@ -79,9 +78,6 @@ static Window mRoot; static uint32_t drwX,drwY,drwWidth,drwHeight,drwBorderWidth,drwDepth; static uint32_t drwcX,drwcY,dwidth,dheight,mFullscreen; -static int timeout_save=0; -static int dpms_disabled=0; - /* * connect to server, create and map window, * allocate colors and (shared) memory @@ -89,7 +85,6 @@ static int dpms_disabled=0; static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_height, uint32_t fullscreen, char *title, uint32_t format) { int screen; - int nothing, interval, prefer_blank, allow_exp; char *hello = (title == NULL) ? "Xv render" : title; char *name = ":0.0"; XSizeHints hint; @@ -204,23 +199,7 @@ static uint32_t init(uint32_t width, uint32_t height, uint32_t d_width, uint32_t fprintf( stderr,"[xv-fs] dcx: %d dcy: %d dx: %d dy: %d dw: %d dh: %d\n",drwcX,drwcY,drwX,drwY,drwWidth,drwHeight ); } - if (DPMSQueryExtension(mydisplay, ¬hing, ¬hing)) - { - BOOL onoff; - CARD16 state; - DPMSInfo(mydisplay, &state, &onoff); - if (onoff) - { - dpms_disabled=1; - DPMSDisable(mydisplay); // monitor powersave off - } - } - - XGetScreenSaver(mydisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); - if (timeout_save) - XSetScreenSaver(mydisplay, 0, interval, prefer_blank, allow_exp); - // switching off screensaver - + saver_off(mydisplay); // turning off screen saver return 0; } } @@ -412,25 +391,7 @@ static uint32_t query_format(uint32_t format) } static void uninit(void) { - int nothing; - if (DPMSQueryExtension(mydisplay, ¬hing, ¬hing)) - { - if (dpms_disabled) - { - DPMSEnable(mydisplay); // restoring power saving settings - DPMSQueryExtension(mydisplay, ¬hing, ¬hing); - } - } - - if (timeout_save) - { - int interval, prefer_blank, allow_exp, dummy; - XGetScreenSaver(mydisplay, &dummy, &interval, &prefer_blank, &allow_exp); - XSetScreenSaver(mydisplay, timeout_save, interval, prefer_blank, allow_exp); - XGetScreenSaver(mydisplay, &timeout_save, &interval, &prefer_blank, &allow_exp); - } - - + saver_on(mydisplay); // screen saver back on } |