Ticket #3652: screensaver-x11.cpp.diff
File screensaver-x11.cpp.diff, 2.3 KB (added by , 17 years ago) |
---|
-
mythtv/libs/libmyth/screensaver-x11.cpp
old new 21 21 int preferblank; 22 22 int allowexposure; 23 23 bool xscreensaverRunning; 24 bool gscreensaverRunning; 24 25 BOOL dpmsaware; 25 26 BOOL dpmsenabled; 26 27 bool dpmsdeactivated; … … 38 39 d = new ScreenSaverX11Private(); 39 40 d->state.xscreensaverRunning = 40 41 (myth_system("xscreensaver-command -version >&- 2>&-") == 0); 41 if (d->state.xscreensaverRunning) 42 d->state.gscreensaverRunning = 43 (myth_system("gnome-screensaver-command --help >&- 2>&-") == 0); 44 if (d->state.xscreensaverRunning || d->state.gscreensaverRunning) 42 45 { 43 46 d->resetTimer = new QTimer(this); 44 47 connect(d->resetTimer, SIGNAL(timeout()), this, SLOT(resetSlot())); … … 104 107 VERBOSE(VB_GENERAL, "DPMS Deactivated "); 105 108 } 106 109 107 if (d->state.xscreensaverRunning )110 if (d->state.xscreensaverRunning || d->state.gscreensaverRunning) 108 111 { 109 112 if (d->resetTimer) 110 113 d->resetTimer->stop(); … … 114 125 d->timeoutInterval = 115 126 gContext->GetNumSettingOnHost("xscreensaverInterval", 116 127 gContext->GetHostName(), 117 60) * 1000;128 50) * 1000; 118 129 } 119 130 if (d->timeoutInterval > 0) 120 131 { … … 139 142 VERBOSE(VB_GENERAL, "DPMS Reactivated."); 140 143 } 141 144 142 if (d->state.xscreensaverRunning && d->resetTimer) 145 if ((d->state.xscreensaverRunning || d->state.gscreensaverRunning) 146 && d->resetTimer) 143 147 d->resetTimer->stop(); 144 148 } 145 149 146 150 void ScreenSaverX11::Reset(void) 147 151 { 148 152 XResetScreenSaver(qt_xdisplay()); 149 if (d->state.xscreensaverRunning )153 if (d->state.xscreensaverRunning || d->state.gscreensaverRunning) 150 154 resetSlot(); 151 155 152 156 if (Asleep()) … … 176 180 177 181 void ScreenSaverX11::resetSlot() 178 182 { 179 myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &")); 183 if (d->state.gscreensaverRunning) 184 myth_system(QString("gnome-screensaver-command --poke >&- 2>&- &")); 185 else 186 myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &")); 180 187 }