summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ecore/src/lib/ecore_x/ecore_x_screensaver.c34
1 files changed, 17 insertions, 17 deletions
diff --git a/ecore/src/lib/ecore_x/ecore_x_screensaver.c b/ecore/src/lib/ecore_x/ecore_x_screensaver.c
index 739350e..33b6459 100644
--- a/ecore/src/lib/ecore_x/ecore_x_screensaver.c
+++ b/ecore/src/lib/ecore_x/ecore_x_screensaver.c
@@ -35,31 +35,29 @@ ecore_x_screensaver_free_alloc_info(XScreenSaverQueryInfo * info)
return;
}
-XSetWindowAttributes*
+XSetWindowAttributes *
ecore_x_screensaver_set_attributes()
{
- Ecore_X_Window root;
- int screen;
+ Ecore_X_Window root;
+ int screen;
XSetWindowAttributes *attr;
-
+
root = DefaultRootWindow(_ecore_x_disp);
screen = DefaultScreen(_ecore_x_disp);
- if (!XScreenSaverSetAttributes (_ecore_x_disp,root, 0,0,
- DisplayWidth (_ecore_x_disp, screen),
- DisplayHeight(_ecore_x_disp, screen),
- 0,
- CopyFromParent,
- CopyFromParent,
- CopyFromParent,
- mask, &attr))
- return NULL
+ if (!XScreenSaverSetAttributes(_ecore_x_disp, root, 0, 0,
+ DisplayWidth(_ecore_x_disp, screen),
+ DisplayHeight(_ecore_x_disp, screen),
+ 0,
+ CopyFromParent,
+ CopyFromParent, CopyFromParent, mask, &attr))
+ return NULL;
else
- return attr;
+ return attr;
}
-/*int
+int
ecore_x_screensaver_event_handler_add(void)
{
Ecore_X_Window root;
@@ -69,6 +67,8 @@ ecore_x_screensaver_event_handler_add(void)
if (!XScreenSaverSelectInput
(_ecore_x_disp, root, ScreenSaverNotifyMask | ScreenSaverCycleMask))
return 1;
-FIXME
-}*/
+ if (!ecore_x_screensaver_set_attributes())
+ return 1;
+ /* ... */
+}