diff options
author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-07 12:22:03 +0000 |
---|---|---|
committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-01-07 12:22:03 +0000 |
commit | 91ba3d653156512703ed428b028cfbb09d9ec806 (patch) | |
tree | 55958f6302ab226d6687bf16a4b1ce1076871ba8 /libvo | |
parent | 3259a15f61e2d36795a48e5c64f604522bbde2b6 (diff) | |
download | mpv-91ba3d653156512703ed428b028cfbb09d9ec806.tar.bz2 mpv-91ba3d653156512703ed428b028cfbb09d9ec806.tar.xz |
Remove some now unused screensaver stuff code.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25638 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/x11_common.c | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/libvo/x11_common.c b/libvo/x11_common.c index 5603026931..3172a4b52c 100644 --- a/libvo/x11_common.c +++ b/libvo/x11_common.c @@ -75,8 +75,6 @@ static int old_gravity = NorthWestGravity; int stop_xscreensaver = 0; static int dpms_disabled = 0; -static int timeout_save = 0; -static int kdescreensaver_was_running = 0; char *mDisplayName = NULL; Display *mDisplay = NULL; @@ -1594,69 +1592,6 @@ void vo_x11_ontop(void) * XScreensaver stuff */ -static int got_badwindow; -static XErrorHandler old_handler; - -static int badwindow_handler(Display * dpy, XErrorEvent * error) -{ - if (error->error_code != BadWindow) - return (*old_handler) (dpy, error); - - got_badwindow = True; - return 0; -} - -static Window find_xscreensaver_window(Display * dpy) -{ - int i; - Window root = RootWindowOfScreen(DefaultScreenOfDisplay(dpy)); - Window root2, parent, *kids; - Window retval = 0; - Atom xs_version; - unsigned int nkids = 0; - - xs_version = XInternAtom(dpy, "_SCREENSAVER_VERSION", True); - - if (!(xs_version != None && - XQueryTree(dpy, root, &root2, &parent, &kids, &nkids) && - kids && nkids)) - return 0; - - old_handler = XSetErrorHandler(badwindow_handler); - - for (i = 0; i < nkids; i++) - { - Atom type; - int format; - unsigned long nitems, bytesafter; - char *v; - int status; - - got_badwindow = False; - status = - XGetWindowProperty(dpy, kids[i], xs_version, 0, 200, False, - XA_STRING, &type, &format, &nitems, - &bytesafter, (unsigned char **) &v); - XSync(dpy, False); - if (got_badwindow) - status = BadWindow; - - if (status == Success && type != None) - { - retval = kids[i]; - break; - } - } - XFree(kids); - XSetErrorHandler(old_handler); - - return retval; -} - -static Window xs_windowid = 0; -static Atom deactivate; -static Atom screensaver; - static int screensaver_off; static unsigned int time_last; |