Modified patch below:
>From a3c505979be1e05ff53fab87fe5a9f5df7fed544 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <[EMAIL PROTECTED]>
Date: Thu, 11 Dec 2008 11:21:06 +0900
Subject: [PATCH] Track core changes
---
option.c | 4 ++--
prompt.c | 4 ++--
window.c | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/option.c b/option.c
index 14a9593..dfa7241 100644
--- a/option.c
+++ b/option.c
@@ -141,7 +141,7 @@ setOptionSCM (SCM pluginSCM,
p = findPluginWithName (pluginName);
if (!p)
{
- compLogMessage (d, "schemep", CompLogLevelWarn,
+ compLogMessage ("schemep", CompLogLevelWarn,
"Could not find plugin %s.", pluginName);
return SCM_BOOL_F;
}
@@ -149,7 +149,7 @@ setOptionSCM (SCM pluginSCM,
o = findOptionWithNameForPlugin (p, optionName, &object);
if (!o)
{
- compLogMessage (d, "schemep", CompLogLevelWarn,
+ compLogMessage ("schemep", CompLogLevelWarn,
"Could not find option %s for plugin %s.",
optionName, pluginName);
return SCM_BOOL_F;
diff --git a/prompt.c b/prompt.c
index 0e6fa64..ccfc8db 100644
--- a/prompt.c
+++ b/prompt.c
@@ -98,7 +98,7 @@ schemePromptToggle (CompDisplay *d,
}
static void *
-runPrompt ()
+runPrompt (void *vd)
{
char line[1024];
int nbytes;
@@ -127,7 +127,7 @@ runPrompt ()
* Yay interactive prompt.
*/
void
-buildSchemePrompt ()
+buildSchemePrompt (void)
{
int master;
int slave;
diff --git a/window.c b/window.c
index 6196f83..e337769 100644
--- a/window.c
+++ b/window.c
@@ -206,7 +206,7 @@ static SCM
getWindowSmobOpacity (SCM window)
{
CompWindow * w = windowFromSmob (window);
- float b = ((w->opacity * w->opacityFactor) / 0xff);
+ float b = ((w->paint.opacity) / 0xffff);
b /= (float) OPAQUE;
@@ -218,7 +218,7 @@ static SCM
getWindowSmobSaturation (SCM window)
{
CompWindow * w = windowFromSmob (window);
- return (scm_from_double ((float) w->saturation / (float) COLOR));
+ return (scm_from_double ((float) w->paint.saturation / (float) COLOR));
}
/* Get brightness of a window assosciated with a smob */
@@ -226,7 +226,7 @@ static SCM
getWindowSmobBrightness (SCM window)
{
CompWindow *w = windowFromSmob (window);
- return (scm_from_double ((float) w->brightness / (float) OPAQUE));
+ return (scm_from_double ((float) w->paint.brightness / (float) BRIGHT));
}
static SCM
@@ -242,7 +242,7 @@ focusWindowSmob (SCM window)
/* Return list of smobs for windows. */
static SCM
-getWindowList ()
+getWindowList (void)
{
CompDisplay *d;
CompScreen *s;
--
1.5.6
---------- Forwarded message ----------
From: Sam Spilsbury <[EMAIL PROTECTED]>
Date: Thu, Dec 11, 2008 at 11:23 AM
Subject: [PATCH] Track core changes in compiz-scheme
To: Compiz Fusion Developer List <[email protected]>
I think this plugin needs a bit of love =)
---------------------------------------------------------------
>From a3c505979be1e05ff53fab87fe5a9f5df7fed544 Mon Sep 17 00:00:00 2001
From: Sam Spilsbury <[EMAIL PROTECTED]>
Date: Thu, 11 Dec 2008 11:21:06 +0900
Subject: [PATCH] Track core changes
---
option.c | 4 ++--
prompt.c | 4 ++--
window.c | 8 ++++----
3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/option.c b/option.c
index 14a9593..dfa7241 100644
--- a/option.c
+++ b/option.c
@@ -141,7 +141,7 @@ setOptionSCM (SCM pluginSCM,
p = findPluginWithName (pluginName);
if (!p)
{
- compLogMessage (d, "schemep", CompLogLevelWarn,
+ compLogMessage ("schemep", CompLogLevelWarn,
"Could not find plugin %s.", pluginName);
return SCM_BOOL_F;
}
@@ -149,7 +149,7 @@ setOptionSCM (SCM pluginSCM,
o = findOptionWithNameForPlugin (p, optionName, &object);
if (!o)
{
- compLogMessage (d, "schemep", CompLogLevelWarn,
+ compLogMessage ("schemep", CompLogLevelWarn,
"Could not find option %s for plugin %s.",
optionName, pluginName);
return SCM_BOOL_F;
diff --git a/prompt.c b/prompt.c
index 0e6fa64..ccfc8db 100644
--- a/prompt.c
+++ b/prompt.c
@@ -98,7 +98,7 @@ schemePromptToggle (CompDisplay *d,
}
static void *
-runPrompt ()
+runPrompt (void *vd)
{
char line[1024];
int nbytes;
@@ -127,7 +127,7 @@ runPrompt ()
* Yay interactive prompt.
*/
void
-buildSchemePrompt ()
+buildSchemePrompt (void)
{
int master;
int slave;
diff --git a/window.c b/window.c
index 6196f83..e337769 100644
--- a/window.c
+++ b/window.c
@@ -206,7 +206,7 @@ static SCM
getWindowSmobOpacity (SCM window)
{
CompWindow * w = windowFromSmob (window);
- float b = ((w->opacity * w->opacityFactor) / 0xff);
+ float b = ((w->paint.opacity) / 0xff);
b /= (float) OPAQUE;
@@ -218,7 +218,7 @@ static SCM
getWindowSmobSaturation (SCM window)
{
CompWindow * w = windowFromSmob (window);
- return (scm_from_double ((float) w->saturation / (float) COLOR));
+ return (scm_from_double ((float) w->paint.saturation / (float) COLOR));
}
/* Get brightness of a window assosciated with a smob */
@@ -226,7 +226,7 @@ static SCM
getWindowSmobBrightness (SCM window)
{
CompWindow *w = windowFromSmob (window);
- return (scm_from_double ((float) w->brightness / (float) OPAQUE));
+ return (scm_from_double ((float) w->paint.brightness / (float) OPAQUE));
}
static SCM
@@ -242,7 +242,7 @@ focusWindowSmob (SCM window)
/* Return list of smobs for windows. */
static SCM
-getWindowList ()
+getWindowList (void)
{
CompDisplay *d;
CompScreen *s;
--
1.5.6
--
Sam Spilsbury
--
Sam Spilsbury
_______________________________________________
Dev mailing list
[email protected]
http://lists.compiz-fusion.org/mailman/listinfo/dev
