Re: [compiz] PaintOutput patches for widget, cheatsheet and flash
Erm, forgot to attach them :/
On 6/4/07, Sam Spilsbury [EMAIL PROTECTED] wrote:
Hi
Attached are some patches to make widget, cheatsheet and flash work
with the current Compiz GIT.
They are my first patches so please do not shoot me down for them. It
is just me trying to understand the code a little more.
They Compile OK here (i686, SUSE 10.2) and should compiz OK if you
have a recent (==days) version of compiz.
All I have done really is replace PaintScreen with PaintOutput and
paintScreen with paintOutput.
I hope they are of some use.
PS : On a side note. Considering that most users dont really know too
much about these plugins, is it possible that we can mirror them on
git.opencompositing.org? We will give full credit to the authors and
whoever mantains them. I also need something to write about in OCCN!
:P
-SmSpillaz
diff --git a/cheatsheet.c b/cheatsheet.c
index 98cb899..9a9d8a6 100644
--- a/cheatsheet.c
+++ b/cheatsheet.c
@@ -45,7 +45,7 @@ typedef struct _CheatsheetDisplay {
} CheatsheetDisplay;
typedef struct _CheatsheetScreen {
-PaintScreenProc paintScreen;
+PaintOutputProc paintOutput;
intgrabIndex;
Pixmap pixmap;
@@ -639,7 +639,7 @@ cheatsheetTerminate (CompDisplay *d,
}
static Bool
-cheatsheetPaintScreen (CompScreen *s,
+cheatsheetPaintOutput (CompScreen *s,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Regionregion,
@@ -650,9 +650,9 @@ cheatsheetPaintScreen (CompScreen*s,
CHEATSHEET_SCREEN (s);
-UNWRAP (cs, s, paintScreen);
-status = (*s-paintScreen) (s, sAttrib, transform, region, output, mask);
-WRAP (cs, s, paintScreen, cheatsheetPaintScreen);
+UNWRAP (cs, s, paintOutput);
+status = (*s-paintOutput) (s, sAttrib, transform, region, output, mask);
+WRAP (cs, s, paintOutput, cheatsheetPaintOutput);
if (status cs-content region-numRects)
{
@@ -828,7 +828,7 @@ cheatsheetInitScreen (CompPlugin *p,
addScreenAction (s, cd-opt[CHEATSHEET_DISPLAY_OPTION_INITIATE].value.action);
-WRAP (cs, s, paintScreen, cheatsheetPaintScreen);
+WRAP (cs, s, paintOutput, cheatsheetPaintOutput);
s-privates[cd-screenPrivateIndex].ptr = cs;
@@ -852,7 +852,7 @@ cheatsheetFiniScreen (CompPlugin *p,
if (cs-pixmap)
XFreePixmap (s-display-display, cs-pixmap);
-UNWRAP (cs, s, paintScreen);
+UNWRAP (cs, s, paintOutput);
free (cs);
}
diff --git a/cheatsheet.xml b/cheatsheet.xml
lines 17-54/54 (END)
diff --git a/widget.c b/widget.c
index 8a34909..7b275fa 100644
--- a/widget.c
+++ b/widget.c
@@ -103,8 +103,8 @@ typedef struct _WidgetScreen
WidgetPaintTypepaintType;
PaintWindowProcpaintWindow;
-PreparePaintScreenProc preparePaintScreen;
-DonePaintScreenProcdonePaintScreen;
+PreparePaintOutputProc preparePaintOutput;
+DonePaintOutputProcdonePaintOutput;
WindowResizeNotifyProc windowResizeNotify;
WindowMoveNotifyProc windowMoveNotify;
Cursor cursor;
@@ -410,7 +410,7 @@ widgetUnGrabScreen (CompScreen *s)
}
static void
-widgetPreparePaintScreen (CompScreen *s,
+widgetPreparePaintOutput (CompScreen *s,
int msSinceLastPaint)
{
WIDGET_SCREEN (s);
@@ -459,13 +459,13 @@ widgetPreparePaintScreen (CompScreen *s
}
-UNWRAP (ws, s, preparePaintScreen);
-(*s-preparePaintScreen) (s, msSinceLastPaint);
-WRAP (ws, s, preparePaintScreen, widgetPreparePaintScreen);
+UNWRAP (ws, s, preparePaintOutput);
+(*s-preparePaintOutput) (s, msSinceLastPaint);
+WRAP (ws, s, preparePaintOutput, widgetPreparePaintOutput);
}
static void
-widgetDonePaintScreen(CompScreen * s)
+widgetDonePaintOutput(CompScreen * s)
{
WIDGET_SCREEN(s);
@@ -474,9 +474,9 @@ widgetDonePaintScreen(CompScreen * s
damageScreen (s);
}
-UNWRAP (ws, s, donePaintScreen);
-(*s-donePaintScreen) (s);
-WRAP (ws, s, donePaintScreen, widgetDonePaintScreen);
+UNWRAP (ws, s, donePaintOutput);
+(*s-donePaintOutput) (s);
+WRAP (ws, s, donePaintOutput, widgetDonePaintOutput);
}
static Bool
@@ -925,8 +925,8 @@ widgetInitScreen (CompPlugin *p,
ws-grabIndex = 0;
WRAP (ws, s, paintWindow, widgetPaintWindow);
-WRAP (ws, s, preparePaintScreen, widgetPreparePaintScreen);
-WRAP (ws, s, donePaintScreen, widgetDonePaintScreen);
+WRAP (ws, s, preparePaintOutput, widgetPreparePaintOutput);
+WRAP (ws, s, donePaintOutput, widgetDonePaintOutput);
return TRUE;
}
@@ -938,8 +938,8 @@ widgetFiniScreen (CompPlugin *p,
WIDGET_SCREEN (s);
UNWRAP (ws, s, paintWindow);
-UNWRAP (ws, s, preparePaintScreen);
-UNWRAP (ws, s, donePaintScreen);
+UNWRAP (ws, s, preparePaintOutput);
+UNWRAP (ws, s, donePaintOutput);
Re: [compiz] PaintOutput patches for widget, cheatsheet and flash
Sam Spilsbury wrote:
Erm, forgot to attach them :/
Thanks, I have applied the necessary changes for those
to work. Widget didn't need any changes though, did you
just search and replace?
Regards
Mike
On 6/4/07, Sam Spilsbury [EMAIL PROTECTED] wrote:
Hi
Attached are some patches to make widget, cheatsheet and flash work
with the current Compiz GIT.
They are my first patches so please do not shoot me down for them. It
is just me trying to understand the code a little more.
They Compile OK here (i686, SUSE 10.2) and should compiz OK if you
have a recent (==days) version of compiz.
All I have done really is replace PaintScreen with PaintOutput and
paintScreen with paintOutput.
I hope they are of some use.
PS : On a side note. Considering that most users dont really know too
much about these plugins, is it possible that we can mirror them on
git.opencompositing.org? We will give full credit to the authors and
whoever mantains them. I also need something to write about in OCCN!
:P
-SmSpillaz
diff --git a/cheatsheet.c b/cheatsheet.c
index 98cb899..9a9d8a6 100644
--- a/cheatsheet.c
+++ b/cheatsheet.c
@@ -45,7 +45,7 @@ typedef struct _CheatsheetDisplay {
} CheatsheetDisplay;
typedef struct _CheatsheetScreen {
-PaintScreenProc paintScreen;
+PaintOutputProc paintOutput;
intgrabIndex;
Pixmap pixmap;
@@ -639,7 +639,7 @@ cheatsheetTerminate (CompDisplay *d,
}
static Bool
-cheatsheetPaintScreen (CompScreen *s,
+cheatsheetPaintOutput (CompScreen *s,
const ScreenPaintAttrib *sAttrib,
const CompTransform *transform,
Regionregion,
@@ -650,9 +650,9 @@ cheatsheetPaintScreen (CompScreen*s,
CHEATSHEET_SCREEN (s);
-UNWRAP (cs, s, paintScreen);
-status = (*s-paintScreen) (s, sAttrib, transform, region, output, mask);
-WRAP (cs, s, paintScreen, cheatsheetPaintScreen);
+UNWRAP (cs, s, paintOutput);
+status = (*s-paintOutput) (s, sAttrib, transform, region, output, mask);
+WRAP (cs, s, paintOutput, cheatsheetPaintOutput);
if (status cs-content region-numRects)
{
@@ -828,7 +828,7 @@ cheatsheetInitScreen (CompPlugin *p,
addScreenAction (s,
cd-opt[CHEATSHEET_DISPLAY_OPTION_INITIATE].value.action);
-WRAP (cs, s, paintScreen, cheatsheetPaintScreen);
+WRAP (cs, s, paintOutput, cheatsheetPaintOutput);
s-privates[cd-screenPrivateIndex].ptr = cs;
@@ -852,7 +852,7 @@ cheatsheetFiniScreen (CompPlugin *p,
if (cs-pixmap)
XFreePixmap (s-display-display, cs-pixmap);
-UNWRAP (cs, s, paintScreen);
+UNWRAP (cs, s, paintOutput);
free (cs);
}
diff --git a/cheatsheet.xml b/cheatsheet.xml
lines 17-54/54 (END)
diff --git a/widget.c b/widget.c
index 8a34909..7b275fa 100644
--- a/widget.c
+++ b/widget.c
@@ -103,8 +103,8 @@ typedef struct _WidgetScreen
WidgetPaintTypepaintType;
PaintWindowProcpaintWindow;
-PreparePaintScreenProc preparePaintScreen;
-DonePaintScreenProcdonePaintScreen;
+PreparePaintOutputProc preparePaintOutput;
+DonePaintOutputProcdonePaintOutput;
WindowResizeNotifyProc windowResizeNotify;
WindowMoveNotifyProc windowMoveNotify;
Cursor cursor;
@@ -410,7 +410,7 @@ widgetUnGrabScreen (CompScreen *s)
}
static void
-widgetPreparePaintScreen (CompScreen *s,
+widgetPreparePaintOutput (CompScreen *s,
int msSinceLastPaint)
{
WIDGET_SCREEN (s);
@@ -459,13 +459,13 @@ widgetPreparePaintScreen (CompScreen *s
}
-UNWRAP (ws, s, preparePaintScreen);
-(*s-preparePaintScreen) (s, msSinceLastPaint);
-WRAP (ws, s, preparePaintScreen, widgetPreparePaintScreen);
+UNWRAP (ws, s, preparePaintOutput);
+(*s-preparePaintOutput) (s, msSinceLastPaint);
+WRAP (ws, s, preparePaintOutput, widgetPreparePaintOutput);
}
static void
-widgetDonePaintScreen(CompScreen * s)
+widgetDonePaintOutput(CompScreen * s)
{
WIDGET_SCREEN(s);
@@ -474,9 +474,9 @@ widgetDonePaintScreen(CompScreen * s
damageScreen (s);
}
-UNWRAP (ws, s, donePaintScreen);
-(*s-donePaintScreen) (s);
-WRAP (ws, s, donePaintScreen, widgetDonePaintScreen);
+UNWRAP (ws, s, donePaintOutput);
+(*s-donePaintOutput) (s);
+WRAP (ws, s, donePaintOutput, widgetDonePaintOutput);
}
static Bool
@@ -925,8 +925,8 @@ widgetInitScreen (CompPlugin *p,
ws-grabIndex = 0;
WRAP (ws, s, paintWindow, widgetPaintWindow);
-WRAP (ws, s, preparePaintScreen, widgetPreparePaintScreen);
-WRAP (ws, s,
