Hello community, here is the log from the commit of package compiz-plugins-dmx checked in at Tue Nov 18 13:21:31 CET 2008. -------- --- compiz-plugins-dmx/compiz-plugins-dmx.changes 2008-11-14 22:53:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/compiz-plugins-dmx/compiz-plugins-dmx.changes 2008-11-17 19:46:58.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Nov 17 13:36:08 EST 2008 - davidr@novell.com + +- Update dmx-NOMAD.diff + * Fix another clipping issue. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ compiz-plugins-dmx.spec ++++++ --- /var/tmp/diff_new_pack.QC1736/_old 2008-11-18 13:21:17.000000000 +0100 +++ /var/tmp/diff_new_pack.QC1736/_new 2008-11-18 13:21:17.000000000 +0100 @@ -29,7 +29,7 @@ PreReq: %fillup_prereq Requires: compiz Version: 0.1.0 -Release: 4 +Release: 5 Summary: Compiz DMX plugins BuildRoot: %{_tmppath}/%{name}-%{version}-build ExclusiveArch: %ix86 x86_64 ppc ppc64 ia64 @@ -74,6 +74,9 @@ %{_datadir}/compiz/ %changelog +* Mon Nov 17 2008 davidr@novell.com +- Update dmx-NOMAD.diff + * Fix another clipping issue. * Fri Nov 14 2008 davidr@novell.com - Update dmx-NOMAD.diff * Fix DMX root window clipping. ++++++ dmx-NOMAD.diff ++++++ --- /var/tmp/diff_new_pack.QC1736/_old 2008-11-18 13:21:17.000000000 +0100 +++ /var/tmp/diff_new_pack.QC1736/_new 2008-11-18 13:21:17.000000000 +0100 @@ -1,8 +1,8 @@ diff --git a/dmx.c b/dmx.c -index a7d1c8e..acdc522 100644 +index a7d1c8e..50f7d14 100644 --- a/dmx.c +++ b/dmx.c -@@ -20,15 +20,23 @@ typedef struct _DmxDisplay { +@@ -20,15 +20,24 @@ typedef struct _DmxDisplay { Atom dmxRootAtom; Atom dmxNameAtom; @@ -14,6 +14,7 @@ Window root; + + DrawWindowProc drawWindow; ++ PaintWindowProc paintWindow; + WindowMoveNotifyProc windowMoveNotify; + WindowResizeNotifyProc windowResizeNotify; } DmxScreen; @@ -27,7 +28,7 @@ } DmxWindow; #define GET_DMX_CORE(c) \ -@@ -58,6 +66,129 @@ typedef struct _DmxWindow { +@@ -58,6 +67,151 @@ typedef struct _DmxWindow { GET_DMX_SCREEN (w->screen, \ GET_DMX_DISPLAY (w->screen->display))) @@ -56,6 +57,28 @@ + return status; +} + ++static Bool ++dmxPaintWindow (CompWindow *w, ++ const WindowPaintAttrib *attrib, ++ const CompTransform *transform, ++ Region region, ++ unsigned int mask) ++{ ++ Bool status; ++ ++ DMX_SCREEN (w->screen); ++ DMX_WINDOW (w); ++ ++ if (dw->region) ++ mask |= PAINT_WINDOW_TRANSLUCENT_MASK; ++ ++ UNWRAP (ds, w->screen, paintWindow); ++ status = (*w->screen->paintWindow) (w, attrib, transform, region, mask); ++ WRAP (ds, w->screen, paintWindow, dmxPaintWindow); ++ ++ return status; ++} ++ +static void +dmxWindowUpdateRootRegion (CompWindow *w) +{ @@ -157,7 +180,7 @@ static char * dmxWindowGetDmxNameProp (CompWindow *w) { -@@ -85,41 +216,114 @@ dmxWindowGetDmxNameProp (CompWindow *w) +@@ -85,41 +239,114 @@ dmxWindowGetDmxNameProp (CompWindow *w) return name; } @@ -250,9 +273,7 @@ - &children, &nchildren); + for (i = 0; i < nchildren; i++) + addWindow (w, children[i], i ? children[i - 1] : 0); - -- for (i = 0; i < nchildren; i++) -- addWindow (w, children[i], i ? children[i - 1] : 0); ++ + dmxWindowUpdateRootRegion (w); + } + } @@ -262,7 +283,9 @@ + { + while (w->windows) + removeWindow (w->windows); -+ + +- for (i = 0; i < nchildren; i++) +- addWindow (w, children[i], i ? children[i - 1] : 0); + XSelectInput (d->display, w->id, StructureNotifyMask | + PropertyChangeMask); + @@ -297,7 +320,7 @@ return TRUE; } -@@ -183,16 +387,26 @@ dmxEnsureDmxRoot (CompWindow *ancestor, +@@ -183,16 +410,26 @@ dmxEnsureDmxRoot (CompWindow *ancestor, CompWindow *c; unsigned int i; @@ -330,7 +353,7 @@ } if (*children) -@@ -217,6 +431,13 @@ dmxWindowCheckDmxRoot (CompWindow *w) +@@ -217,6 +454,13 @@ dmxWindowCheckDmxRoot (CompWindow *w) if (!root) return FALSE; @@ -344,7 +367,7 @@ for (i = 0; i < n; i++) { CompWindow *r; -@@ -226,20 +447,12 @@ dmxWindowCheckDmxRoot (CompWindow *w) +@@ -226,20 +470,12 @@ dmxWindowCheckDmxRoot (CompWindow *w) ds->root = root[i]; r = dmxEnsureDmxRoot (w, root[i], &children, &nchildren); @@ -367,7 +390,7 @@ return TRUE; } -@@ -251,6 +464,19 @@ dmxHandleEvent (CompDisplay *d, +@@ -251,6 +487,19 @@ dmxHandleEvent (CompDisplay *d, DMX_DISPLAY (d); @@ -387,7 +410,7 @@ UNWRAP (dd, d, handleEvent); (*d->handleEvent) (d, event); WRAP (dd, d, handleEvent, dmxHandleEvent); -@@ -260,25 +486,59 @@ dmxHandleEvent (CompDisplay *d, +@@ -260,25 +509,59 @@ dmxHandleEvent (CompDisplay *d, if (event->xproperty.atom == dd->dmxNameAtom) { w = findWindowAtDisplay (d, event->xproperty.window); @@ -451,7 +474,7 @@ } static void -@@ -310,9 +570,6 @@ dmxInitCore (CompPlugin *p, +@@ -310,9 +593,6 @@ dmxInitCore (CompPlugin *p, if (!checkPluginABI ("core", CORE_ABIVERSION)) return FALSE; @@ -461,7 +484,7 @@ dc = malloc (sizeof (DmxCore)); if (!dc) return FALSE; -@@ -363,6 +620,9 @@ dmxInitDisplay (CompPlugin *plugin, CompDisplay *d) +@@ -363,6 +643,9 @@ dmxInitDisplay (CompPlugin *plugin, CompDisplay *d) dd->dmxNameAtom = XInternAtom (d->display, "DMX_NAME", 0); dd->dmxRootAtom = XInternAtom (d->display, "DMX_ROOT", 0); @@ -471,11 +494,12 @@ d->base.privates[displayPrivateIndex].ptr = dd; WRAP (dd, d, handleEvent, dmxHandleEvent); -@@ -402,16 +662,39 @@ dmxInitScreen (CompPlugin *plugin, CompScreen *s) +@@ -402,16 +685,41 @@ dmxInitScreen (CompPlugin *plugin, CompScreen *s) ds->root = None; + WRAP (ds, s, drawWindow, dmxDrawWindow); ++ WRAP (ds, s, paintWindow, dmxPaintWindow); + WRAP (ds, s, windowMoveNotify, dmxWindowMoveNotify); + WRAP (ds, s, windowResizeNotify, dmxWindowResizeNotify); + @@ -505,13 +529,14 @@ + dd->dmxSupportingCmCheckAtom); + + UNWRAP (ds, s, drawWindow); ++ UNWRAP (ds, s, paintWindow); + UNWRAP (ds, s, windowMoveNotify); + UNWRAP (ds, s, windowResizeNotify); + freeWindowPrivateIndex (s, ds->windowPrivateIndex); free (ds); -@@ -428,7 +711,10 @@ dmxInitWindow (CompPlugin *plugin, CompWindow *w) +@@ -428,7 +736,10 @@ dmxInitWindow (CompPlugin *plugin, CompWindow *w) if (!dw) return FALSE; @@ -523,7 +548,7 @@ w->base.privates[ds->windowPrivateIndex].ptr = dw; -@@ -444,25 +730,28 @@ dmxInitWindow (CompPlugin *plugin, CompWindow *w) +@@ -444,25 +755,28 @@ dmxInitWindow (CompPlugin *plugin, CompWindow *w) static void dmxFiniWindow (CompPlugin *plugin, CompWindow *w) { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de