compiz: Changes to 'upstream-unstable'
gtk/window-decorator/gtk-window-decorator.c | 12 ++++++------
kde/window-decorator/decorator.cpp | 8 ++++----
kde/window-decorator/main.cpp | 3 +++
src/window.c | 7 +++++--
4 files changed, 18 insertions(+), 12 deletions(-)
New commits:
commit 25941d1408f8f8d7fc632a002201309a491845eb
Author: Dennis Kasprzyk <onestone@opencompositing.org>
Date: Mon Nov 19 20:39:48 2007 +0100
Use the kwin translation catalogue to provide a translated window menu.
diff --git a/kde/window-decorator/main.cpp b/kde/window-decorator/main.cpp
index d4058d8..6e9b258 100644
--- a/kde/window-decorator/main.cpp
+++ b/kde/window-decorator/main.cpp
@@ -27,6 +27,7 @@
#include <fixx11h.h>
#include <kapplication.h>
#include <kcmdlineargs.h>
+#include <klocale.h>
#include "decorator.h"
@@ -51,6 +52,8 @@ main (int argc, char **argv)
int event, error;
Time timestamp;
+ KLocale::setMainCatalogue("kwin");
+
KCmdLineArgs::init (argc, argv,
"kde-window-decorator",
"KWD",
commit 641b2081e00e1077da85f8cbe019b56f7aa85535
Author: Danny Baumann <dannybaumann@web.de>
Date: Sun Nov 11 18:07:35 2007 +0100
Fix dbus paths (shadow_offset_x/y -> shadow_x/y_offset).
diff --git a/gtk/window-decorator/gtk-window-decorator.c b/gtk/window-decorator/gtk-window-decorator.c
index fb6762a..358475d 100644
--- a/gtk/window-decorator/gtk-window-decorator.c
+++ b/gtk/window-decorator/gtk-window-decorator.c
@@ -111,10 +111,10 @@
COMPIZ_GCONF_DIR1 "/shadow_color"
#define COMPIZ_SHADOW_OFFSET_X_KEY \
- COMPIZ_GCONF_DIR1 "/shadow_offset_x"
+ COMPIZ_GCONF_DIR1 "/shadow_x_offset"
#define COMPIZ_SHADOW_OFFSET_Y_KEY \
- COMPIZ_GCONF_DIR1 "/shadow_offset_y"
+ COMPIZ_GCONF_DIR1 "/shadow_y_offset"
#define META_THEME_KEY \
METACITY_GCONF_DIR "/theme"
@@ -6445,13 +6445,13 @@ dbus_handle_message (DBusConnection *connection,
dbus_error_free (&error);
}
- else if (strcmp (path[5], "shadow_offset_x") == 0)
+ else if (strcmp (path[5], "shadow_x_offset") == 0)
{
dbus_message_get_args (message, NULL,
DBUS_TYPE_INT32, &shadow_offset_x,
DBUS_TYPE_INVALID);
}
- else if (strcmp (path[5], "shadow_offset_y") == 0)
+ else if (strcmp (path[5], "shadow_y_offset") == 0)
{
dbus_message_get_args (message, NULL,
DBUS_TYPE_INT32, &shadow_offset_y,
@@ -6600,7 +6600,7 @@ init_settings (WnckScreen *screen)
}
reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
- "/shadow_offset_x");
+ "/shadow_x_offset");
if (reply)
{
dbus_message_get_args (reply, NULL,
@@ -6610,7 +6610,7 @@ init_settings (WnckScreen *screen)
}
reply = send_and_block_for_shadow_option_reply (connection, DBUS_PATH
- "/shadow_offset_y");
+ "/shadow_y_offset");
if (reply)
{
dbus_message_get_args (reply, NULL,
diff --git a/kde/window-decorator/decorator.cpp b/kde/window-decorator/decorator.cpp
index 0d1fd2a..df2d188 100644
--- a/kde/window-decorator/decorator.cpp
+++ b/kde/window-decorator/decorator.cpp
@@ -444,7 +444,7 @@ KWD::Decorator::updateAllShadowOptions (void)
dbus_message_unref (reply);
}
- reply = sendAndBlockForShadowOptionReply (DBUS_PATH "/shadow_offset_x");
+ reply = sendAndBlockForShadowOptionReply (DBUS_PATH "/shadow_x_offset");
if (reply)
{
dbus_message_get_args (reply, NULL,
@@ -453,7 +453,7 @@ KWD::Decorator::updateAllShadowOptions (void)
dbus_message_unref (reply);
}
- reply = sendAndBlockForShadowOptionReply (DBUS_PATH "/shadow_offset_y");
+ reply = sendAndBlockForShadowOptionReply (DBUS_PATH "/shadow_y_offset");
if (reply)
{
dbus_message_get_args (reply, NULL,
commit 432f200d7eed48fe37e099007350ddb0db54212b
Author: Danny Baumann <dannybaumann@web.de>
Date: Sun Nov 11 12:30:59 2007 +0100
Fix typos.
diff --git a/kde/window-decorator/decorator.cpp b/kde/window-decorator/decorator.cpp
index 893820b..0d1fd2a 100644
--- a/kde/window-decorator/decorator.cpp
+++ b/kde/window-decorator/decorator.cpp
@@ -167,13 +167,13 @@ dbusHandleMessage (DBusConnection *connection,
dbus_error_free (&error);
}
- else if (strcmp (path[5], "shadow_offset_x") == 0)
+ else if (strcmp (path[5], "shadow_x_offset") == 0)
{
dbus_message_get_args (message, NULL,
DBUS_TYPE_INT32, &opt.shadow_offset_x,
DBUS_TYPE_INVALID);
}
- else if (strcmp (path[5], "shadow_offset_y") == 0)
+ else if (strcmp (path[5], "shadow_y_offset") == 0)
{
dbus_message_get_args (message, NULL,
DBUS_TYPE_INT32, &opt.shadow_offset_y,
commit dff88aeeab1c5d51bc23857dcb8db30fb55738c3
Author: Danny Baumann <dannybaumann@web.de>
Date: Wed Nov 7 19:52:28 2007 +0100
Don't restack ancestors on initial map.
Rationale: A newly opened window most likely is put on top of the stack, thus the ancestors are raised. If the new window is denied focus later, the ancestors remain raised, which we do not want to happen.
diff --git a/src/window.c b/src/window.c
index b3c0edd..1f129bf 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4007,8 +4007,11 @@ updateWindowAttributes (CompWindow *w,
{
configureXWindow (w, mask, &xwc);
- /* ancestors, sibilings and sibiling transients below */
- stackAncestors (w, &xwc);
+ /* ancestors, sibilings and sibiling transients below, but not on
+ the initial map, as we don't want the ancestors to raise in that
+ case (this may break focus stealing prevention) */
+ if (stackingMode != CompStackingUpdateModeInitialMap)
+ stackAncestors (w, &xwc);
}
}
else
Reply to: