summaryrefslogtreecommitdiff
path: root/beryl-plugins/src/splash.c
diff options
context:
space:
mode:
authoronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-06 02:24:01 +0000
committeronestone <onestone@d7aaf104-2d23-0410-ae22-9d23157bf5a3>2006-10-06 02:24:01 +0000
commitcef5c9fffca229b8473e949450bdd8bad9f0ec7c (patch)
tree1d3b6bdb4cef09933abd7b990235fd4f7225de1f /beryl-plugins/src/splash.c
parente54e8e302ddf6fe927f6880584944a57ff5b5f2b (diff)
downloadmarex-dev-cef5c9fffca229b8473e949450bdd8bad9f0ec7c.tar.gz
marex-dev-cef5c9fffca229b8473e949450bdd8bad9f0ec7c.tar.bz2
Added Inter-Plugin-Communication-System
git-svn-id: file:///beryl/trunk@509 d7aaf104-2d23-0410-ae22-9d23157bf5a3
Diffstat (limited to 'beryl-plugins/src/splash.c')
-rw-r--r--beryl-plugins/src/splash.c22
1 files changed, 15 insertions, 7 deletions
diff --git a/beryl-plugins/src/splash.c b/beryl-plugins/src/splash.c
index e114fd1..70ebf58 100644
--- a/beryl-plugins/src/splash.c
+++ b/beryl-plugins/src/splash.c
@@ -27,6 +27,7 @@
#include <X11/Xatom.h>
#include <X11/extensions/Xrender.h>
#include <beryl.h>
+#include <beryl_ipcs.h>
#define GET_SPLASH_DISPLAY(d) \
((SplashDisplay *) (d)->privates[displayPrivateIndex].ptr)
@@ -106,6 +107,8 @@ typedef struct _SplashScreen
Bool active;
Bool doUpdate;
+ int ipcs_active_atom;
+
} SplashScreen;
static void
@@ -250,6 +253,15 @@ splashPreparePaintScreen (CompScreen * s, int ms)
}
}
+ if (ss->active)
+ {
+ IPCS_SetBool (IPCS_OBJECT (s), ss->ipcs_active_atom, TRUE);
+ }
+ else
+ {
+ IPCS_SetBool (IPCS_OBJECT (s), ss->ipcs_active_atom, FALSE);
+ }
+
UNWRAP (ss, s, preparePaintScreen);
(*s->preparePaintScreen) (s, ms);
WRAP (ss, s, preparePaintScreen, splashPreparePaintScreen);
@@ -280,11 +292,6 @@ splashPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
Bool status = TRUE;
- if (ss->active)
- s->disablePostprocessFX =
- !sd->opt[SPLASH_DISPLAY_OPTION_DISABLE_UPDATE].value.b;
-
-
UNWRAP (ss, s, paintScreen);
status = (*s->paintScreen) (s, sa, region, mask);
WRAP (ss, s, paintScreen, splashPaintScreen);
@@ -292,8 +299,6 @@ splashPaintScreen (CompScreen * s, const ScreenPaintAttrib * sa,
if (!ss->active)
return status;
- s->disablePostprocessFX = FALSE;
-
glPushMatrix ();
glLoadIdentity ();
glTranslatef (-0.5f, -0.5f, -DEFAULT_Z_CAMERA);
@@ -599,6 +604,9 @@ splashInitScreen (CompPlugin * p, CompScreen * s)
ss->initiate = FALSE;
+ ss->ipcs_active_atom =
+ IPCS_GetAtom (IPCS_OBJECT (s), IPCS_BOOL, "SPLASH_IS_ACTIVE", TRUE);
+
return TRUE;
}