summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpuppetmaster <puppetmaster>2005-07-29 19:36:27 +0000
committerpuppetmaster <puppetmaster>2005-07-29 19:36:27 +0000
commit7eb1f1c63d5c4ae60861174faaa021d7a004382b (patch)
tree6c818fe483fcadcda5b495998e559587ee917836
parentadding ecore_x_screensaver.c to Makefile.am (diff)
downloadelock-7eb1f1c63d5c4ae60861174faaa021d7a004382b.tar.gz
various updates for compile errors
-rw-r--r--ecore/src/lib/ecore_x/Makefile.am1
-rw-r--r--ecore/src/lib/ecore_x/ecore_x.c2
-rw-r--r--ecore/src/lib/ecore_x/ecore_x_private.h4
-rw-r--r--ecore/src/lib/ecore_x/ecore_x_screensaver.c9
4 files changed, 10 insertions, 6 deletions
diff --git a/ecore/src/lib/ecore_x/Makefile.am b/ecore/src/lib/ecore_x/Makefile.am
index d42018c..4c52ce9 100644
--- a/ecore/src/lib/ecore_x/Makefile.am
+++ b/ecore/src/lib/ecore_x/Makefile.am
@@ -79,4 +79,5 @@ ecore_x_window_prop.c \
ecore_x_window_shape.c \
ecore_x_pixmap.c \
ecore_x_gc.c \
+ecore_x_screensaver.c \
ecore_x_private.h
diff --git a/ecore/src/lib/ecore_x/ecore_x.c b/ecore/src/lib/ecore_x/ecore_x.c
index f71ed7c..b6a7db5 100644
--- a/ecore/src/lib/ecore_x/ecore_x.c
+++ b/ecore/src/lib/ecore_x/ecore_x.c
@@ -232,7 +232,7 @@ ecore_x_init(const char *name)
_ecore_x_event_scrnsaver_id = scrnsaver_base + ScreenSaverNotify;
- if (!XScreenSaverQueryVersion(ecore_x_disp, v_major, v_minor))
+ if (!XScreenSaverQueryVersion(_ecore_x_disp, v_major, v_minor))
_ecore_x_event_scrnsaver_id = 0;
}
diff --git a/ecore/src/lib/ecore_x/ecore_x_private.h b/ecore/src/lib/ecore_x/ecore_x_private.h
index 56db306..a93086d 100644
--- a/ecore/src/lib/ecore_x/ecore_x_private.h
+++ b/ecore/src/lib/ecore_x/ecore_x_private.h
@@ -18,6 +18,7 @@
#include <X11/extensions/XShm.h>
#include <X11/extensions/shape.h>
#include <X11/extensions/sync.h>
+#include <X11/extensions/scrnsaver.h>
#ifdef ECORE_XCURSOR
#include <X11/Xcursor/Xcursor.h>
#endif
@@ -27,9 +28,6 @@
#ifdef ECORE_XINERAMA
#include <X11/extensions/Xinerama.h>
#endif
-#ifdef ECORE_XSCREENSAVER
-#include <X11/extensions/scrnsaver.h>
-#endif
#include "Ecore_X.h"
diff --git a/ecore/src/lib/ecore_x/ecore_x_screensaver.c b/ecore/src/lib/ecore_x/ecore_x_screensaver.c
index ed04f4d..f73992f 100644
--- a/ecore/src/lib/ecore_x/ecore_x_screensaver.c
+++ b/ecore/src/lib/ecore_x/ecore_x_screensaver.c
@@ -29,7 +29,7 @@ ecore_x_screensaver_get_alloc_info(void)
}
void
-ecore_x_screensaver_free_alloc_info(XScreenSaverQueryInfo * info)
+ecore_x_screensaver_free_alloc_info(XScreenSaverInfo * info)
{
XFree(info);
return;
@@ -40,17 +40,22 @@ ecore_x_screensaver_set_attributes(XSetWindowAttributes attr)
{
Ecore_X_Window root;
int screen;
+ unsigned long mask;
root = DefaultRootWindow(_ecore_x_disp);
screen = DefaultScreen(_ecore_x_disp);
+ mask = CWBackPixel;
+
if (!XScreenSaverSetAttributes(_ecore_x_disp, root, 0, 0,
DisplayWidth(_ecore_x_disp, screen),
DisplayHeight(_ecore_x_disp, screen),
0,
CopyFromParent,
- CopyFromParent, CopyFromParent, mask, &attr))
+ CopyFromParent,
+ CopyFromParent,
+ mask, &attr))
return 1;
else
return 0;