rpms/compiz/F-13 compiz-0.8.6-unloadpluginfix.patch, NONE, 1.1 compiz-0.8.6-wall.patch, NONE, 1.1
drago01
drago01 at fedoraproject.org
Tue Mar 30 13:44:41 UTC 2010
Author: drago01
Update of /cvs/pkgs/rpms/compiz/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv9571
Added Files:
compiz-0.8.6-unloadpluginfix.patch compiz-0.8.6-wall.patch
Log Message:
add the patches
compiz-0.8.6-unloadpluginfix.patch:
include/compiz-core.h | 1 +
plugins/gconf.c | 2 ++
plugins/glib.c | 2 ++
3 files changed, 5 insertions(+)
--- NEW FILE compiz-0.8.6-unloadpluginfix.patch ---
diff -upNr compiz-0.8.6.orign/include/compiz-core.h compiz-0.8.6/include/compiz-core.h
--- compiz-0.8.6.orign/include/compiz-core.h 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/include/compiz-core.h 2010-03-30 14:48:59.055172395 +0200
@@ -27,6 +27,7 @@
#define _COMPIZ_CORE_H
#include <compiz-plugin.h>
+#include <dlfcn.h>
#define CORE_ABIVERSION 20091102
diff -upNr compiz-0.8.6.orign/plugins/gconf.c compiz-0.8.6/plugins/gconf.c
--- compiz-0.8.6.orign/plugins/gconf.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/plugins/gconf.c 2010-03-30 14:48:59.056187055 +0200
@@ -802,6 +802,8 @@ gconfFiniObject (CompPlugin *p,
static Bool
gconfInit (CompPlugin *p)
{
+ dlopen ("libgconf-2.so.4", RTLD_LAZY);
+
if (!compInitPluginMetadataFromInfo (&gconfMetadata, p->vTable->name,
0, 0, 0, 0))
return FALSE;
diff -upNr compiz-0.8.6.orign/plugins/glib.c compiz-0.8.6/plugins/glib.c
--- compiz-0.8.6.orign/plugins/glib.c 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/plugins/glib.c 2010-03-30 14:48:59.056187055 +0200
@@ -197,6 +197,8 @@ glibInitDisplay (CompPlugin *p,
{
GLibDisplay *gd;
+ dlopen ("libglib-2.0.so.0", RTLD_LAZY);
+
if (!checkPluginABI ("core", CORE_ABIVERSION))
return FALSE;
compiz-0.8.6-wall.patch:
metadata/Makefile.am | 1
metadata/wall.xml.in | 357 +++++++
plugins/Makefile.am | 7
plugins/wall.c | 2264 +++++++++++++++++++++++++++++++++++++++++++++++++
plugins/wall_options.c | 1949 ++++++++++++++++++++++++++++++++++++++++++
plugins/wall_options.h | 375 ++++++++
6 files changed, 4952 insertions(+), 1 deletion(-)
--- NEW FILE compiz-0.8.6-wall.patch ---
diff -upNr compiz-0.8.6.orign/metadata/Makefile.am compiz-0.8.6/metadata/Makefile.am
--- compiz-0.8.6.orign/metadata/Makefile.am 2010-03-28 14:15:35.000000000 +0200
+++ compiz-0.8.6/metadata/Makefile.am 2010-03-30 14:53:23.499283857 +0200
@@ -31,6 +31,7 @@ xml_in_files = \
video.xml.in \
water.xml.in \
wobbly.xml.in \
+ wall.xml.in \
zoom.xml.in
xml_files = $(xml_in_files:.xml.in=.xml)
xml_DATA = $(xml_files)
diff -upNr compiz-0.8.6.orign/metadata/wall.xml.in compiz-0.8.6/metadata/wall.xml.in
--- compiz-0.8.6.orign/metadata/wall.xml.in 1970-01-01 01:00:00.000000000 +0100
+++ compiz-0.8.6/metadata/wall.xml.in 2010-03-30 14:53:23.499283857 +0200
@@ -0,0 +1,357 @@
+<?xml version="1.0"?>
+<compiz>
+ <plugin name="wall" useBcop="true">
+ <_short>Desktop Wall</_short>
+ <_long>Desktop Wall Plugin</_long>
+ <category>Desktop</category>
+ <feature>largedesktop</feature>
+ <deps>
+ <relation type="after">
+ <plugin>decoration</plugin>
+ </relation>
+ <relation type="before">
+ <plugin>wobbly</plugin>
+ <plugin>fade</plugin>
+ </relation>
+ </deps>
+ <display>
+ <group>
+ <_short>Viewport Switch Preview</_short>
+ <option name="show_switcher" type="bool">
+ <_short>Show Viewport Switcher Preview</_short>
+ <_long>Show switcher window while switching viewports</_long>
+ <default>true</default>
+ </option>
+ <option name="miniscreen" type="bool">
+ <_short>Show Live Viewport Previews</_short>
+ <_long>Show live viewport previews in switcher window</_long>
+ <default>false</default>
+ </option>
+ <option name="preview_timeout" type="float">
+ <_short>Switch Target Preview Visibility Time</_short>
+ <_long>Duration (in s) the switch target preview should remain visible after switching ends.</_long>
+ <default>0.4</default>
+ <min>0.0</min>
+ <max>2.0</max>
+ <precision>0.05</precision>
+ </option>
+ <option name="preview_scale" type="int">
+ <_short>Preview Scale</_short>
+ <_long>Size of the preview in %</_long>
+ <default>100</default>
+ <min>0</min>
+ <max>400</max>
+ </option>
+ <option name="edge_radius" type="int">
+ <_short>Edge Radius</_short>
+ <_long>Radius of the rounded edge</_long>
+ <default>5</default>
+ <min>0</min>
+ <max>20</max>
+ </option>
+ <option name="border_width" type="int">
+ <_short>Border Width</_short>
+ <_long>Width of the border between the previews</_long>
+ <default>10</default>
+ <min>0</min>
+ <max>30</max>
+ </option>
+ <option name="outline_color" type="color">
+ <_short>Outline Color</_short>
+ <_long>Outline color of the switcher window.</_long>
+ <default>
+ <red>0x3333</red>
+ <green>0x3333</green>
+ <blue>0x3333</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <subgroup>
+ <_short>Background Gradient</_short>
+
+ <option name="background_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xcccc</red>
+ <green>0xcccc</green>
+ <blue>0xe665</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="background_gradient_highlight_color" type="color">
+ <_short>Highlight Color</_short>
+ <_long>Second color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xf332</red>
+ <green>0xf332</green>
+ <blue>0xffff</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="background_gradient_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Third color for the background gradient of the switcher window.</_long>
+ <default>
+ <red>0xf332</red>
+ <green>0xf332</green>
+ <blue>0xffff</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Thumb Gradient</_short>
+
+ <option name="thumb_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the thumb gradient of the switcher window.</_long>
+ <default>
+ <red>0x3333</red>
+ <green>0x3333</green>
+ <blue>0x3333</blue>
+ <alpha>0x5999</alpha>
+ </default>
+ </option>
+ <option name="thumb_gradient_highlight_color" type="color">
+ <_short>Highlight Color</_short>
+ <_long>Second color for the thumb gradient of the switcher window.</_long>
+ <default>
+ <red>0x3fff</red>
+ <green>0x3fff</green>
+ <blue>0x3fff</blue>
+ <alpha>0x3fff</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Highlight Gradient</_short>
+
+ <option name="thumb_highlight_gradient_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color for the thumb highlight gradient of the switcher window.</_long>
+ <default>
+ <red>0xffff</red>
+ <green>0xffff</green>
+ <blue>0xffff</blue>
+ <alpha>0xf332</alpha>
+ </default>
+ </option>
+ <option name="thumb_highlight_gradient_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Second color for the thumb highlight gradient of the switcher window.</_long>
+ <default>
+ <red>0xdfff</red>
+ <green>0xdfff</green>
+ <blue>0xdfff</blue>
+ <alpha>0xa665</alpha>
+ </default>
+ </option>
+ </subgroup>
+ <subgroup>
+ <_short>Arrow Colors</_short>
+
+ <option name="arrow_base_color" type="color">
+ <_short>Base Color</_short>
+ <_long>First color of the arrow of the switcher window.</_long>
+ <default>
+ <red>0xe665</red>
+ <green>0xe665</green>
+ <blue>0xe665</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ <option name="arrow_shadow_color" type="color">
+ <_short>Shadow Color</_short>
+ <_long>Second color of the arrow of the switcher window.</_long>
+ <default>
+ <red>0xdc28</red>
+ <green>0xdc28</green>
+ <blue>0xdc28</blue>
+ <alpha>0xd998</alpha>
+ </default>
+ </option>
+ </subgroup>
+ </group>
+ <group>
+ <_short>Viewport Switching</_short>
+ <option name="allow_wraparound" type="bool">
+ <_short>Allow Wrap-Around</_short>
+ <_long>Allow wrap-around when moving the wall up/down/left/right</_long>
+ <default>false</default>
+ </option>
+ <option name="slide_duration" type="float">
+ <_short>Wall Sliding Duration</_short>
[...4604 lines suppressed...]
+unsigned short * wallGetArrowBaseColor (CompDisplay *d);
+unsigned short wallGetArrowBaseColorRed (CompDisplay *d);
+unsigned short wallGetArrowBaseColorGreen (CompDisplay *d);
+unsigned short wallGetArrowBaseColorBlue (CompDisplay *d);
+unsigned short wallGetArrowBaseColorAlpha (CompDisplay *d);
+CompOption * wallGetArrowBaseColorOption (CompDisplay *d);
+void wallSetArrowBaseColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+unsigned short * wallGetArrowShadowColor (CompDisplay *d);
+unsigned short wallGetArrowShadowColorRed (CompDisplay *d);
+unsigned short wallGetArrowShadowColorGreen (CompDisplay *d);
+unsigned short wallGetArrowShadowColorBlue (CompDisplay *d);
+unsigned short wallGetArrowShadowColorAlpha (CompDisplay *d);
+CompOption * wallGetArrowShadowColorOption (CompDisplay *d);
+void wallSetArrowShadowColorNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+Bool wallGetAllowWraparound (CompDisplay *d);
+CompOption * wallGetAllowWraparoundOption (CompDisplay *d);
+void wallSetAllowWraparoundNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+float wallGetSlideDuration (CompDisplay *d);
+CompOption * wallGetSlideDurationOption (CompDisplay *d);
+void wallSetSlideDurationNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompMatch * wallGetNoSlideMatch (CompDisplay *d);
+CompOption * wallGetNoSlideMatchOption (CompDisplay *d);
+void wallSetNoSlideMatchNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftKey (CompDisplay *d);
+void wallSetLeftKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftKeyOption (CompDisplay *d);
+void wallSetLeftKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftButton (CompDisplay *d);
+void wallSetLeftButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftButtonOption (CompDisplay *d);
+void wallSetLeftButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightKey (CompDisplay *d);
+void wallSetRightKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightKeyOption (CompDisplay *d);
+void wallSetRightKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightButton (CompDisplay *d);
+void wallSetRightButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightButtonOption (CompDisplay *d);
+void wallSetRightButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpKey (CompDisplay *d);
+void wallSetUpKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpKeyOption (CompDisplay *d);
+void wallSetUpKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpButton (CompDisplay *d);
+void wallSetUpButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpButtonOption (CompDisplay *d);
+void wallSetUpButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownKey (CompDisplay *d);
+void wallSetDownKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownKeyOption (CompDisplay *d);
+void wallSetDownKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownButton (CompDisplay *d);
+void wallSetDownButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownButtonOption (CompDisplay *d);
+void wallSetDownButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetNextKey (CompDisplay *d);
+void wallSetNextKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetNextKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetNextKeyOption (CompDisplay *d);
+void wallSetNextKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetNextButton (CompDisplay *d);
+void wallSetNextButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetNextButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetNextButtonOption (CompDisplay *d);
+void wallSetNextButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetPrevKey (CompDisplay *d);
+void wallSetPrevKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetPrevKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetPrevKeyOption (CompDisplay *d);
+void wallSetPrevKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetPrevButton (CompDisplay *d);
+void wallSetPrevButtonInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetPrevButtonTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetPrevButtonOption (CompDisplay *d);
+void wallSetPrevButtonNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetLeftWindowKey (CompDisplay *d);
+void wallSetLeftWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetLeftWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetLeftWindowKeyOption (CompDisplay *d);
+void wallSetLeftWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetRightWindowKey (CompDisplay *d);
+void wallSetRightWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetRightWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetRightWindowKeyOption (CompDisplay *d);
+void wallSetRightWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetUpWindowKey (CompDisplay *d);
+void wallSetUpWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetUpWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetUpWindowKeyOption (CompDisplay *d);
+void wallSetUpWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetDownWindowKey (CompDisplay *d);
+void wallSetDownWindowKeyInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetDownWindowKeyTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetDownWindowKeyOption (CompDisplay *d);
+void wallSetDownWindowKeyNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipLeftEdge (CompDisplay *d);
+void wallSetFlipLeftEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipLeftEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipLeftEdgeOption (CompDisplay *d);
+void wallSetFlipLeftEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipRightEdge (CompDisplay *d);
+void wallSetFlipRightEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipRightEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipRightEdgeOption (CompDisplay *d);
+void wallSetFlipRightEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipUpEdge (CompDisplay *d);
+void wallSetFlipUpEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipUpEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipUpEdgeOption (CompDisplay *d);
+void wallSetFlipUpEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+CompAction * wallGetFlipDownEdge (CompDisplay *d);
+void wallSetFlipDownEdgeInitiate (CompDisplay *d, CompActionCallBackProc init);
+void wallSetFlipDownEdgeTerminate (CompDisplay *d, CompActionCallBackProc term);
+CompOption * wallGetFlipDownEdgeOption (CompDisplay *d);
+void wallSetFlipDownEdgeNotify (CompDisplay *d, wallDisplayOptionChangeNotifyProc notify);
+
+int wallGetMmmode (CompScreen *s);
+CompOption * wallGetMmmodeOption (CompScreen *s);
+void wallSetMmmodeNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipPointer (CompScreen *s);
+CompOption * wallGetEdgeflipPointerOption (CompScreen *s);
+void wallSetEdgeflipPointerNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipMove (CompScreen *s);
+CompOption * wallGetEdgeflipMoveOption (CompScreen *s);
+void wallSetEdgeflipMoveNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+Bool wallGetEdgeflipDnd (CompScreen *s);
+CompOption * wallGetEdgeflipDndOption (CompScreen *s);
+void wallSetEdgeflipDndNotify (CompScreen *s, wallScreenOptionChangeNotifyProc notify);
+
+#ifndef GENERIC_PRIVATE_DEFINES
+#define GENERIC_PRIVATE_DEFINES
+
+#define GET_PLUGIN_CORE(object, plugin) \
+ ((plugin##Core *) (object)->base.privates[plugin##CorePrivateIndex].ptr)
+#define PLUGIN_CORE(object, plugin, prefix) \
+ plugin##Core * prefix##c = GET_PLUGIN_CORE (object, plugin)
+
+#define GET_PLUGIN_DISPLAY(object, plugin) \
+ ((plugin##Display *) \
+ (object)->base.privates[plugin##DisplayPrivateIndex].ptr)
+#define PLUGIN_DISPLAY(object, plugin, prefix) \
+ plugin##Display * prefix##d = GET_PLUGIN_DISPLAY (object, plugin)
+
+#define GET_PLUGIN_SCREEN(object, parent, plugin) \
+ ((plugin##Screen *) \
+ (object)->base.privates[(parent)->screenPrivateIndex].ptr)
+#define PLUGIN_SCREEN(object, plugin, prefix) \
+ plugin##Screen * prefix##s = \
+ GET_PLUGIN_SCREEN (object, \
+ GET_PLUGIN_DISPLAY ((object)->display, plugin), plugin)
+
+#define GET_PLUGIN_WINDOW(object, parent, plugin) \
+ ((plugin##Window *) \
+ (object)->base.privates[(parent)->windowPrivateIndex].ptr)
+#define PLUGIN_WINDOW(object, plugin, prefix) \
+ plugin##Window * prefix##w = \
+ GET_PLUGIN_WINDOW (object, \
+ GET_PLUGIN_SCREEN ((object)->screen, \
+ GET_PLUGIN_DISPLAY ((object)->screen->display, plugin), plugin), plugin)
+
+#endif
+
+COMPIZ_END_DECLS
+
+#endif
More information about the scm-commits
mailing list