diff options
| author | Andrzej Hunt <andrzej@ahunt.org> | 2015-10-19 21:50:39 +0200 |
|---|---|---|
| committer | Andrzej Hunt <andrzej@ahunt.org> | 2015-10-20 18:14:40 +0200 |
| commit | 189aabbcde1fe544a4e98ab9ee82aea03f1e00f3 (patch) | |
| tree | 15dd8a9ddb4f525c802ded4d9fc8398a63ace9fa /vcl/inc | |
| parent | 5074d1b4d712cd35798758e8168ffbdfe59a11a9 (diff) | |
Deduplicate XGet/SetScreenSaver, move to ScreenSaverInhibitor
I haven't been able to find anyone actually using this API,
however it's probably best not to remove it either?
Change-Id: I0ca11591bfd54f9882d8081a94b012f638936ce5
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/unx/gtk/gtkframe.hxx | 1 | ||||
| -rw-r--r-- | vcl/inc/unx/salframe.h | 1 | ||||
| -rw-r--r-- | vcl/inc/unx/screensaverinhibitor.hxx | 3 |
3 files changed, 3 insertions, 2 deletions
diff --git a/vcl/inc/unx/gtk/gtkframe.hxx b/vcl/inc/unx/gtk/gtkframe.hxx index e6cdbd758a4a..4f73ac8fc2d0 100644 --- a/vcl/inc/unx/gtk/gtkframe.hxx +++ b/vcl/inc/unx/gtk/gtkframe.hxx @@ -192,7 +192,6 @@ class GtkSalFrame : public SalFrame, public X11WindowProvider GdkCursor *m_pCurrentCursor; GdkVisibilityState m_nVisibility; PointerStyle m_ePointerStyle; - int m_nSavedScreenSaverTimeout; ScreenSaverInhibitor m_ScreenSaverInhibitor; int m_nWorkArea; bool m_bFullscreen; diff --git a/vcl/inc/unx/salframe.h b/vcl/inc/unx/salframe.h index b10bebd6c16b..d595c441bd26 100644 --- a/vcl/inc/unx/salframe.h +++ b/vcl/inc/unx/salframe.h @@ -100,7 +100,6 @@ class VCLPLUG_GEN_PUBLIC X11SalFrame : public SalFrame, public X11WindowProvider int m_nWorkArea; bool m_bSetFocusOnMap; - int nScreenSaversTimeout_; ScreenSaverInhibitor maScreenSaverInhibitor; Rectangle maPaintRegion; diff --git a/vcl/inc/unx/screensaverinhibitor.hxx b/vcl/inc/unx/screensaverinhibitor.hxx index 56d184943cf4..8c9ad54f6044 100644 --- a/vcl/inc/unx/screensaverinhibitor.hxx +++ b/vcl/inc/unx/screensaverinhibitor.hxx @@ -30,10 +30,13 @@ private: boost::optional<guint> mnFDOCookie; boost::optional<guint> mnGSMCookie; + boost::optional<int> mnXScreenSaverTimeout; + // Note: the Uninhibit call has different spelling in FDO (UnInhibit) vs GSM (Uninhibit) void inhibitFDO( bool bInhibit, const gchar* appname, const gchar* reason ); void inhibitGSM( bool bInhibit, const gchar* appname, const gchar* reason, const guint xid ); + void inhibitXScreenSaver( bool bInhibit, Display* pDisplay ); static void inhibitXAutoLock( bool bInhibit, Display* pDisplay ); }; |