Ticket #3652: screensaver-x11.cpp+h.diff
File screensaver-x11.cpp+h.diff, 2.8 KB (added by , 17 years ago) |
---|
-
mythtv/libs/libmyth/screensaver-x11.h
old new 21 21 22 22 public slots: 23 23 void resetSlot(); 24 void resetSlotG(); 24 25 25 26 protected: 26 27 class ScreenSaverX11Private *d; -
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); 42 d->state.gscreensaverRunning = 43 (myth_system("gnome-screensaver-command --help >&- 2>&-") == 0); 41 44 if (d->state.xscreensaverRunning) 42 45 { 43 46 d->resetTimer = new QTimer(this); … … 46 49 d->timeoutInterval = -1; 47 50 VERBOSE(VB_GENERAL, "XScreenSaver support enabled"); 48 51 } 52 else if (d->state.gscreensaverRunning) 53 { 54 d->resetTimer = new QTimer(this); 55 connect(d->resetTimer, SIGNAL(timeout()), this, SLOT(resetSlotG())); 56 57 d->timeoutInterval = -1; 58 VERBOSE(VB_GENERAL, "Gnome ScreenSaver support enabled"); 59 } 49 60 50 61 int dummy; 51 62 if ((d->state.dpmsaware = DPMSQueryExtension(qt_xdisplay(),&dummy,&dummy))) … … 104 115 VERBOSE(VB_GENERAL, "DPMS Deactivated "); 105 116 } 106 117 107 if (d->state.xscreensaverRunning )118 if (d->state.xscreensaverRunning || d->state.gscreensaverRunning) 108 119 { 109 120 if (d->resetTimer) 110 121 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 150 VERBOSE(VB_GENERAL, "DPMS Reactivated."); 140 151 } 141 152 142 if (d->state.xscreensaverRunning && d->resetTimer) 153 if ((d->state.xscreensaverRunning || d->state.gscreensaverRunning) 154 && d->resetTimer) 143 155 d->resetTimer->stop(); 144 156 } 145 157 … … 148 160 XResetScreenSaver(qt_xdisplay()); 149 161 if (d->state.xscreensaverRunning) 150 162 resetSlot(); 163 else if (d->state.gscreensaverRunning) 164 resetSlotG(); 151 165 152 166 if (Asleep()) 153 167 { … … 178 192 { 179 193 myth_system(QString("xscreensaver-command -deactivate >&- 2>&- &")); 180 194 } 195 196 void ScreenSaverX11::resetSlotG() 197 { 198 myth_system(QString("gnome-screensaver-command --poke >&- 2>&- &")); 199 }