compiz: Changes to 'upstream-unstable'
AUTHORS | 114 CMakeLists.txt | 22 ChangeLog|19315 +- NEWS | 501 VERSION |1 cmake/CompizCommon.cmake | 340 cmake/CompizPlugin.cmake | 18 gtk/window-decorator/actionmenu.c|3 gtk/window-decorator/cairo.c |7 gtk/window-decorator/decorator.c | 297 gtk/window-decorator/decorprops.c| 34 gtk/window-decorator/frames.c|2 gtk/window-decorator/gtk-window-decorator.c | 26 gtk/window-decorator/gtk-window-decorator.h | 25 gtk/window-decorator/metacity.c | 36 gtk/window-decorator/wnck.c | 19 include/compiz-common.h.in |6 include/compiz.h |7 include/core/CMakeLists.txt |3 include/core/core.h |3 include/core/option.h|1 include/core/plugin.h| 24 include/core/pluginclasshandler.h| 122 include/core/privateunion.h | 36 include/core/rect.h |2 include/core/screen.h|1 include/core/timeouthandler.h| 57 include/core/timer.h | 34 include/core/valueholder.h | 53 include/core/window.h|9 include/decoration.h | 69 kde/window-decorator-kde4/decorator.cpp | 23 kde/window-decorator-kde4/decorator.h| 21 kde/window-decorator-kde4/switcher.cpp | 15 kde/window-decorator-kde4/utils.cpp |2 kde/window-decorator-kde4/window.cpp | 122 kde/window-decorator-kde4/window.h |2 libdecoration/decoration.c | 188 plugins/compiztoolbox/include/compiztoolbox/compiztoolbox.h |6 plugins/compiztoolbox/src/compiztoolbox.cpp | 17 plugins/composite/CMakeLists.txt |2 plugins/composite/include/composite/composite.h |8 plugins/composite/src/privates.h |1 plugins/composite/src/window.cpp | 20 plugins/copytex/src/copytex.cpp | 62 plugins/copytex/src/copytex.h| 29 plugins/dbus/src/dbus.cpp|1 plugins/decor/src/decor.cpp | 554 plugins/decor/src/decor.h| 43 plugins/fade/fade.xml.in |2 plugins/fade/src/fade.cpp| 67 plugins/fade/src/fade.h |1 plugins/move/src/move.cpp| 32 plugins/opengl/src/paint.cpp |8 plugins/opengl/src/window.cpp| 13 plugins/place/src/place.cpp | 147 plugins/place/src/place.h|6 plugins/resize/resize.xml.in | 263 plugins/resize/src/resize.cpp| 167 plugins/scale/src/scale.cpp |3 plugins/switcher/src/switcher.cpp| 10 plugins/switcher/switcher.xml.in |4 plugins/water/src/water.cpp |6 plugins/wobbly/src/wobbly.cpp| 50 src/CMakeLists.txt |5 src/event.cpp| 233 src/logmessage.cpp | 85 src/privateeventsource.h
compiz: Changes to 'upstream-unstable'
CMakeLists.txt |6 ++---
NEWS| 21 +
dev/null|binary
gtk/window-decorator/actionmenu.c |2 -
gtk/window-decorator/events.c |5
gtk/window-decorator/gtk-window-decorator.c |7 +
gtk/window-decorator/gtk-window-decorator.h |4 ++-
gtk/window-decorator/wnck.c | 33 ++--
images/CMakeLists.txt |3 --
plugins/cube/images/freedesktop.png |binary
src/CMakeLists.txt |2 -
src/screen.cpp | 13 +++
src/window.cpp |2 -
13 files changed, 83 insertions(+), 15 deletions(-)
New commits:
commit 011a611d42c6ab0a08d5f543d4456c3d74045b7d
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date: Mon Mar 7 18:08:32 2011 +0800
Update CMake Version
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 766e7cb..f6d63d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,8 +19,8 @@ endif (NOT CMAKE_BUILD_TYPE)
# An even micro number indicates a released version.
set (COMPIZ_VERSION_MAJOR 0)
set (COMPIZ_VERSION_MINOR 9)
-set (COMPIZ_VERSION_MICRO 2)
-set (COMPIZ_VERSION_MACRO 1)
+set (COMPIZ_VERSION_MICRO 4)
+set (COMPIZ_VERSION_MACRO 0)
set (VERSION
${COMPIZ_VERSION_MAJOR}.${COMPIZ_VERSION_MINOR}.${COMPIZ_VERSION_MICRO}.${COMPIZ_VERSION_MACRO})
set (DECOR_INTERFACE_VERSION 20110130)
commit e0825165ad99b2be07ffbe259ea1a7893855e135
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date: Mon Mar 7 18:08:19 2011 +0800
Update news for 0.9.4 release
diff --git a/NEWS b/NEWS
index 7baf339..9c56700 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,24 @@
+Release 0.9.4 (2010-02-24 Sam Spilsbury sam.spilsb...@canonical.com)
+
+Development Release.
+
+Main loop implementation now replaced by the GLib main loop, use custom
+event sources and event dispatch synchronisation. Allows better integration
+with plugins that require tight timing with GLib timers
+
+Moved image and data generation into buildsystem extensions, and installation
+of such data into namespaced areas on the filesystem so plugins can't
+overwrite other plugin's data
+
+Intelligently clip window shadows in decor
+
+Fixed a number of 2D decoration issues
+
+Fixed a number of reparenting, stacking and focus issues
+
+Support different frame types in gtk-window-decorator
+
+
Release 0.9.2.1 (2010-11-06 Sam Spilsbury sam.spilsb...@canonical.com)
Bugfix release.
commit 16295397033bee4ace327b6ba48830e844e77b4d
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date: Mon Feb 28 20:57:42 2011 +0800
Fix gtk-w-d crashing when removing decoration.
Also try to detect when windows are modal and give them modal type
decorations and move freedesktop.png to cube where it will actually
be used
diff --git a/gtk/window-decorator/actionmenu.c
b/gtk/window-decorator/actionmenu.c
index f1549aa..e82098e 100644
--- a/gtk/window-decorator/actionmenu.c
+++ b/gtk/window-decorator/actionmenu.c
@@ -36,7 +36,7 @@ position_action_menu (GtkMenu *menu,
{
WnckWindow *win = (WnckWindow *) user_data;
WnckWindowType win_type = wnck_window_get_window_type (win);
-decor_frame_t *frame = gwd_get_decor_frame (get_frame_type (win_type));
+decor_frame_t *frame = gwd_get_decor_frame (win);
decor_t*d = g_object_get_data (G_OBJECT (win), decor);
gint bx, by, width, height;
diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index f3213e5..d5dd8e8 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -1006,11 +1006,16 @@ event_filter_func (GdkXEvent *gdkxevent,
d-context = NULL;
d-width = d-height = 0;
+ d-frame = gwd_get_decor_frame (get_frame_type (win));
+
update_window_decoration_size (win);
update_event_windows (win);
}
else
{
+ gwd_decor_frame_unref (d-frame);
+ d-frame = NULL;
+
gdk_error_trap_push ();
XDeleteProperty (xdisplay, xid, win_decor_atom);
gdk_display_sync (gdk_display_get_default ());
diff --git a/gtk/window-decorator/gtk-window-decorator.c
b/gtk/window-decorator/gtk-window-decorator.c
index 03c558c..dc22492 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -49,6 +49,10 @@ Atom toolkit_action_atom;
Atom toolkit_action_window_menu_atom;
Atom toolkit_action_force_quit_dialog_atom;
+Atom net_wm_state_atom;
+Atom
compiz: Changes to 'upstream-unstable'
Rebased ref, commits from common ancestor:
commit 9849ca3ce14e8398a01e18347c0a69f25e9c15c0
Author: Sam Spilsbury smspil...@gmail.com
Date: Thu Feb 24 02:11:46 2011 +0800
Nuke warning
diff --git a/gtk/window-decorator/wnck.c b/gtk/window-decorator/wnck.c
index d6ec9a2..2118511 100644
--- a/gtk/window-decorator/wnck.c
+++ b/gtk/window-decorator/wnck.c
@@ -646,7 +646,6 @@ void
window_closed (WnckScreen *screen,
WnckWindow *win)
{
-Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
decor_t *d = g_object_get_data (G_OBJECT (win), decor);
if (d)
commit 792260c0d31a7bad6d2754bb4c3cd34001039c69
Author: Sam Spilsbury smspil...@gmail.com
Date: Thu Feb 24 02:10:33 2011 +0800
Preprocessor abuse to handle the Gtk+ 2.24 transition
diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index f6ed81b..f3213e5 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -894,8 +894,7 @@ event_filter_func (GdkXEvent *gdkxevent,
{
if (!wnck_window_get (xevent-xcreatewindow.window))
{
- GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display
(gdkdisplay,
-
xevent-xcreatewindow.window);
+ GdkWindow *toplevel = create_foreign_window
(xevent-xcreatewindow.window);
if (toplevel)
{
diff --git a/gtk/window-decorator/gdk.c b/gtk/window-decorator/gdk.c
index 9e59cbd..7b43ca4 100644
--- a/gtk/window-decorator/gdk.c
+++ b/gtk/window-decorator/gdk.c
@@ -62,8 +62,7 @@ create_gdk_window (Window xframe)
{
GdkDisplay *display = gdk_display_get_default ();
GdkScreen *screen = gdk_display_get_default_screen (display);
-GdkWindow *window = gdk_x11_window_foreign_new_for_display (display,
- xframe);
+GdkWindow *window = create_foreign_window (xframe);
GdkColormap *cmap= gdk_screen_get_rgb_colormap (screen);
gdk_drawable_set_colormap (GDK_DRAWABLE (window), cmap);
diff --git a/gtk/window-decorator/gtk-window-decorator.c
b/gtk/window-decorator/gtk-window-decorator.c
index 957ea7d..03c558c 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -370,8 +370,7 @@ main (int argc, char *argv[])
if (!minimal)
{
- GdkWindow *root = gdk_x11_window_foreign_new_for_display (gdkdisplay,
-
gdk_x11_get_default_root_xwindow ());
+ GdkWindow *root = create_foreign_window
(gdk_x11_get_default_root_xwindow ());
gdk_window_add_filter (NULL,
event_filter_func,
@@ -382,8 +381,7 @@ main (int argc, char *argv[])
for (i = 0; i nchildren; i++)
{
- GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display
(gdkdisplay,
-
children[i]);
+ GdkWindow *toplevel = create_foreign_window (children[i]);
/* Need property notify on all windows */
diff --git a/gtk/window-decorator/gtk-window-decorator.h
b/gtk/window-decorator/gtk-window-decorator.h
index ab90085..6b43a94 100644
--- a/gtk/window-decorator/gtk-window-decorator.h
+++ b/gtk/window-decorator/gtk-window-decorator.h
@@ -37,10 +37,26 @@
#include X11/extensions/Xrender.h
#include X11/Xregion.h
+#ifdef HAVE_GTK_2_24
+
#ifndef GDK_DISABLE_DEPRECATED
#define GDK_DISABLE_DEPRECATED
#endif
+#define create_foreign_window(xid)
\
+gdk_x11_window_foreign_new_for_display (gdk_display_get_default (),
\
+ xid)
+#else
+
+#define create_foreign_window(xid)
\
+gdk_window_foreign_new (xid)
+
+#ifdef GDK_DISABLE_DEPRECATED
+#undef GDK_DISABLE_DEPRECATED
+#endif
+
+#endif
+
#ifndef GTK_DISABLE_DEPRECATED
#define GTK_DISABLE_DEPRECATED
#endif
commit 54d17f08447938d53d9ee6348cac1bf9ec220db6
Author: Travis Watkins amara...@ubuntu.com
Date: Tue Feb 22 11:02:23 2011 -0600
stop using deprecated gdk functions
diff --git a/gtk/window-decorator/events.c b/gtk/window-decorator/events.c
index 73e44ef..f6ed81b 100644
--- a/gtk/window-decorator/events.c
+++ b/gtk/window-decorator/events.c
@@ -894,8 +894,8 @@ event_filter_func (GdkXEvent *gdkxevent,
{
if (!wnck_window_get (xevent-xcreatewindow.window))
{
- GdkWindow *toplevel = gdk_window_foreign_new_for_display
(gdkdisplay,
-
xevent-xcreatewindow.window);
+ GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display
(gdkdisplay,
+
compiz: Changes to 'upstream-unstable'
cmake/FindCompiz.cmake | 18 +++-
include/core/core.h |2 -
include/core/screen.h |1
plugins/cube/src/cube.cpp |3 +-
plugins/decor/src/decor.cpp |1
plugins/opengl/include/opengl/opengl.h |2 -
plugins/opengl/include/opengl/texture.h |3 ++
plugins/opengl/src/screen.cpp |3 +-
plugins/opengl/src/texture.cpp |3 +-
plugins/resize/src/resize.cpp | 47 +---
src/event.cpp | 17 ---
src/screen.cpp |8 -
12 files changed, 68 insertions(+), 40 deletions(-)
New commits:
commit f059fae9963dcb69f2a85b5b26cb615565b4c3e1
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date: Thu Feb 24 15:54:16 2011 +0800
Fix broken build
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index 326d2f4..6e975f0 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -75,7 +75,7 @@ isAncestorTo (CompWindow *window,
* occlusion detection
*/
void
-DecorWindow::computeShadowRegion (bool transformedWindows)
+DecorWindow::computeShadowRegion ()
{
shadowRegion = CompRegion (window-outputRect ());
commit 3f3551f41310da96650024edde76e4d952b8a6ad
Author: Sam Spilsbury sam.spilsb...@canonical.com
Date: Thu Feb 24 15:52:09 2011 +0800
Specify plugin name when loading images to find the correct
image loading dir for plugins which don't specify absolute
paths to their images
diff --git a/include/core/core.h b/include/core/core.h
index b0b86b3..7543f58 100644
--- a/include/core/core.h
+++ b/include/core/core.h
@@ -27,7 +27,7 @@
#define _COMPIZ_CORE_H
-#define CORE_ABIVERSION 20110131
+#define CORE_ABIVERSION 20110224
#include stdio.h
#include assert.h
diff --git a/include/core/screen.h b/include/core/screen.h
index f9652f1..6f4ef01 100644
--- a/include/core/screen.h
+++ b/include/core/screen.h
@@ -211,6 +211,7 @@ class CompScreen :
bool override_redirect = false);
bool readImageFromFile (CompString name,
+ CompString pname,
CompSize size,
void *data);
diff --git a/plugins/cube/src/cube.cpp b/plugins/cube/src/cube.cpp
index 9436fdf..0751388 100644
--- a/plugins/cube/src/cube.cpp
+++ b/plugins/cube/src/cube.cpp
@@ -388,9 +388,10 @@ PrivateCubeScreen::updateSkydomeTexture ()
return;
CompString imgName = optionGetSkydomeImage ();
+CompString pname = cube;
if (optionGetSkydomeImage ().empty () ||
- (mSky = GLTexture::readImageToTexture (imgName, mSkySize)).empty ())
+ (mSky = GLTexture::readImageToTexture (imgName, pname, mSkySize)).empty
())
{
GLfloat aaafTextureData[128][128][3];
GLfloat fRStart = (GLfloat) optionGetSkydomeGradientStartColorRed () /
0x;
diff --git a/plugins/decor/src/decor.cpp b/plugins/decor/src/decor.cpp
index d2bfadb..326d2f4 100644
--- a/plugins/decor/src/decor.cpp
+++ b/plugins/decor/src/decor.cpp
@@ -61,7 +61,6 @@ isAncestorTo (CompWindow *window,
return false;
}
-
/* Make shadows look nice, don't paint shadows on top of
* things they don't make sense on top of, eg, menus
* need shadows but they don't need to be painted when
@@ -76,7 +75,7 @@ isAncestorTo (CompWindow *window,
* occlusion detection
*/
void
-DecorWindow::computeShadowRegion ()
+DecorWindow::computeShadowRegion (bool transformedWindows)
{
shadowRegion = CompRegion (window-outputRect ());
diff --git a/plugins/opengl/include/opengl/opengl.h
b/plugins/opengl/include/opengl/opengl.h
index 5b4045c..a9c74ef 100644
--- a/plugins/opengl/include/opengl/opengl.h
+++ b/plugins/opengl/include/opengl/opengl.h
@@ -35,7 +35,7 @@
#include opengl/texture.h
#include opengl/fragment.h
-#define COMPIZ_OPENGL_ABI 2
+#define COMPIZ_OPENGL_ABI 3
#include core/pluginclasshandler.h
diff --git a/plugins/opengl/include/opengl/texture.h
b/plugins/opengl/include/opengl/texture.h
index 3d0ddba..2023402 100644
--- a/plugins/opengl/include/opengl/texture.h
+++ b/plugins/opengl/include/opengl/texture.h
@@ -200,9 +200,12 @@ class GLTexture : public CompRect {
* return a GLTexture::List with its contents
*
* @param imageFileName The filename of the image
+* @param pluginNameThe name of the plugin, used to find
+* the default image path
* @param size The size of this new texture
*/
static List readImageToTexture (CompString imageFileName,
+ CompString pluginName,
CompSize size);
friend class PrivateTexture;
diff --git a/plugins/opengl/src/screen.cpp b/plugins/opengl/src/screen.cpp
index 5fe1cc0..253f03b 100644
---
compiz: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
compiz: Changes to 'upstream-unstable'
.gitignore| 47 Makefile.am | 15 NEWS | 34 configure.ac |6 include/compiz-core.h | 28 kde/window-decorator-kde4/Makefile.am |3 kde/window-decorator-kde4/decorator.cpp | 169 - kde/window-decorator-kde4/decorator.h | 31 kde/window-decorator-kde4/main.cpp| 82 kde/window-decorator-kde4/paintredirector.cpp | 125 + kde/window-decorator-kde4/paintredirector.h | 60 kde/window-decorator-kde4/switcher.cpp| 39 kde/window-decorator-kde4/switcher.h |2 kde/window-decorator-kde4/utils.h |6 kde/window-decorator-kde4/window.cpp | 1103 ++--- kde/window-decorator-kde4/window.h| 77 metadata/core.xml.in.in |2 metadata/gnomecompat.xml.in |2 metadata/place.xml.in | 46 metadata/screenshot.xml.in|9 plugins/annotate.c|4 plugins/blur.c|3 plugins/clone.c |2 plugins/cube.c|2 plugins/decoration.c | 37 plugins/fuse.c|3 plugins/glib.c| 13 plugins/move.c| 61 plugins/place.c | 716 +- plugins/regex.c | 11 plugins/resize.c | 121 - plugins/rotate.c | 31 plugins/scale.c | 27 plugins/screenshot.c | 132 + plugins/switcher.c| 169 - plugins/water.c |2 plugins/wobbly.c | 115 plugins/zoom.c|4 po/POTFILES.in|1 po/POTFILES.skip |1 po/af.po | 112 po/ar.po | 127 - po/as.po | 2624 ++ po/be.po | 2738 +++ po/bg.po | 334 +- po/bn.po | 133 - po/bn_IN.po | 133 - po/bs.po | 106 po/ca.po | 131 - po/cs.po | 141 - po/cy.po | 120 - po/da.po | 163 - po/de.po | 196 - po/el.po | 399 +-- po/en_GB.po | 122 - po/es.po | 455 +-- po/et.po | 122 - po/eu.po | 290 -- po/fa.po | 2634 ++ po/fi.po | 264 -- po/fr.po | 279 +- po/gl.po | 617 ++--- po/gu.po | 131 - po/he.po | 302 +- po/hi.po | 127 - po/hr.po | 128 - po/hu.po | 259 -- po/id.po | 104 po/it.po | 1243 +- po/ja.po | 694 ++ po/ka.po | 96 po/km.po | 122 - po/ko.po | 437 +-- po/lo.po | 96 po/lt.po | 122 - po/mk.po | 97 po/ml_IN.po | 3000 ++ po/nb.po | 139 - po/nl.po | 141 - po/or.po | 139 - po/pa.po | 127 - po/pl.po | 474 +--- po/pt.po | 282 -- po/pt_BR.po | 139 - po/ro.po | 141 - po/ru.po | 301 +- po/sk.po | 139 - po/sl.po
compiz: Changes to 'upstream-unstable'
Makefile.am |8 NEWS| 74 autogen.sh |2 configure.ac| 15 gtk/gnome/50-compiz-desktop-key.xml.in | 10 gtk/gnome/Makefile.am | 23 gtk/gnome/compiz-window-manager.c | 86 gtk/gnome/compiz-wm.desktop.in | 17 gtk/gnome/compiz.desktop.in |8 gtk/window-decorator/Makefile.am|1 gtk/window-decorator/gtk-window-decorator.c | 369 ++-- include/compiz-core.h | 222 +- include/compiz-scale.h |6 include/compiz.h|3 kde/window-decorator-kde4/Makefile.am | 12 kde/window-decorator-kde4/decorator.cpp |9 kde/window-decorator-kde4/switcher.cpp | 19 kde/window-decorator-kde4/switcher.h|4 kde/window-decorator-kde4/utils.cpp |6 kde/window-decorator-kde4/utils.h |2 kde/window-decorator-kde4/window.cpp| 112 - kde/window-decorator-kde4/window.h | 17 kde/window-decorator/Makefile.am|6 kde/window-decorator/decorator.cpp | 14 kde/window-decorator/utils.cpp |6 kde/window-decorator/utils.h|2 libdecoration/decoration.c |2 metadata/Makefile.am| 75 metadata/annotate.xml.in|1 metadata/blur.xml.in|3 metadata/clone.xml.in |1 metadata/commands.xml.in| 225 ++ metadata/core.xml.in| 487 - metadata/core.xml.in.in | 335 +++ metadata/cube.xml.in| 236 +- metadata/dbus.xml.in|1 metadata/decoration.xml.in |1 metadata/fade.xml.in| 52 metadata/fs.xml.in |1 metadata/glib.xml.in|1 metadata/gnomecompat.xml.in | 52 metadata/inotify.xml.in |1 metadata/minimize.xml.in|1 metadata/move.xml.in|1 metadata/obs.xml.in | 169 + metadata/place.xml.in | 83 metadata/png.xml.in |1 metadata/regex.xml.in |1 metadata/resize.xml.in | 64 metadata/rotate.xml.in | 339 +-- metadata/scale.xml.in | 312 +-- metadata/screenshot.xml.in |1 metadata/svg.xml.in |1 metadata/switcher.xml.in| 142 - metadata/video.xml.in |1 metadata/water.xml.in |1 metadata/wobbly.xml.in |2 metadata/zoom.xml.in|1 plugins/Makefile.am | 13 plugins/annotate.c |5 plugins/blur.c | 36 plugins/clone.c |6 plugins/commands.c | 352 +++ plugins/cube.c | 17 plugins/dbus.c | 201 +- plugins/decoration.c| 107 - plugins/fade.c | 346 ++- plugins/gconf.c | 19 plugins/glib.c |4 plugins/gnomecompat.c | 344 +++ plugins/ini.c | 30 plugins/kconfig.cpp |8 plugins/minimize.c | 96 - plugins/move.c | 23 plugins/obs.c | 746 plugins/place.c | 258 ++ plugins/regex.c |4 plugins/resize.c| 49 plugins/rotate.c| 30 plugins/scale.c | 107 - plugins/screenshot.c|7 plugins/svg.c |3 plugins/switcher.c | 44 plugins/video.c | 14 plugins/water.c | 19 plugins/wobbly.c|3 plugins/zoom.c |3 po/POTFILES.in |6 po/af.po| 1597 ++--- po/ar.po| 1530 ++-- po/bg.po| 2338 +++-- po/bn.po| 1734
compiz: Changes to 'upstream-unstable'
NEWS| 30 configure.ac| 18 gtk/window-decorator/gtk-window-decorator.c | 237 +- include/compiz-core.h | 31 include/compiz-cube.h | 71 include/decoration.h| 63 kde/window-decorator-kde4/decorator.cpp | 17 kde/window-decorator-kde4/main.cpp |3 kde/window-decorator-kde4/switcher.cpp | 121 - kde/window-decorator-kde4/switcher.h|4 kde/window-decorator-kde4/window.cpp| 82 kde/window-decorator-kde4/window.h | 12 kde/window-decorator/window.cpp | 80 libdecoration/decoration.c | 435 ++-- metadata/Makefile.am|1 metadata/core.xml.in|5 metadata/cube.xml.in|5 metadata/place.xml.in | 32 metadata/plane.xml.in | 83 metadata/switcher.xml.in| 18 plugins/Makefile.am | 17 plugins/blur.c | 329 +-- plugins/cube.c | 380 plugins/place.c | 1884 + plugins/plane.c | 766 plugins/resize.c| 19 plugins/rotate.c| 10 plugins/scale.c |5 plugins/switcher.c | 287 +-- po/POTFILES.in |1 po/af.po| 597 ++ po/ar.po| 570 ++ po/bg.po| 767 po/bn.po| 711 po/bn_IN.po | 711 po/bs.po| 600 ++ po/ca.po| 853 - po/cs.po| 780 po/cy.po| 606 ++ po/da.po| 778 po/de.po| 722 po/el.po| 751 po/en_GB.po | 765 po/en_US.po | 610 +++--- po/es.po| 743 po/et.po| 771 po/eu.po| 708 po/fi.po| 789 po/fr.po| 708 po/gl.po| 708 po/gu.po| 714 po/he.po| 2323 +++--- po/hi.po| 778 po/hr.po| 765 po/hu.po| 738 po/id.po| 595 ++ po/it.po| 736 po/ja.po| 2035 +++ po/ka.po| 570 ++ po/km.po| 767 po/ko.po| 760 po/lo.po| 570 ++ po/lt.po| 767 po/mk.po| 570 ++ po/mr.po| 595 ++ po/nb.po| 722 po/nl.po| 731 po/or.po| 715 po/pa.po| 779 po/pl.po| 1019 +-- po/pt.po| 769 po/pt_BR.po | 707 po/ro.po| 1846 ++-- po/ru.po| 1563 - po/sk.po| 2472 ++-- po/sl.po| 767 po/sr.po| 866 - po/sv.po| 705 --- po/ta.po| 570 ++ po/tr.po| 767 po/uk.po| 843 - po/vi.po| 570 ++ po/xh.po| 595 ++ po/zh_CN.po | 771 po/zh_TW.po
compiz: Changes to 'upstream-unstable'
Makefile.am | 11 NEWS | 88 compiz-kconfig.pc.in |7 configure.ac | 143 gtk/window-decorator/Makefile.am | 10 gtk/window-decorator/gtk-window-decorator.c | 236 - include/Makefile.am | 13 include/compiz-core.h | 3498 include/compiz-cube.h | 227 + include/compiz-plugin.h | 71 include/compiz-scale.h| 209 + include/compiz.h | 3211 -- include/cube.h| 199 - include/decoration.h |9 include/scale.h | 187 - kde/Makefile.am |2 kde/window-decorator-kde4/Makefile.am | 49 kde/window-decorator-kde4/decorator.cpp | 1000 + kde/window-decorator-kde4/decorator.h | 185 + kde/window-decorator-kde4/kdecoration_plugins.cpp | 212 + kde/window-decorator-kde4/kdecoration_plugins.h | 90 kde/window-decorator-kde4/main.cpp| 196 + kde/window-decorator-kde4/options.cpp | 186 + kde/window-decorator-kde4/options.h | 140 kde/window-decorator-kde4/org.kde.KWin.xml| 10 kde/window-decorator-kde4/switcher.cpp| 370 ++ kde/window-decorator-kde4/switcher.h | 84 kde/window-decorator-kde4/utils.cpp | 213 + kde/window-decorator-kde4/utils.h | 66 kde/window-decorator-kde4/window.cpp | 2175 kde/window-decorator-kde4/window.h| 258 + kde/window-decorator/decorator.cpp|4 kde/window-decorator/utils.cpp| 14 kde/window-decorator/window.cpp |3 libdecoration/decoration.c|8 metadata/Makefile.am | 87 metadata/annotate.xml.in | 26 metadata/blur.xml.in |8 metadata/clone.xml.in |7 metadata/core.xml.in | 260 - metadata/cube.xml.in | 31 metadata/fade.xml.in |5 metadata/kcfg.xslt| 322 + metadata/kconfig.xml.in |6 metadata/kconfig.xslt | 59 metadata/move.xml.in | 13 metadata/plane.xml.in | 64 metadata/resize.xml.in| 25 metadata/rotate.xml.in| 146 metadata/scale.xml.in | 58 metadata/schemas.xslt | 239 - metadata/screenshot.xml.in|7 metadata/switcher.xml.in | 62 metadata/water.xml.in | 34 metadata/wobbly.xml.in| 14 metadata/zoom.xml.in | 28 plugins/Makefile.am | 10 plugins/annotate.c| 125 plugins/blur.c| 678 +++ plugins/clone.c | 122 plugins/cube.c| 556 ++- plugins/dbus.c| 1257 +++ plugins/decoration.c | 280 + plugins/fade.c| 137 plugins/fuse.c| 548 +-- plugins/gconf.c | 1227 ++- plugins/glib.c| 60 plugins/ini.c | 914 + plugins/inotify.c | 159 plugins/kconfig.cpp | 752 plugins/minimize.c| 108 plugins/move.c| 195 - plugins/place.c | 351 +- plugins/plane.c | 277 - plugins/png.c | 59 plugins/regex.c | 108 plugins/resize.c | 202 - plugins/rotate.c | 568 +-- plugins/scale.c | 320 + plugins/screenshot.c | 112 plugins/svg.c | 140 plugins/switcher.c| 315 + plugins/video.c
compiz: Changes to 'upstream-unstable'
kde/window-decorator/decorator.cpp |2 +-
kde/window-decorator/window.cpp| 20 +---
kde/window-decorator/window.h |3 ++-
3 files changed, 16 insertions(+), 9 deletions(-)
New commits:
commit 0ea58487fd2b0db25fae93ff08ae6680d1ad6557
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date: Tue Jan 15 14:53:46 2008 +0100
Wait for the proper configure (and map) events before rebinding the
decoration pixmap.
- On some systems the decoration widget window gets mapped first and
resized after the map. KWD used a wrong window pixmap in this case.
diff --git a/kde/window-decorator/decorator.cpp
b/kde/window-decorator/decorator.cpp
index df2d188..980233b 100644
--- a/kde/window-decorator/decorator.cpp
+++ b/kde/window-decorator/decorator.cpp
@@ -589,7 +589,7 @@ KWD::Decorator::x11EventFilter (XEvent *xevent)
else
break;
- if (client-handleConfigure ())
+ if (client-handleConfigure (QSize (xce-width, xce-height)))
{
if (!mIdleTimer.isActive ())
mIdleTimer.start (0, TRUE);
diff --git a/kde/window-decorator/window.cpp b/kde/window-decorator/window.cpp
index 5165995..75f149d 100644
--- a/kde/window-decorator/window.cpp
+++ b/kde/window-decorator/window.cpp
@@ -1144,15 +1144,18 @@ KWD::Window::resizeDecoration (bool force)
mPicture = 0;
}
+if (w != width() || h != height())
+{
+ mPendingConfigure = 1;
+}
+
setGeometry (QRect (mGeometry.x () + ROOT_OFF_X - mBorder.left,
mGeometry.y () + ROOT_OFF_Y - mBorder.top,
w, h));
-if (mMapped)
-{
- mPendingConfigure++;
-}
-else
+mSize = QSize (w, h);
+
+if (!mMapped)
{
mPendingMap = 1;
@@ -1219,12 +1222,15 @@ KWD::Window::handleMap (void)
}
bool
-KWD::Window::handleConfigure (void)
+KWD::Window::handleConfigure (QSize size)
{
if (!mPendingConfigure)
return FALSE;
-mPendingConfigure--;
+if (size != mSize)
+ return FALSE;
+
+mPendingConfigure = 0;
if (mPendingConfigure || mPendingMap)
return FALSE;
diff --git a/kde/window-decorator/window.h b/kde/window-decorator/window.h
index eb4a8d3..d22cff2 100644
--- a/kde/window-decorator/window.h
+++ b/kde/window-decorator/window.h
@@ -156,7 +156,7 @@ class Window:public QWidget, public KDecorationBridge {
mDamage += QRegion (x, y, w, h);
}
bool handleMap (void);
- bool handleConfigure (void);
+ bool handleConfigure (QSize size);
void processDamage (void);
decor_context_t *context (void)
{
@@ -235,6 +235,7 @@ class Window:public QWidget, public KDecorationBridge {
bool mMapped;
int mPendingMap;
int mPendingConfigure;
+ QSize mSize;
KProcess *mProcessKiller;
};
}
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
compiz: Changes to 'upstream-unstable'
plugins/cube.c | 10 ++
plugins/decoration.c |1 +
src/window.c | 25 +
3 files changed, 20 insertions(+), 16 deletions(-)
New commits:
commit 061ff1593052b99d9159f21002c85fbab8abc87e
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date: Wed Dec 19 17:34:43 2007 +0100
Decorate menu window type windows.
diff --git a/plugins/decoration.c b/plugins/decoration.c
index ca49e21..70f1755 100644
--- a/plugins/decoration.c
+++ b/plugins/decoration.c
@@ -720,6 +720,7 @@ decorWindowUpdate (CompWindow *w,
case CompWindowTypeDialogMask:
case CompWindowTypeModalDialogMask:
case CompWindowTypeUtilMask:
+case CompWindowTypeMenuMask:
case CompWindowTypeNormalMask:
if (w-mwmDecor (MwmDecorAll | MwmDecorTitle))
decorate = TRUE;
commit 17488d86daffcb554d6f20508172e3a3db15d31b
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date: Wed Dec 19 17:34:18 2007 +0100
Add window actions menu type windows (ex. gimp detached menus).
diff --git a/src/window.c b/src/window.c
index 72a4cac..b0a6525 100644
--- a/src/window.c
+++ b/src/window.c
@@ -637,6 +637,7 @@ recalcWindowActions (CompWindow *w)
actions |= CompWindowActionShadeMask;
break;
case CompWindowTypeUtilMask:
+case CompWindowTypeMenuMask:
case CompWindowTypeToolbarMask:
actions =
CompWindowActionMoveMask |
commit 77215784e124b45e1fa3c90857e984e0e0aaa1b5
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date: Wed Dec 19 14:11:37 2007 +0100
Damage window extents correcly of windows with borders.
diff --git a/src/window.c b/src/window.c
index 1f129bf..72a4cac 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1397,33 +1397,33 @@ damageWindowOutputExtents (CompWindow *w)
BoxRec box;
/* top */
- box.x1 = -w-output.left;
- box.y1 = -w-output.top;
- box.x2 = w-width + w-output.right;
- box.y2 = 0;
+ box.x1 = -w-output.left - w-attrib.border_width;
+ box.y1 = -w-output.top - w-attrib.border_width;
+ box.x2 = w-width + w-output.right - w-attrib.border_width;
+ box.y2 = -w-attrib.border_width;
if (box.x1 box.x2 box.y1 box.y2)
addWindowDamageRect (w, box);
/* bottom */
- box.y1 = w-height;
- box.y2 = box.y1 + w-output.bottom;
+ box.y1 = w-height - w-attrib.border_width;
+ box.y2 = box.y1 + w-output.bottom - w-attrib.border_width;
if (box.x1 box.x2 box.y1 box.y2)
addWindowDamageRect (w, box);
/* left */
- box.x1 = -w-output.left;
- box.y1 = 0;
- box.x2 = 0;
- box.y2 = w-height;
+ box.x1 = -w-output.left - w-attrib.border_width;
+ box.y1 = -w-attrib.border_width;
+ box.x2 = -w-attrib.border_width;
+ box.y2 = w-height - w-attrib.border_width;
if (box.x1 box.x2 box.y1 box.y2)
addWindowDamageRect (w, box);
/* right */
- box.x1 = w-width;
- box.x2 = box.x1 + w-output.right;
+ box.x1 = w-width - w-attrib.border_width;
+ box.x2 = box.x1 + w-output.right - w-attrib.border_width;
if (box.x1 box.x2 box.y1 box.y2)
addWindowDamageRect (w, box);
commit 19791da80df3fa3e4c247b8d4d9d0ef42f4c74f3
Author: Dennis Kasprzyk [EMAIL PROTECTED]
Date: Wed Dec 19 13:00:21 2007 +0100
Draw cube caps correctly in inside cube mode.
diff --git a/plugins/cube.c b/plugins/cube.c
index 14ab2cc..460ae61 100644
--- a/plugins/cube.c
+++ b/plugins/cube.c
@@ -1370,7 +1370,7 @@ cubePaintTransformedOutput (CompScreen*s,
PaintOrderpaintOrder;
Bool capsPainted;
Bool wasCulled = FALSE;
-Bool topDir, bottomDir;
+Bool topDir, bottomDir, allCaps;
int output = 0;
CUBE_SCREEN (s);
@@ -1510,10 +1510,12 @@ cubePaintTransformedOutput (CompScreen *s,
cs-capsPainted[output] = TRUE;
+ allCaps = cs-desktopOpacity != OPAQUE || cs-invert != 1;
+
if (topDir bottomDir)
{
glNormal3f (0.0f, -1.0f, 0.0f);
- if (cs-desktopOpacity != OPAQUE)
+ if (allCaps)
{
(*cs-paintBottom) (s, sa, transform, outputPtr, hsize);
glNormal3f (0.0f, 0.0f, -1.0f);
@@ -1525,7 +1527,7 @@ cubePaintTransformedOutput (CompScreen*s,
else if (!topDir !bottomDir)
{
glNormal3f (0.0f, 1.0f, 0.0f);
- if (cs-desktopOpacity != OPAQUE)
+ if (allCaps)
{
(*cs-paintTop) (s, sa, transform, outputPtr, hsize);
glNormal3f (0.0f, 0.0f, -1.0f);
@@ -1534,7 +1536,7 @@ cubePaintTransformedOutput (CompScreen*s,
}
(*cs-paintBottom) (s, sa, transform, outputPtr, hsize);
}
- else if (cs-desktopOpacity != OPAQUE)
+ else if (allCaps)
{
compiz: Changes to 'upstream-unstable'
Makefile.am |2
NEWS| 26 ++
compiz-cube.pc.in |2
compiz-scale.pc.in |2
configure.ac|9
gtk/gnome/50-compiz-desktop-key.xml.in |2
gtk/window-decorator/gtk-window-decorator.c | 309
gtk/window-decorator/gwd.schemas.in | 11
include/compiz.h| 30 +-
include/cube.h |4
kde/window-decorator/decorator.cpp | 28 +-
kde/window-decorator/decorator.h|9
kde/window-decorator/main.cpp | 12 -
kde/window-decorator/window.cpp | 49 ++--
kde/window-decorator/window.h |7
libdecoration/Makefile.am |5
metadata/Makefile.am|3
metadata/fade.xml.in|5
metadata/resize.xml.in | 16 -
metadata/rotate.xml.in |4
metadata/schemas.xslt | 21 +
plugins/cube.c | 34 +--
plugins/decoration.c| 60 +++--
plugins/fade.c | 27 +-
plugins/fuse.c |3
plugins/gconf.c | 37 ++-
plugins/ini.c | 22 +
plugins/inotify.c |2
plugins/place.c | 28 +-
plugins/plane.c |1
plugins/resize.c| 43 ++-
plugins/scale.c |2
plugins/switcher.c |6
plugins/video.c |6
plugins/wobbly.c| 17 +
src/display.c | 67 ++
src/event.c | 135 ++--
src/option.c| 15 -
src/screen.c| 93 +---
src/session.c |7
src/window.c| 210 +--
41 files changed, 902 insertions(+), 469 deletions(-)
New commits:
commit 8a1e4e0543fee3c2b4efd6840591488d87c84443
Author: Danny Baumann [EMAIL PROTECTED]
Date: Fri Oct 19 19:58:28 2007 +0200
Fix typo.
diff --git a/plugins/place.c b/plugins/place.c
index 3fa4d9c..258e450 100644
--- a/plugins/place.c
+++ b/plugins/place.c
@@ -1169,8 +1169,8 @@ placeWin (CompWindow *window,
/* clip to screen if parent is visible in current viewport */
if (parent-serverX parent-screen-width
parent-serverX + parent-serverWidth 0
- parent-serverY parent-screen-height )
- parent-serverY + parent-serverHeight 0
+ parent-serverY parent-screen-height
+ parent-serverY + parent-serverHeight 0)
{
XRectangle area;
intoutput;
commit 5c4eab6ab6964a4f555b2921f9f01ec2c4b5196e
Author: Danny Baumann [EMAIL PROTECTED]
Date: Sat Nov 3 11:28:21 2007 +0100
Fix typo.
diff --git a/src/event.c b/src/event.c
index 6a9340d..9e4c7f7 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1952,6 +1952,7 @@ handleEvent (CompDisplay *d,
}
else
restackWindowBelow (w, p);
+ }
}
if (w-minimized)
commit 65792e9bcc5e1486568454f32733a070553a94f8
Author: Danny Baumann [EMAIL PROTECTED]
Date: Mon Nov 5 09:05:36 2007 +0100
Clip transient child placement to parent output instead of current output.
diff --git a/plugins/place.c b/plugins/place.c
index 4408c46..3fa4d9c 100644
--- a/plugins/place.c
+++ b/plugins/place.c
@@ -1173,8 +1173,10 @@ placeWin (CompWindow *window,
parent-serverY + parent-serverHeight 0
{
XRectangle area;
+ intoutput;
- get_workarea_of_current_output_device (window-screen, area);
+ output = outputDeviceForWindow (parent);
+ getWorkareaForOutput (window-screen, output, area);
if (x + window_width area.x + area.width)
x = area.x + area.width - window_width;
commit d29a8bdf1f90dfa11847daf78205966cf982782c
Author: Danny Baumann [EMAIL PROTECTED]
Date: Sat Nov 3 11:27:04 2007 +0100
Prevent transient children being stacked below their parent if their focus
was denied.
diff --git a/src/event.c b/src/event.c
index 6e072c3..6a9340d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1940,7 +1940,18 @@ handleEvent (CompDisplay *d,
/* window is above active window so we should lower it */
if (p)
-
compiz: Changes to 'upstream-unstable'
AUTHORS |5 COPYING |7 COPYING.LGPL| 510 Makefile.am |1 NEWS| 30 compiz.pc.in|2 configure.ac| 33 gtk/gnome/compiz-window-manager.c |2 gtk/window-decorator/gtk-window-decorator.c | 342 ++- gtk/window-decorator/gwd.schemas.in | 11 include/compiz.h| 680 +- include/decoration.h| 36 kde/window-decorator/decorator.cpp | 49 kde/window-decorator/decorator.h|8 kde/window-decorator/main.cpp | 16 kde/window-decorator/utils.cpp |3 kde/window-decorator/utils.h|1 kde/window-decorator/window.cpp | 177 + kde/window-decorator/window.h |4 libdecoration/decoration.c | 226 ++ plugins/Makefile.am | 75 plugins/annotate.c | 11 plugins/blur.c | 2908 plugins/clone.c | 45 plugins/compiz.schemas.in | 1320 +++- plugins/cube.c | 118 - plugins/dbus.c | 166 + plugins/decoration.c| 666 +++--- plugins/fade.c | 159 - plugins/fuse.c | 1611 +++ plugins/gconf-dump.c| 17 plugins/gconf.c | 35 plugins/ini.c | 1473 ++ plugins/inotify.c |7 plugins/minimize.c | 114 - plugins/move.c | 37 plugins/place.c | 543 - plugins/plane.c | 94 plugins/regex.c | 488 plugins/resize.c| 55 plugins/rotate.c| 58 plugins/scale.c | 406 ++- plugins/screenshot.c| 48 plugins/switcher.c | 340 ++- plugins/video.c | 1265 plugins/water.c | 448 ++-- plugins/wobbly.c| 464 ++-- plugins/zoom.c | 11 po/POTFILES.in | 13 po/af.po| 1871 ++ po/ar.po| 1859 + po/bg.po| 2159 po/bn.po| 1998 +++ po/bs.po| 1924 ++ po/ca.po| 1990 +++ po/cs.po| 1994 +-- po/cy.po| 1965 ++ po/da.po| 2080 po/de.po| 2086 ++-- po/el.po| 2171 po/en_GB.po | 2145 po/en_US.po | 1878 ++ po/es.po| 2098 ++-- po/et.po| 2218 + po/fi.po| 2112 ++-- po/fr.po| 2002 ++- po/gl.po| 1962 ++ po/gu.po| 1872 ++ po/he.po| 2123 po/hi.po| 2114 po/hr.po| 2102 po/hu.po| 1526 +- po/id.po| 1900 ++ po/it.po| 2049 ++- po/ja.po| 2096 ++-- po/ka.po| 1856 + po/km.po| 2156 po/ko.po| 2230 + po/lo.po| 1854 + po/lt.po| 2151 po/mk.po
compiz: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
