Group :: System/X11
RPM: compiz
Navigation
Main Changelog Spec Patches Sources Download Gear Bugs and FR Repocop
Patch: compiz-0.8.2-alt6.patch
Download
Download
.gear/rules | 2 +
.../tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 | 13 +
.gear/tags/list | 1 +
compiz.spec | 259 +++++++++++++++++
configure.ac | 2 +-
gtk/gnome/compiz-wm.desktop.in | 2 +-
gtk/gnome/compiz.desktop.in | 2 +-
images/Makefile.am | 6 +-
images/altlinux.svg | 302 ++++++++++++++++++++
kde/window-decorator/options.cpp | 5 +
kde/window-decorator/options.h | 2 +-
metadata/cube.xml.in | 2 +-
plugins/resize.c | 4 +-
src/Makefile.am | 3 +-
src/main.c | 20 ++-
src/screen.c | 20 ++-
16 files changed, 633 insertions(+), 12 deletions(-)
diff --git a/.gear/rules b/.gear/rules
new file mode 100644
index 0000000..f78a96e
--- /dev/null
+++ b/.gear/rules
@@ -0,0 +1,2 @@
+tar: @name@-@version@:.
+diff: @name@-@version@:. .
diff --git a/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 b/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404
new file mode 100644
index 0000000..4d0a4c1
--- /dev/null
+++ b/.gear/tags/c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404
@@ -0,0 +1,13 @@
+object 4514310abe0697d2d73b0fefac5bbed17c7e7c63
+type commit
+tag compiz-0.8.2
+tagger Danny Baumann <dannybaumann@web.de> 1235909990 +0100
+
+compiz 0.8.2 release
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.9 (GNU/Linux)
+
+iEYEABECAAYFAkmqfWYACgkQ6+ZunlVwJYNvygCePuDGpbNT8QRTE/fsFSBhbmOr
+b/gAn3wEvanLGkBrLb8RZNFehgb/hvMM
+=GpYc
+-----END PGP SIGNATURE-----
diff --git a/.gear/tags/list b/.gear/tags/list
new file mode 100644
index 0000000..fe29f5f
--- /dev/null
+++ b/.gear/tags/list
@@ -0,0 +1 @@
+c16a5abc8e062a37fb16a9ecdb2cc784a4d0f404 compiz-0.8.2
diff --git a/compiz.spec b/compiz.spec
new file mode 100644
index 0000000..a476b87
--- /dev/null
+++ b/compiz.spec
@@ -0,0 +1,259 @@
+%define gnome_plugins compiz-annotate compiz-blur compiz-clone compiz-commands compiz-core compiz-cube compiz-dbus compiz-decoration compiz-fade compiz-fs compiz-gconf compiz-glib compiz-gnomecompat compiz-ini compiz-inotify compiz-minimize compiz-move compiz-obs compiz-place compiz-png compiz-regex compiz-resize compiz-rotate compiz-scale compiz-screenshot compiz-svg compiz-switcher compiz-video compiz-water compiz-wobbly compiz-zoom gwd
+
+Name: compiz
+Version: 0.8.2
+Release: alt6
+
+Summary: OpenGL window and compositing manager
+License: MIT/X11 GPL
+Group: System/X11
+Url: http://www.compiz-fusion.org/
+Packager: XOrg Maintainer Team <xorg@packages.altlinux.org>
+
+Obsoletes: compiz-manager
+Provides: compiz-manager = %version-%release
+
+Source: %name-%version.tar
+Patch: %name-%version-%release.patch
+
+BuildRequires: GConf gcc-c++ intltool gnome-control-center-devel kdebase-devel libGL-devel libXcomposite-devel
+BuildRequires: libdbus-glib-devel libdbus-qt-devel libgnome-desktop-devel libmetacity-devel librsvg-devel
+BuildRequires: libwnck-devel libxslt-devel xorg-xextproto-devel
+
+%description
+Compiz is an OpenGL compositing manager that use GLX_EXT_texture_from_pixmap
+for binding redirected top-level windows to texture objects. It has a flexible
+plug-in system and it is designed to run well on most graphics hardware.
+
+%package gnome
+Summary: Gnome Window Manager
+Group: Graphical desktop/GNOME
+Requires: %name = %version-%release %name-gtk = %version-%release ccsm
+
+%description gnome
+Compiz Window Manager for Gnome
+
+%package gtk
+Summary: Gtk Compiz window decorator
+Group: Graphical desktop/GNOME
+Requires: %name = %version-%release
+Requires: compizconfig-backend-gconf >= 0.7.7
+
+%description gtk
+Compiz window decorator for Gtk
+
+%package kde
+Summary: KDE Compiz window decorator
+Group: Graphical desktop/KDE
+Requires: %name = %version-%release
+Requires: compizconfig-backend-kconfig >= 0.7.7 ccsm
+
+%description kde
+Compiz window decorator for KDE
+
+%package devel
+Summary: Development file for Compiz
+Group: Development/C
+Requires: %name = %version-%release
+
+%description devel
+Development file for Compiz
+
+%prep
+%setup -q
+%patch -p1
+
+%build
+%autoreconf
+%configure \
+ --enable-librsvg \
+ --enable-gtk \
+ --enable-gnome \
+ --enable-metacity \
+ --enable-gconf \
+ --enable-gnome-keybindings \
+ --enable-kde \
+ --disable-kde4 \
+ --disable-static
+
+%make_build
+
+%install
+%make DESTDIR=%buildroot install
+
+mkdir -p %buildroot%_sysconfdir/X11/wmsession.d
+cat > %buildroot%_sysconfdir/X11/wmsession.d/30Compiz <<EOF
+NAME=Compiz
+ICON=/usr/share/icons/default.kde/64x64/apps/kmenu.png
+DESC=Compiz manager
+EXEC=/usr/bin/startcompiz
+SCRIPT:
+exec /usr/bin/startcompiz
+EOF
+
+cat > %buildroot%_bindir/startcompiz <<EOF
+#/bin/sh
+
+export KDEWM="/usr/bin/compiz --kwd ccp"
+/usr/bin/startkde
+EOF
+
+%find_lang %name
+
+%post gnome
+%gconf2_install %gnome_plugins
+
+%preun gnome
+if [ $1 = 0 ]; then
+%gconf2_uninstall %gnome_plugins
+fi
+
+%files -f %name.lang
+%doc AUTHORS COPYING COPYING.GPL COPYING.MIT README TODO NEWS
+%_bindir/%name
+%dir %_libdir/%name
+%_libdir/*.so.*
+%exclude %_libdir/%name/libkconfig.so
+%exclude %_libdir/%name/libgconf.so
+%_libdir/%name/lib*.so
+%_datadir/%name
+
+%files gnome
+%_sysconfdir/gconf/schemas/*.schemas
+%exclude %_sysconfdir/gconf/schemas/*kconfig.schemas
+%_libdir/%name/libgconf.so
+%_libdir/window-manager-settings/*.so
+%_desktopdir/%name.desktop
+%_datadir/gnome-control-center/keybindings/*.xml
+%_datadir/gnome/wm-properties/%name-wm.desktop
+
+%files gtk
+%_bindir/gtk-window-decorator
+
+%files kde
+%_sysconfdir/X11/wmsession.d/30Compiz
+%attr(0755,root,root) %_bindir/startcompiz
+%_bindir/kde-window-decorator
+%_libdir/%name/libkconfig.so
+%_datadir/config/*
+%_datadir/config.kcfg/%name-*
+
+%files devel
+%_includedir/compiz
+%_libdir/*.so
+%_pkgconfigdir/*.pc
+
+%changelog
+* Fri Apr 24 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt6
+- compiz-kde: autorun kde-window-decorator
+
+* Tue Apr 14 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt5
+- compiz-gnome: fixed double start if session preservation is included
+
+* Mon Apr 13 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt4
+- oops... renamed compiz.desktop to compiz-wm.desktop
+
+* Mon Apr 13 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt3
+- don't renamed %_desktopdir/compiz.desktop
+
+* Sat Apr 11 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt2
+- enabled gnome
+
+* Sun Mar 01 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.2-alt1
+- 0.8.2
+
+* Sat Feb 21 2009 Valery Inozemtsev <shrek@altlinux.ru> 0.8.0-alt1
+- 0.8.0
+
+* Sat Nov 22 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.8-alt3
+- removed obsolete %%post_ldconfig/%%postun_ldconfig calls
+
+* Wed Oct 29 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.8-alt2
+- added altlinux logo for cube plugin
+
+* Wed Sep 17 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.8-alt1
+- 0.7.8
+
+* Wed Sep 03 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.6-alt2
+- rebuild for Mesa-7.1
+
+* Sun Jun 01 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.6-alt1
+- 0.7.6
+
+* Fri Apr 04 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.4-alt1
+- 0.7.4
+
+* Fri Mar 07 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.2-alt1
+- 0.7.2
+
+* Fri Feb 08 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.7.0-alt1
+- 0.7.0
+
+* Wed Jan 16 2008 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt5.20080116
+- git snapshot 2008-01-16 (256728b9de329bcdbed6d665589082ad8f3bc7e2)
+
+* Tue Nov 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt5
+- fix for buffer overflow in strncat
+
+* Tue Nov 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt4
+- added %_sysconfdir/X11/wmsession.d/30Compiz to %name-kde
+
+* Wed Nov 14 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt3
+- CVE-2007-3920
+
+* Sat Oct 27 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt2
+- drop compiz-0.5.2-aiglx-defaults.patch: use option "--indirect-rendering"
+- rewrite tfp-server-extension patch
+
+* Sun Oct 21 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.2-alt1
+- 0.6.2
+
+* Mon Oct 15 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.6.0-alt1
+- 0.6.0
+
+* Tue Sep 11 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.4-alt1
+- 0.5.4
+
+* Fri Aug 31 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.2-alt2
+- disable GConf
+- updated build dependencies
+
+* Fri Aug 10 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.2-alt1
+- 0.5.2
+
+* Mon Apr 09 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.5.0-alt1
+- 0.5.0
+
+* Wed Jan 03 2007 Valery Inozemtsev <shrek@altlinux.ru> 0.3.6-alt1
+- 0.3.6
+
+* Wed Dec 27 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.3.5-alt1.git20061227
+- 0.3.5 2006-12-27 GIT snapshot
+
+* Tue Nov 07 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.3.3-alt3.git20061101
+- added compiz-0.3.3-aiglx-defaults.patch,
+ compiz-0.3.3-tfp-server-extension.patch
+
+* Tue Nov 07 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.3.3-alt2.git20061101
+- rename subpackage %name-gnome to %name-gtk
+- new subpackage %name-kde, %name-devel
+
+* Mon Nov 06 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.3.3-alt1.git20061101
+- 0.3.3 2006-11-01 GIT snapshot
+
+* Sat Sep 09 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.0.13-alt1.git20060901
+- merged RH patches
+- added ALT Linux logo for cube plugin
+
+* Fri Sep 08 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.0.13-alt0.git20060901
+- 0.0.13 git snapshot 2006-09-01
+
+* Thu May 04 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.0.10-alt0.cvs20060503
+- 0.0.10
+
+* Sun Apr 23 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.0.9-alt0.cvs20060420
+- CVS snapshot 2006-04-20
+
+* Wed Mar 29 2006 Valery Inozemtsev <shrek@altlinux.ru> 0.0.7-alt1
+- initial release
+
diff --git a/configure.ac b/configure.ac
index 0d3cb7c..e78290a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -517,7 +517,7 @@ if test "x$use_kde4" = "xyes"; then
[use_kde4=yes], [use_kde4=no])
KDE4_CFLAGS="-I$kde4incs"
- KDE4_LIBS="-L$kde4libs -lkdecore -lkdecorations -lplasma"
+ KDE4_LIBS="-L$kde4libs/kde4link -lkdecore -lkdecorations -lplasma"
QT4_MOC=`pkg-config QtGui --variable=moc_location`
QDBUSXML2CPP=`pkg-config QtGui --variable=exec_prefix`"/bin/qdbusxml2cpp"
diff --git a/gtk/gnome/compiz-wm.desktop.in b/gtk/gnome/compiz-wm.desktop.in
index bb3967a..438e5e4 100644
--- a/gtk/gnome/compiz-wm.desktop.in
+++ b/gtk/gnome/compiz-wm.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Encoding=UTF-8
_Name=Compiz
-Exec=compiz
+Exec=compiz --gwd ccp
# name of loadable control center module
X-GNOME-WMSettingsModule=compiz
# autostart phase
diff --git a/gtk/gnome/compiz.desktop.in b/gtk/gnome/compiz.desktop.in
index fce1407..da34d3b 100644
--- a/gtk/gnome/compiz.desktop.in
+++ b/gtk/gnome/compiz.desktop.in
@@ -2,7 +2,7 @@
Type=Application
Encoding=UTF-8
_Name=Compiz
-Exec=compiz
+Exec=compiz --gwd ccp
NoDisplay=true
# name of loadable control center module
X-GNOME-WMSettingsModule=compiz
diff --git a/images/Makefile.am b/images/Makefile.am
index 9f03184..3f2c36d 100644
--- a/images/Makefile.am
+++ b/images/Makefile.am
@@ -1,8 +1,10 @@
imagesdir = $(imagedir)
images_DATA = \
icon.png \
- freedesktop.png
+ freedesktop.png \
+ altlinux.svg
EXTRA_DIST = \
icon.png \
- freedesktop.png
+ freedesktop.png \
+ altlinux.svg
diff --git a/images/altlinux.svg b/images/altlinux.svg
new file mode 100644
index 0000000..6c4cb0b
--- /dev/null
+++ b/images/altlinux.svg
@@ -0,0 +1,302 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="800"
+ height="800"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="altlinux.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 526.18109 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="744.09448 : 526.18109 : 1"
+ inkscape:persp3d-origin="372.04724 : 350.78739 : 1"
+ id="perspective10" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ gridtolerance="10000"
+ guidetolerance="10"
+ objecttolerance="10"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35631553"
+ inkscape:cx="66.876499"
+ inkscape:cy="116.42414"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ showborder="false"
+ inkscape:showpageshadow="false" />
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g6745"
+ transform="scale(1.25,1.25)">
+ <rect
+ y="0"
+ x="0"
+ height="640"
+ width="640"
+ id="rect5887"
+ style="opacity:0.5;fill:#eeeeec;fill-opacity:1;stroke:none;stroke-width:2.74413896" />
+ <g
+ transform="matrix(2.5,0,0,2.5,-617.5,-37.142853)"
+ id="g5855">
+ <polygon
+ id="polygon2500"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#fdce37;fill-opacity:1;fill-rule:nonzero;stroke:#fdce37;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="118.27,313.18 227.89,313.18 227.89,415.87 118.27,415.87 118.27,313.18 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2502"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 421.98996,152.52712 L 421.80246,152.56462 L 421.61496,152.60212 L 421.42747,152.65212 L 421.22746,152.71462 L 421.01497,152.77712 L 420.80247,152.83962 L 420.58997,152.91462 L 420.36497,152.98962 L 420.13998,153.07711 L 419.90248,153.15212 L 419.43998,153.33961 L 418.95248,153.52711 L 418.47748,153.72712 L 417.98998,153.92711 L 417.50249,154.13961 L 417.015,154.35211 L 416.5525,154.5646 L 416.09,154.77711 L 415.64001,154.97711 L 415.4275,155.0771 L 415.215,155.1646 L 415.01501,155.2646 L 414.81501,155.3521 C 414.44001,155.5396 414.44001,156.1021 414.81501,156.1021 C 415.39001,156.2896 415.765,156.4771 416.14,156.86459 C 417.08999,157.98959 418.21498,158.93958 418.21498,160.43957 C 418.21498,162.13956 417.265,162.71456 417.45249,164.22705 C 418.02749,167.23953 420.47747,170.25201 420.47747,173.46448 C 420.28997,175.92697 418.02749,175.92697 416.7025,177.62696 C 416.3275,178.17695 416.14,178.75195 416.14,179.50195 C 416.14,180.26444 415.9525,181.57693 416.7025,181.57693 C 417.65249,181.77693 417.83999,179.87695 418.77748,179.87695 C 420.10247,180.07694 419.91498,181.96444 421.05247,181.96444 L 470.67715,181.96444 C 470.48965,181.38944 470.11465,180.63944 469.72715,180.45194 C 467.27717,178.17695 461.05221,175.16447 459.91472,171.577 C 458.03973,166.10204 460.48971,159.12708 461.23971,153.08961 C 463.8772,135.53973 462.9397,125.91479 459.72722,111.38988 C 458.03973,103.07743 456.71474,95.727486 454.25225,87.602538 C 453.87725,86.102548 451.81477,84.015059 451.05228,82.702564 C 450.47728,81.752574 449.91478,80.052582 449.72728,78.92759 C 448.41479,72.702628 448.97729,66.665169 444.43982,61.377705 C 442.75233,59.490218 439.53985,59.290216 437.46486,57.977728 C 433.50239,55.902738 429.53992,53.827749 425.57744,51.377769 C 425.00244,50.990272 423.31495,50.427772 422.36496,50.990272 C 426.88993,54.202746 429.91491,57.977728 431.2274,63.64019 C 431.8024,66.277672 432.5524,68.352662 429.91491,69.865151 C 429.16492,70.240149 424.25244,73.452623 421.98996,78.92759 C 421.42747,80.052582 418.21498,87.415036 414.44001,94.402492 C 409.91504,91.952505 405.37756,91.75251 402.17759,91.75251 C 398.77761,91.75251 392.74015,92.140007 389.91517,94.20249 C 383.8652,98.739966 381.22772,104.58992 379.34023,111.18988 C 377.82774,116.28985 376.89025,121.57732 376.51526,126.85229 C 376.12775,134.02724 376.89025,141.95218 377.64025,149.11464 C 378.21524,153.83962 378.77774,158.37708 379.15274,163.08956 C 380.09023,168.17702 379.90273,172.15199 379.71523,173.08949 C 378.01525,178.37696 375.37776,180.26444 370.2778,181.20193 C 369.5278,181.20193 369.1528,181.57693 369.3403,181.96444 C 374.05277,181.96444 378.77774,181.96444 383.49021,181.96444 L 383.49021,181.96444 L 400.8526,181.96444 C 402.36508,181.96444 402.74008,181.20193 404.25257,179.87695 C 406.32756,177.80196 403.49008,174.21448 404.25257,169.50201 C 405.95256,157.80208 411.05253,147.23966 413.50251,135.91473 C 413.87752,134.58974 414.06501,132.88975 414.25251,131.00226 C 415.19001,135.53973 416.515,139.8772 417.83999,144.21467 C 419.15248,148.75215 420.47747,151.20213 422.55246,152.32712 L 422.55246,152.32712 C 422.36496,152.32712 422.17746,152.32712 421.98996,152.52712 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2504"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 431.8024,181.38944 L 431.9774,180.80194 L 432.1399,180.22695 L 432.2899,179.67694 L 432.4149,179.12695 L 432.5399,178.60196 L 432.6399,178.07695 L 432.71489,177.55196 L 432.7649,177.02696 L 432.78989,176.76447 L 432.80239,176.50197 L 432.80239,176.23947 L 432.80239,175.97697 L 432.80239,175.71448 L 432.78989,175.43947 L 432.7649,175.16447 L 432.72739,174.88948 L 432.68989,174.61448 L 432.6399,174.32698 L 432.58989,174.03948 L 432.5274,173.75199 L 432.45239,173.45198 L 432.37739,173.15199 L 432.2774,172.83949 L 432.1774,172.52699 C 431.4274,169.87701 429.16492,167.80202 428.21492,165.16454 C 427.07743,161.57706 428.02743,157.61459 426.13994,154.40211 C 425.76494,153.65211 424.81494,152.90212 423.87745,152.32712 C 421.60246,151.01463 420.85247,150.25214 419.91498,147.98965 C 419.53998,147.23966 419.15248,146.47716 418.96498,145.72717 C 416.89,139.6897 415.39001,133.46475 414.25251,127.41478 C 413.69002,130.63976 413.30252,133.65224 412.75252,136.85222 C 411.80253,140.4397 410.85253,143.83968 409.72754,147.23966 C 407.26506,154.40211 404.81507,161.76456 403.69008,169.31451 C 403.49008,170.827 403.49008,172.15199 403.69008,173.65198 C 403.87757,174.97698 405.00257,177.80196 403.69008,179.31445 C 402.36508,180.82694 401.99009,181.20193 400.6651,181.38944 C 396.32763,181.38944 391.22766,181.38944 386.89019,181.38944 C 387.82768,181.01444 388.77768,180.26444 389.34017,179.31445 C 391.04016,175.72697 386.70269,164.40204 385.7527,160.25207 C 385.0027,156.67709 383.30271,153.26462 382.74021,149.68964 C 382.54022,147.23966 382.16522,139.6897 382.54022,137.80221 C 382.54022,137.23972 382.92771,137.03972 383.30271,137.80221 C 383.67771,141.01469 382.74021,148.17715 384.4402,151.76463 C 384.8152,152.71462 386.51519,152.13962 387.07768,151.38963 C 388.59017,149.50214 389.34017,147.23966 390.10266,144.96466 C 391.22766,141.01469 392.17765,138.73971 392.74015,133.46475 C 393.30265,128.36478 392.17765,126.66478 392.74015,121.57732 C 393.11514,119.50233 392.55265,117.22735 393.67764,113.83987 C 395.00263,109.87739 396.12763,107.22741 398.96511,104.77743 C 401.22759,102.51494 404.81507,101.93994 408.02755,101.57744 C 416.7025,101.57744 415.5775,111.00239 417.45249,115.90235 C 418.02749,117.61485 419.72747,121.76482 420.66497,123.46481 C 421.42747,125.16479 422.73995,128.17727 423.68995,131.00226 C 424.43995,133.08975 424.25244,136.10223 423.68995,137.23972 C 423.12745,138.17721 424.06495,138.73971 424.81494,137.98972 C 425.76494,136.47723 425.76494,135.33973 426.32743,133.65224 C 426.88993,131.95225 427.27743,129.31477 427.83992,127.80228 C 428.77742,125.16479 430.66491,122.70231 431.2274,119.87733 C 431.8024,117.22735 431.4274,114.58986 430.47741,111.95238 C 429.91491,111.00239 427.83992,104.96493 426.71493,103.26494 C 424.06495,100.43995 421.98996,100.06495 417.65249,96.664977 C 416.89,96.102484 415.9525,95.527485 415.0025,94.964992 C 417.265,89.677521 420.28997,84.965056 422.36496,79.677585 C 424.06495,75.340118 426.88993,73.077626 430.10241,70.615146 C 435.57737,73.827621 435.20238,74.027622 435.95237,80.42758 C 435.76488,83.827557 436.13987,87.227541 435.95237,90.440015 C 435.95237,91.75251 435.01488,94.77749 435.01488,96.102484 C 435.20238,98.177466 435.01488,98.927462 435.38988,101.18995 C 435.57737,102.88994 437.27737,104.40243 436.88987,106.10242 C 435.76488,113.65237 432.5524,120.62733 432.36489,128.17727 C 432.1774,135.53973 433.50239,145.53966 439.72735,150.43963 C 440.48984,151.01463 441.98983,150.06463 442.17733,149.11464 C 443.12732,144.78967 441.80234,140.0647 442.36483,135.72723 C 442.75233,132.88975 443.50232,129.68976 444.43982,126.85229 C 445.18981,124.5898 447.0898,119.31483 448.58979,117.61485 C 448.97729,116.85235 449.91478,117.41484 449.53979,117.98984 C 449.35228,117.98984 446.13981,124.9648 444.82732,130.25226 C 443.31483,135.91473 441.98983,144.21467 445.57731,149.31464 C 446.7148,151.20213 449.16479,153.08961 450.86477,155.9271 C 451.81477,157.61459 452.36476,165.16454 451.98977,167.05203 C 451.23977,172.3395 444.82732,180.82694 438.58985,181.38944 C 436.32737,181.38944 434.06488,181.38944 431.8024,181.38944 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2506"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#ffffff;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 420.66497,157.80208 L 420.66497,157.42709 C 420.47747,157.23959 419.91498,156.86459 419.91498,156.86459 C 419.15248,156.1021 419.53998,154.5896 420.66497,154.40211 C 422.55246,153.83962 424.62745,154.40211 425.18994,156.1021 C 425.76494,157.61459 424.81494,159.50208 423.50245,160.63957 C 422.36496,161.76456 420.47747,160.82706 419.72747,161.01457 C 419.35248,161.20206 419.35248,161.38956 419.53998,161.57706 C 420.28997,161.95206 421.60246,161.95206 422.73995,161.95206 C 423.50245,161.95206 424.25244,161.57706 424.81494,161.76456 C 425.18994,161.95206 425.38994,162.71456 425.38994,163.08956 C 425.38994,164.02705 424.81494,164.97704 424.81494,165.72704 C 425.00244,166.30203 425.57744,166.30203 425.95244,166.67703 C 427.65243,169.31451 427.46493,170.827 427.83992,173.27699 C 428.21492,176.30197 431.2274,177.05196 431.0524,177.80196 C 431.0524,178.00196 430.8649,178.17695 430.47741,178.00196 C 429.53992,177.05196 427.83992,177.05196 426.51494,177.23946 C 425.76494,177.23946 425.38994,178.37696 424.43995,178.55195 C 424.06495,178.75195 423.31495,178.55195 423.12745,178.00196 C 422.55246,177.23946 423.50245,175.92697 422.92746,175.16447 C 422.55246,174.60198 421.05247,174.40198 421.05247,173.27699 C 421.05247,170.25201 418.96498,167.42702 418.21498,164.60205 C 418.02749,163.85205 418.02749,163.46455 418.21498,162.71456 C 418.77748,161.38956 419.15248,159.68957 418.21498,158.37708 C 417.83999,157.80208 419.91498,158.55208 420.66497,157.80208 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2508"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 424.62745,51.940262 L 424.92744,52.115265 L 425.23994,52.30276 L 425.55244,52.52776 L 425.86493,52.765259 L 426.17744,53.027757 L 426.50244,53.302754 L 426.81493,53.602756 L 427.13993,53.91525 L 427.45243,54.240251 L 427.77743,54.590243 L 428.10242,54.940242 L 428.41492,55.302741 L 429.05242,56.065235 L 429.67741,56.840236 L 430.28991,57.652727 L 430.88991,58.465226 L 431.4649,59.265218 L 432.0024,60.06521 L 432.2649,60.452706 L 432.5274,60.827704 L 432.7774,61.202702 L 433.01489,61.5652 L 433.23989,61.915199 L 433.46489,62.252699 L 433.67739,62.577693 L 433.87739,62.890194 C 434.81488,64.202682 436.13987,63.06519 435.57737,61.940198 C 432.36489,57.415228 428.58992,53.640254 424.62745,51.940262 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2510"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 408.59005,101.57744 L 408.82755,101.62745 L 409.05255,101.70244 L 409.30254,101.77744 L 409.54004,101.86495 L 409.79004,101.96495 L 410.02754,102.07744 L 410.27754,102.18994 L 410.52754,102.31494 L 410.76504,102.45244 L 411.01504,102.58994 L 411.26503,102.73994 L 411.50253,102.88994 L 411.74002,103.05244 L 411.97752,103.22744 L 412.21502,103.38994 L 412.44002,103.57743 L 412.66502,103.75243 L 412.87752,103.93993 L 413.09002,104.13993 L 413.29002,104.33993 L 413.49001,104.53993 L 413.67752,104.73993 L 413.86501,104.93992 L 414.02752,105.15242 L 414.19001,105.36492 L 414.34001,105.57742 L 414.49001,105.78992 L 414.61501,106.00242 L 414.72751,106.21492 L 414.84001,106.42741 L 414.92751,106.63991 L 415.0025,106.85242 C 415.765,109.1149 415.9525,110.43989 415.0025,117.03985 C 415.0025,117.41484 415.765,117.80234 415.9525,117.03985 C 416.14,115.33986 415.9525,117.03985 416.14,116.28985 C 416.3275,115.15236 417.08999,115.33986 417.45249,115.90235 C 416.7025,113.65237 417.265,111.56488 420.10247,111.75238 C 421.60246,111.95238 421.42747,113.07737 423.87745,113.65237 C 424.62745,113.83987 426.32743,113.26487 426.71493,111.95238 C 427.65243,109.1149 426.71493,106.66491 424.43995,104.77743 C 423.12745,103.63993 421.42747,103.07743 419.72747,104.21493 C 419.35248,104.58992 418.77748,105.72742 418.77748,106.27742 C 419.15248,108.7399 417.83999,107.98991 416.89,106.27742 C 415.5775,104.21493 411.22753,101.18995 408.59005,101.57744 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2512"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 424.25244,137.42722 L 424.35244,137.08972 L 424.43995,136.73972 L 424.50245,136.37722 L 424.56495,136.00223 L 424.61494,135.62723 L 424.65245,135.25223 L 424.67745,134.86474 L 424.68994,134.46474 L 424.68994,134.06474 L 424.68994,133.65224 L 424.67745,133.25224 L 424.65245,132.82724 L 424.58994,131.98975 L 424.48994,131.15226 L 424.37744,130.30226 L 424.23994,129.45226 L 424.08995,128.60228 L 423.93995,127.76478 L 423.77745,126.93978 L 423.61495,126.12729 L 423.46495,125.3523 L 423.31495,124.5898 C 422.92746,123.26481 424.62745,122.88981 425.00244,124.2148 C 426.13994,129.50227 425.95244,133.46475 424.25244,137.42722 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2514"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#ff6600;fill-opacity:1;fill-rule:nonzero;stroke:#ff6600;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 430.47741,69.490154 L 430.43991,69.515152 L 430.40241,69.54015 L 430.33991,69.565149 L 430.28991,69.602654 L 430.22741,69.640151 L 430.16491,69.690148 L 430.08991,69.740152 L 430.01491,69.790149 L 429.92741,69.840146 L 429.83991,69.902649 L 429.75242,69.965152 L 429.66491,70.027648 L 429.57741,70.090151 L 429.47741,70.152647 L 429.37741,70.22765 L 429.27742,70.290146 L 429.06492,70.440143 L 428.85242,70.577642 L 428.65242,70.727646 L 428.43992,70.865145 L 428.22742,71.002643 L 428.12742,71.077638 L 428.02743,71.140142 L 427.92742,71.202638 L 427.82742,71.265141 L 427.73992,71.327637 L 427.65243,71.377641 C 429.72741,71.752638 432.5524,73.265128 433.87739,75.715115 C 434.81488,77.790098 435.57737,80.815077 435.95237,82.890066 C 435.95237,81.565072 435.76488,75.715115 436.32737,74.96512 C 437.27737,73.827621 439.16485,74.777618 440.48984,75.340118 C 441.42734,75.715115 441.98983,76.852607 442.93983,77.4151 C 443.87733,77.790098 444.82732,77.9776 445.76481,77.602602 C 446.7148,77.4151 447.6523,76.665105 448.0273,75.715115 C 448.58979,74.027622 446.88981,67.21517 443.12732,68.740158 C 441.61483,69.302651 441.42734,71.565136 440.10234,72.702628 C 439.35235,73.265128 438.58985,73.452623 437.65236,73.265128 C 436.70237,73.265128 435.57737,72.702628 434.63988,71.940134 C 433.31489,71.002643 431.9899,69.865151 430.47741,69.490154 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2516"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 422.36496,155.3521 L 422.40246,155.3521 L 422.42746,155.3521 L 422.47746,155.3646 L 422.52746,155.3646 L 422.58996,155.3896 L 422.63996,155.4021 L 422.70246,155.4271 L 422.75246,155.4396 L 422.81496,155.4771 L 422.86495,155.5021 L 422.91496,155.5271 L 422.97745,155.5646 L 423.02746,155.6021 L 423.07745,155.6396 L 423.12745,155.6771 L 423.16496,155.7146 L 423.21495,155.7521 L 423.25245,155.7896 L 423.30245,155.8271 L 423.33995,155.8646 L 423.37745,155.9146 L 423.40246,155.9521 L 423.42745,155.9896 L 423.45245,156.0271 L 423.47745,156.0646 L 423.50245,156.1021 L 423.50245,156.1146 L 423.51496,156.1396 L 423.51496,156.1521 L 423.52745,156.1646 L 423.52745,156.1771 L 423.52745,156.20209 L 423.52745,156.2146 L 423.52745,156.2271 L 423.52745,156.2396 L 423.52745,156.2521 L 423.51496,156.2646 L 423.51496,156.2771 L 423.50245,156.2771 L 423.50245,156.2896 C 423.12745,156.67709 422.92746,156.1021 422.17746,156.1021 C 421.60246,156.1021 421.05247,156.2896 421.05247,155.9271 C 421.05247,155.5396 421.60246,155.3521 422.36496,155.3521 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 289.2854,139.05538 C 286.94791,139.05538 284.76664,139.2179 282.75415,139.55538 C 280.74291,139.90538 279.17789,140.4179 278.0354,141.05538 C 276.42916,141.93037 275.19665,142.98038 274.3479,144.18038 C 273.4979,145.38038 272.85914,147.03039 272.4104,149.11788 L 284.37915,150.33663 C 284.86665,148.92413 285.51665,147.97411 286.31665,147.46163 C 287.34164,146.81163 288.89166,146.49288 290.94165,146.49288 C 292.55414,146.49288 293.67915,146.79913 294.31665,147.39913 C 294.94165,148.01163 295.25415,149.07414 295.25415,150.58663 C 293.69166,151.21163 292.21664,151.69913 290.81665,152.08663 C 289.42916,152.46163 286.39287,153.1179 281.69165,154.05538 C 277.77043,154.83037 275.05788,156.03038 273.5979,157.61788 C 272.1429,159.21787 271.4104,161.26789 271.4104,163.74288 C 271.4104,166.39286 272.42042,168.59913 274.44165,170.39913 C 276.46289,172.19912 279.44293,173.11787 283.3479,173.11788 C 286.27289,173.11788 288.85416,172.67413 291.06665,171.77413 C 292.69164,171.09913 294.30416,169.94288 295.94165,168.36788 C 296.09165,169.30537 296.22914,170.02415 296.37915,170.46163 C 296.51665,170.91163 296.84165,171.53037 297.31665,172.36788 L 309.0354,172.36788 C 308.3729,171.03039 307.95415,169.91786 307.75415,169.05538 C 307.55416,168.18039 307.44165,166.96787 307.44165,165.43038 L 307.44165,151.05538 C 307.44165,149.51789 307.1479,147.89912 306.5354,146.21163 C 305.9104,144.52414 305.06664,143.23038 304.00415,142.30538 C 302.47915,140.96789 300.59163,140.10537 298.31665,139.68038 C 296.04167,139.25539 293.03538,139.05537 289.2854,139.05538 z M 295.25415,156.89913 L 295.25415,158.89913 C 295.25415,160.44912 295.00415,161.70538 294.50415,162.68038 C 293.99165,163.65538 293.14164,164.48662 291.94165,165.14913 C 290.72916,165.82412 289.43539,166.14913 288.0354,166.14913 C 286.69791,166.14913 285.69165,165.83663 285.00415,165.21163 C 284.31666,164.59913 283.94165,163.79289 283.94165,162.80538 C 283.94165,161.95539 284.30416,161.19911 285.00415,160.52413 C 285.67915,159.87414 287.29792,159.19911 289.8479,158.52413 L 290.56665,158.33663 L 291.25415,158.14913 L 291.94165,157.96163 L 292.5979,157.77413 L 293.2854,157.55538 L 293.94165,157.33663 L 294.5979,157.11788 L 295.25415,156.89913 z"
+ id="path2518"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2522"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="125.72,357.32 135.75,357.32 135.75,393.36 125.72,393.36 125.72,357.32 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2524"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 350.95292,127.32728 L 350.95292,139.7897 L 357.82787,139.7897 L 357.82787,148.96465 L 350.95292,148.96465 L 350.95292,160.47707 C 350.95292,161.86456 351.07792,162.77705 351.35291,163.23955 C 351.75291,163.92705 352.4779,164.27704 353.5029,164.27704 C 354.44039,164.27704 355.72788,164.00205 357.40288,163.47705 L 358.31537,172.102 C 355.22789,172.77699 352.32791,173.11449 349.64043,173.11449 C 346.52795,173.11449 344.22796,172.71449 342.75297,171.92699 C 341.27798,171.127 340.19049,169.91451 339.47799,168.30202 C 338.7655,166.67703 338.4155,164.03955 338.4155,160.41457 L 338.4155,148.96465 L 333.82803,148.96465 L 333.82803,139.7897 L 338.4155,139.7897 L 338.4155,133.77724 L 350.95292,127.32728 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2526"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="125.73,315.95 135.76,315.95 135.76,351.99 125.73,351.99 125.73,315.95 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2528"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="142.55,351.99 152.58,351.99 152.58,345.18 142.55,345.18 142.55,351.99 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2530"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="142.55,315.95 152.58,315.95 152.58,342.03 142.55,342.03 142.55,315.95 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2532"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 356.84038,191.48937 L 368.50281,191.48937 L 368.50281,196.81433 C 370.25279,194.63935 372.00279,193.08936 373.79027,192.15187 C 375.56526,191.21437 377.72774,190.75188 380.29023,190.75188 C 383.7402,190.75188 386.44019,191.77687 388.39018,193.83936 C 390.34016,195.88934 391.31516,199.06432 391.31516,203.3643 L 391.31516,224.08917 L 378.79024,224.08917 L 378.79024,206.18927 C 378.79024,204.13929 378.41524,202.7018 377.65275,201.85181 C 376.89025,201.00181 375.82776,200.57681 374.46526,200.57681 C 372.95278,200.57681 371.71528,201.15181 370.77779,202.2893 C 369.84029,203.43929 369.3778,205.48928 369.3778,208.45176 L 369.3778,224.08917 L 356.84038,224.08917 L 356.84038,191.48937 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2534"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 433.18989,224.08917 L 421.50247,224.08917 L 421.50247,218.81419 C 419.75247,220.97668 418.00248,222.52667 416.24,223.45166 C 414.46501,224.36416 412.30252,224.82665 409.72754,224.82665 C 406.29006,224.82665 403.59008,223.78916 401.6401,221.73918 C 399.6901,219.67669 398.71511,216.51421 398.71511,212.23924 L 398.71511,191.48937 L 411.24003,191.48937 L 411.24003,209.42675 C 411.24003,211.46425 411.62752,212.92673 412.37752,213.77673 C 413.14002,214.63922 414.19001,215.07672 415.565,215.07672 C 417.06499,215.07672 418.27749,214.50172 419.23998,213.35173 C 420.18997,212.21423 420.66497,210.15175 420.66497,207.17677 L 420.66497,191.48937 L 433.18989,191.48937 L 433.18989,224.08917 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2536"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="223.89,342.03 235.75,342.03 239.84,334.76 244.66,342.03 255.66,342.03 246.78,329.61 256.32,315.95 244.66,315.95 239.84,324.36 234.17,315.95 223.36,315.95 232.84,329.61 223.89,342.03 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 286.25415,230.52413 L 283.5979,234.96163 L 284.69165,234.96163 L 285.25415,233.99288 L 288.19165,233.99288 L 288.75415,234.96163 L 289.94165,234.96163 L 287.2854,230.52413 L 286.25415,230.52413 z M 286.69165,231.33663 L 287.75415,233.18038 L 285.69165,233.18038 L 286.69165,231.33663 z"
+ id="polygon2538"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2542"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="113.83,307.26 113.83,310.81 114.72,310.81 114.72,307.93 117.51,307.93 117.51,307.26 113.83,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2544"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="127.09,310.17 127.09,307.26 126.22,307.26 126.22,310.17 124.52,310.17 124.52,310.81 128.81,310.81 128.81,310.17 127.09,310.17 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2546"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="144.37,307.26 144.37,310.81 145.25,310.81 145.25,307.93 148.05,307.93 148.05,307.26 144.37,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2548"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="155.99,307.26 156.85,307.26 156.85,310.81 155.99,310.81 155.99,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2550"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="165.41,307.26 165.41,310.81 166.02,310.81 169.04,308.45 169.04,310.81 169.82,310.81 169.82,307.26 169.22,307.26 166.22,309.65 166.22,307.26 165.41,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ id="path2552"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 382.24021,230.51412 L 382.24021,234.1141 L 385.3152,234.1141 L 385.3152,230.51412 L 386.41519,230.51412 L 386.41519,233.9016 C 386.41519,234.31409 386.34019,234.58909 386.16519,234.7391 C 386.0152,234.87659 385.70269,234.95159 385.25269,234.95159 L 382.30272,234.95159 C 381.85272,234.95159 381.54022,234.87659 381.37772,234.7391 C 381.22772,234.58909 381.15273,234.31409 381.15273,233.9016 L 381.15273,230.51412 L 382.24021,230.51412 z"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2554"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="190.35,307.26 192.11,309.08 190.32,310.81 191.48,310.81 192.68,309.66 193.8,310.81 194.8,310.81 193.18,309.18 195.18,307.26 194,307.26 192.63,308.58 191.38,307.26 190.35,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2556"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="212.1,310.17 212.1,307.26 211.23,307.26 211.23,310.17 209.53,310.17 209.53,310.81 213.82,310.81 213.82,310.17 212.1,310.17 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2558"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="222.4,307.26 222.4,310.81 226.21,310.81 226.21,310.17 223.28,310.17 223.28,309.4 224.99,309.4 224.99,308.78 223.28,308.78 223.28,307.93 226.26,307.93 226.26,307.26 222.4,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <path
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 452.56665,230.52413 L 449.9104,234.96163 L 451.00415,234.96163 L 451.56665,233.99288 L 454.50415,233.99288 L 455.0354,234.96163 L 456.25415,234.96163 L 453.5979,230.52413 L 452.56665,230.52413 z M 453.00415,231.33663 L 454.06665,233.18038 L 452.00415,233.18038 L 453.00415,231.33663 z"
+ id="polygon2560"
+ inkscape:export-filename="/home/valery/Documents/Draw/polygon2564.png"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ <polygon
+ id="polygon2564"
+ style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;letter-spacing:normal;word-spacing:normal;text-anchor:start;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ points="246.9,307.26 246.9,310.81 247.59,310.81 249.33,308.7 251.06,310.81 251.77,310.81 251.77,307.26 250.95,307.26 250.95,309.7 249.37,307.69 249.2,307.69 247.59,309.64 247.59,307.26 246.9,307.26 "
+ transform="matrix(1.249992,0,0,-1.249992,158.19165,619.02413)"
+ inkscape:export-xdpi="260.64001"
+ inkscape:export-ydpi="260.64001" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/kde/window-decorator/options.cpp b/kde/window-decorator/options.cpp
index 46b5059..8606597 100644
--- a/kde/window-decorator/options.cpp
+++ b/kde/window-decorator/options.cpp
@@ -32,6 +32,11 @@ KWD::Options::Options (KConfig *config): KDecorationOptions (), mConfig (config)
updateSettings ();
}
+KWD::Options::~Options()
+{+ delete d;
+}
+
unsigned long
KWD::Options::updateSettings (void)
{diff --git a/kde/window-decorator/options.h b/kde/window-decorator/options.h
index 785e855..9014408 100644
--- a/kde/window-decorator/options.h
+++ b/kde/window-decorator/options.h
@@ -77,7 +77,7 @@ class Options : public KDecorationOptions
};
Options (KConfig *config);
-
+ ~Options();
virtual unsigned long updateSettings (void);
WindowOperation operationTitlebarDblClick (void)
diff --git a/metadata/cube.xml.in b/metadata/cube.xml.in
index 7e9a42b..b01bb74 100644
--- a/metadata/cube.xml.in
+++ b/metadata/cube.xml.in
@@ -110,7 +110,7 @@
<type>string</type>
<hints>file;image;</hints>
<default>
- <value>freedesktop</value>
+ <value>altlinux</value>
</default>
</option>
<option name="adjust_image" type="bool">
diff --git a/plugins/resize.c b/plugins/resize.c
index 8943306..a192c0d 100644
--- a/plugins/resize.c
+++ b/plugins/resize.c
@@ -365,9 +365,9 @@ resizeInitiate (CompDisplay *d,
mask |= ResizeDownMask;
/* if the pointer was in the middle of the window,
- do nothing */
+ just prevent input to the window */
if (!mask)
- return FALSE;
+ return TRUE;
}
if (otherScreenGrabExist (w->screen, "resize", 0))
diff --git a/src/Makefile.am b/src/Makefile.am
index 683d695..70d7963 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
@COMPIZ_CFLAGS@ \
@GL_CFLAGS@ \
+ @GLIB_CFLAGS@ \
-I$(top_srcdir)/include \
-I$(top_builddir)/include \
-DPLUGINDIR=\"$(plugindir)\" \
@@ -9,7 +10,7 @@ INCLUDES = \
bin_PROGRAMS = compiz
-compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ -lm
+compiz_LDADD = @COMPIZ_LIBS@ @GL_LIBS@ @GLIB_LIBS@ -lm
compiz_LDFLAGS = -export-dynamic
compiz_SOURCES = \
main.c \
diff --git a/src/main.c b/src/main.c
index b6869b4..ef9ac16 100644
--- a/src/main.c
+++ b/src/main.c
@@ -34,6 +34,10 @@
#include <string.h>
#include <sys/wait.h>
+#ifdef USE_GLIB
+#include <glib.h>
+#endif
+
#include <compiz-core.h>
char *programName;
@@ -87,7 +91,10 @@ usage (void)
"[--sm-disable] "
"[--sm-client-id ID] "
"[--only-current-screen]\n "
-
+#ifdef USE_GLIB
+ "[--gwd] "
+ "[--kwd] "
+#endif
#ifdef USE_COW
" [--use-root-window] "
#endif
@@ -344,6 +351,17 @@ main (int argc, char **argv)
onlyCurrentScreen = TRUE;
}
+#ifdef USE_GLIB
+ else if (!strcmp (argv[i], "--gwd"))
+ {+ g_spawn_command_line_async ("gtk-window-decorator", NULL);+ }
+ else if (!strcmp (argv[i], "--kwd"))
+ {+ g_spawn_command_line_async ("kde-window-decorator", NULL);+ }
+#endif
+
#ifdef USE_COW
else if (!strcmp (argv[i], "--use-root-window"))
{diff --git a/src/screen.c b/src/screen.c
index c2bb563..eb02de7 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -1879,6 +1879,20 @@ addScreen (CompDisplay *display,
return FALSE;
}
+ /* NVIDIA */
+ indirectRendering = TRUE;
+ int n = 0;
+ char **extlist = XListExtensions (dpy, &n);
+ if (extlist) {+ for (i = 0; i < n; i++) {+ if (strcmp (extlist[i], "NV-GLX") == 0) {+ indirectRendering = FALSE;
+ continue;
+ }
+ }
+ XFreeExtensionList (extlist);
+ }
+
s->ctx = glXCreateContext (dpy, visinfo, NULL, !indirectRendering);
if (!s->ctx)
{@@ -1887,8 +1901,12 @@ addScreen (CompDisplay *display,
return FALSE;
}
+
+ if (!indirectRendering)
+ glxExtensions = glXQueryExtensionsString (dpy, screenNum);
+ else
+ glxExtensions = glXQueryServerString(s->display->display, screenNum, GLX_EXTENSIONS);
- glxExtensions = glXQueryExtensionsString (dpy, screenNum);
if (!strstr (glxExtensions, "GLX_EXT_texture_from_pixmap"))
{ compLogMessage ("core", CompLogLevelFatal,