github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-11-18 21:16:10 +01:00
Code Releases Activity

This patch fixes the screensaver issues in mplayer. It will correctly read

Browse Source 
and store the state of XScreensaver and KDE-Screensaver, will stop them and
restart them later, when the movie has finished ...
It works and was tested with KDE2/3 and XScreensaver 4.05.
patch by Fabian Franz <FabianFranz@gmx.de>


git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8355 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-12-04 23:31:46 +00:00
parent adc876c7c0
commit c1d0b30ae1
1 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libvo/x11_common.c
View File

@ -53,6 +53,7 @@ int stop_xscreensaver=0;
static int dpms_disabled=0;
static int timeout_save=0;
static int xscreensaver_was_running=0;
static int kdescreensaver_was_running=0;
char* mDisplayName=NULL;
Display* mDisplay=NULL;
@ -787,6 +788,11 @@ void saver_on(Display *mDisplay) {
system("cd /; xscreensaver -no-splash &");
xscreensaver_was_running = 0;
}
if (kdescreensaver_was_running && stop_xscreensaver) {
system("dcop kdesktop KScreensaverIface enable true 2>/dev/null >/dev/null");
kdescreensaver_was_running = 0;
}
}
@ -816,8 +822,19 @@ void saver_off(Display *mDisplay) {
if (timeout_save)
XSetScreenSaver(mDisplay, 0, interval, prefer_blank, allow_exp);
}
xscreensaver_was_running = stop_xscreensaver && ! system("xscreensaver-command -exit");
// turning off screensaver
if (stop_xscreensaver && !xscreensaver_was_running)
{
xscreensaver_was_running = (system("xscreensaver-command -version 2>/dev/null >/dev/null")==0);
if (xscreensaver_was_running)
system("xscreensaver-command -exit 2>/dev/null >/dev/null");
}
if (stop_xscreensaver && !kdescreensaver_was_running)
{
kdescreensaver_was_running=(system("dcop kdesktop KScreensaverIface isEnabled 2>/dev/null | sed 's/1/true/g' | grep true 2>/dev/null >/dev/null")==0);
if (kdescreensaver_was_running)
system("dcop kdesktop KScreensaverIface enable false 2>/dev/null >/dev/null");
}
}
static XErrorHandler old_handler = NULL;