Merge lp:~muktupavels/compiz/gtk-window-decorator-3 into lp:compiz/0.9.12

[Alberts Muktupāvels]

Port gtk-window-decorator to GTK+ 3.

Port gtk-window-decorator to GTK+ 3.

This branch does not port metacity part. Metacity will be disabled.

[Alberts Muktupāvels (muktupavels)]

I think this is more or less ready for review.

Currently it is crashing every time when minimizing window. I am not sure how to properly debug x errors, but seems error is caused by calling XDestroyWindow in remove_frame_window function in wnck.c.

Adding error trap makes decorator to not crash, but gdk_error_trap_pop is returning BadWindow error code (parameter not a Window).

[Marco Trevisan (Treviño) (3v1n0)]

As for the crash, I think it's better to trap errors, before crashing, so if a BadWindow error is thrown (sometimes it happens also because of the async nature of X, where you might have already destroyed that window), it's better to warn than to crash.

[Alberts Muktupāvels (muktupavels)]

Ok. I will add error trap.

But do you have any idea why it is crashing with GTK+ 3, but not with GTK+ 2? I guess there could be several reasons:
1) I have done something wrong.
2) Something has changed in libwnck.
3) Something has changed in gtk+.

> As for the crash, I think it's better to trap errors, before crashing, so if a
> BadWindow error is thrown (sometimes it happens also because of the async
> nature of X, where you might have already destroyed that window), it's better
> to warn than to crash.

[Marco Trevisan (Treviño) (3v1n0)]

> Ok. I will add error trap.
>
> But do you have any idea why it is crashing with GTK+ 3, but not with GTK+ 2?
> I guess there could be several reasons:
> 1) I have done something wrong.

I've not checked the code yet...

> 2) Something has changed in libwnck.

This might be the most likely option

[Alberts Muktupāvels (muktupavels)]

Marco can you please review code?

[Marco Trevisan (Treviño) (3v1n0)]

Sorry for the delay, and thanks for the heads up... I've finally got some time to review this.

First of all, I'm getting some compilation issues when compiling the tests here (but also in previous branches), so you'd also need to apply this:

http://pastebin.ubuntu.com/7832742/

Then, on a test-run the decorations work well, but I've a problem with the libwnck menu that never pop-ups here (neither clicking on the menu icon or right-clicking on the decoration). And this is weird since I don't see anything wrong in the code.

Another thing: in switcher.c there's something like

decor_post_delete_pixmap (xdisplay, wnck_window_get_xid (d->win), d->x11Pixmap);

But the d->win is always null for the switcher, then we get a critical error, and I think that nothing get still deleted on compiz side (as the window sent to the decor plugin is an invalid value), so... Wondering if makes sense to change this call to avoid errors.

I'm also curious about the state of lp:~mitya57/metacity/3.12.0/+merge/226573 since we'd need to get that in as well.

Finally see the diff-comments I wrote.

review: Needs Fixing

[Alberts Muktupāvels (muktupavels)]

> Sorry for the delay, and thanks for the heads up... I've finally got some time
> to review this.

Thanks for review!

> First of all, I'm getting some compilation issues when compiling the tests
> here (but also in previous branches), so you'd also need to apply this:
>
> http://pastebin.ubuntu.com/7832742/

How to compile tests?

[Marco Trevisan (Treviño) (3v1n0)]

Ok, thanks for the fixes.

> > First of all, I'm getting some compilation issues when compiling the tests
> > here (but also in previous branches), so you'd also need to apply this:
> >
> > http://pastebin.ubuntu.com/7832742/
>
> How to compile tests?

You can use the cmake variables

  -DBUILD_XORG_GTEST=ON -DCOMPIZ_BUILD_TESTING=ON

As for change you did in http://bazaar.launchpad.net/~albertsmuktupavels/compiz/gtk-window-decorator-3/revision/3909 I guess you want metacity not to build at all until the lp:~mitya57/metacity/3.12.0/+merge/226573 branch and the relative changes are in, right?

Do you have any plan for that? Since we'd need to get that.

What about the context menu issue?

[Alberts Muktupāvels (muktupavels)]

> You can use the cmake variables
>
> -DBUILD_XORG_GTEST=ON -DCOMPIZ_BUILD_TESTING=ON

Thanks!

> As for change you did in
> http://bazaar.launchpad.net/~albertsmuktupavels/compiz/gtk-window-
> decorator-3/revision/3909 I guess you want metacity not to build at all until
> the lp:~mitya57/metacity/3.12.0/+merge/226573 branch and the relative changes
> are in, right?

Yes and no. It simply won't be possible to build with metacity.
1) GWD now will be GTK+ 3, but all other metacity version are GTK+ 2. Even if it will compile there will be error - GTK+ 2.x symbols detected. Using GTK+ 2.x and GTK+ 3 in the same process is not supported.
2) With metacity 3.12 above problem disappears, bet have another - this branch does not include metacity part related changes.
So we have only one option - temporarily disable metacity.

> Do you have any plan for that? Since we'd need to get that.

My only plan is to fix this branch so it can be merged. Then I will work on next brach to restore metacity part. That branch will require metacity 3.12.

I will ask Dmitry about https://code.launchpad.net/~mitya57/metacity/3.12.0/+merge/226573, but I think it will be merged sooner or later.

> What about the context menu issue?

Have not looked at this issue.

I will try to fix this and all other remaining issues till end of this month. I might not have enough free time to do it faster. :(

[Marco Trevisan (Treviño) (3v1n0)]

> > As for change you did in
> > http://bazaar.launchpad.net/~albertsmuktupavels/compiz/gtk-window-
> > decorator-3/revision/3909 I guess you want metacity not to build at all
> until
> > the lp:~mitya57/metacity/3.12.0/+merge/226573 branch and the relative
> changes
> > are in, right?
>
> Yes and no. It simply won't be possible to build with metacity.

Ok, that's fine for now...

> 2) With metacity 3.12 above problem disappears, bet have another - this branch
> does not include metacity part related changes.
> So we have only one option - temporarily disable metacity.
>
> > Do you have any plan for that? Since we'd need to get that.
>
> My only plan is to fix this branch so it can be merged. Then I will work on
> next brach to restore metacity part. That branch will require metacity 3.12.

Ok, but we need the metacity support back as soon as possible (I'd say end of August, to be safe), since gnome flashback session uses it, and we can't regress in a release (and this would meant that we'd need to revert all these changes, which sucks).

> I will ask Dmitry about
> https://code.launchpad.net/~mitya57/metacity/3.12.0/+merge/226573, but I think
> it will be merged sooner or later.

Good, btw I think that, not to create more troubles later, it would be nice to merge that branch when also a metacity-3 branch for compiz is ready (do you know how long might that take?).

> I will try to fix this and all other remaining issues till end of this month.
> I might not have enough free time to do it faster. :(

Ok, that's fine.

[Alberts Muktupāvels (muktupavels)]

> Ok, but we need the metacity support back as soon as possible (I'd say end of
> August, to be safe), since gnome flashback session uses it, and we can't
> regress in a release (and this would meant that we'd need to revert all these
> changes, which sucks).

Reverting won't solve anything. When metacity will be uploaded compiz will fail to build with metacity. There is only two solutions:
1) Port GWD to GTK+ 3.
2) Drop metacity support.

> > I will ask Dmitry about
> > https://code.launchpad.net/~mitya57/metacity/3.12.0/+merge/226573, but I
> think
> > it will be merged sooner or later.
>
> Good, btw I think that, not to create more troubles later, it would be nice to
> merge that branch when also a metacity-3 branch for compiz is ready (do you
> know how long might that take?).

I don't think it will take much time. I already had almost working version, but it was crashing (maybe crashing was not related to metacity part at all). So first I need to fix this branch.

About tests. Can you write short info on how to build and run tests? I am doing this:
1) bzr branch lp:~albertsmuktupavels/compiz/gtk-window-decorator-3
2) cd gtk-window-cecorator-3
3) mkdir build && cd build
4) cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_XORG_GTEST=1 -DCOMPIZ_BUILD_TESTING=1 ..
5) make

But it seems that tests is not building.

[Marco Trevisan (Treviño) (3v1n0)]

> > Ok, but we need the metacity support back as soon as possible (I'd say end
> of
> > August, to be safe), since gnome flashback session uses it, and we can't
> > regress in a release (and this would meant that we'd need to revert all
> these
> > changes, which sucks).
>
> Reverting won't solve anything. When metacity will be uploaded compiz will
> fail to build with metacity. There is only two solutions:
> 1) Port GWD to GTK+ 3.
> 2) Drop metacity support.

Yeah, but it's very likely that in case that there's the risk of this regression also metacity won't be accepted or reverted. And I'd prefer to avoid that.

> > > I will ask Dmitry about
> > > https://code.launchpad.net/~mitya57/metacity/3.12.0/+merge/226573, but I
> > think
> > > it will be merged sooner or later.
> >
> > Good, btw I think that, not to create more troubles later, it would be nice
> to
> > merge that branch when also a metacity-3 branch for compiz is ready (do you
> > know how long might that take?).
>
> I don't think it will take much time. I already had almost working version,
> but it was crashing (maybe crashing was not related to metacity part at all).
> So first I need to fix this branch.

Cool, if you've that somewhere I could give a look as well.

> About tests. Can you write short info on how to build and run tests? I am
> doing this:
> 1) bzr branch lp:~albertsmuktupavels/compiz/gtk-window-decorator-3
> 2) cd gtk-window-cecorator-3
> 3) mkdir build && cd build
> 4) cmake -DCMAKE_INSTALL_PREFIX=/usr -DBUILD_XORG_GTEST=1
> -DCOMPIZ_BUILD_TESTING=1 ..

The cmake flags should include:
Weird, that should work, try to add also -DCOMPIZ_BUILD_TESTING=ON

[Marco Trevisan (Treviño) (3v1n0)]

Ah, make sure you've libxorg-gtest-dev installed

[Alberts Muktupāvels (muktupavels)]

> Ah, make sure you've libxorg-gtest-dev installed

I had it installed already. I should read more carefully what is printed in terminal. I needed to install google-mock to enable tests. Should not it be installed when running apt-get build-dep compiz?

Fixed tests compilation as you suggested.

[Alberts Muktupāvels (muktupavels)]

> Another thing: in switcher.c there's something like
>
> decor_post_delete_pixmap (xdisplay, wnck_window_get_xid (d->win),
> d->x11Pixmap);
>
> But the d->win is always null for the switcher, then we get a critical error,
> and I think that nothing get still deleted on compiz side (as the window sent
> to the decor plugin is an invalid value), so... Wondering if makes sense to
> change this call to avoid errors.

x11Pixmap is only used decor_post_delete_pixmap. Do we need this anymore? We get this pixmap from surface. Is not pixmap deleted/destroyed when cairo_surface_destroy is called?

[Alberts Muktupāvels (muktupavels)]

> What about the context menu issue?

Launching gwd with --gdk-debug=all and then trying to open context menu application is crashing with X Window System error:
The error was 'BadMatch (invalid parameter attributes)'.

Maybe you have some ideas what could cause it? gdb output - http://pastebin.ubuntu.com/7867633/

Most likely this is not problem with libwnck as I tried to create test menu with one item. It did not show up too. :(

[Sam Spilsbury (smspillaz)]

On Sat, Jul 26, 2014 at 11:08 PM, Alberts Muktupāvels <
<email address hidden>> wrote:

> > Another thing: in switcher.c there's something like
> >
> > decor_post_delete_pixmap (xdisplay, wnck_window_get_xid (d->win),
> > d->x11Pixmap);
> >
> > But the d->win is always null for the switcher, then we get a critical
> error,
> > and I think that nothing get still deleted on compiz side (as the window
> sent
> > to the decor plugin is an invalid value), so... Wondering if makes sense
> to
> > change this call to avoid errors.
>
> x11Pixmap is only used decor_post_delete_pixmap. Do we need this anymore?
> We get this pixmap from surface. Is not pixmap deleted/destroyed when
> cairo_surface_destroy is called?
>

It is deleted, but you need to tell compiz about the fact that it has been
deleted so that it can remove it from its own internal cache. This is
basically a synchronisation message to avoid a race condition in compiz
since compiz can't actually know (without doing round-trips all the time)
whether or not the pixmap has actually been destroyed and is safe or unsafe
to bind.

> --
>
> https://code.launchpad.net/~albertsmuktupavels/compiz/gtk-window-decorator-3/+merge/223897
> Your team Compiz Maintainers is subscribed to branch lp:compiz.
>

--
Sam Spilsbury

[Marco Trevisan (Treviño) (3v1n0)]

> > What about the context menu issue?
>
> Launching gwd with --gdk-debug=all and then trying to open context menu
> application is crashing with X Window System error:
> The error was 'BadMatch (invalid parameter attributes)'.
>
> Maybe you have some ideas what could cause it? gdb output -
> http://pastebin.ubuntu.com/7867633/

Mh, not much from that... I'd probably need to enter in a full debug session.

> Most likely this is not problem with libwnck as I tried to create test menu
> with one item. It did not show up too. :(

Mh, weird... We're currently using this in unity as well right now (thought bamf, not to add libwnck dependency in unity itself) and works well. The code involved [1] is much like this one so, I don't see what could cause that. Maybe it might be also related to the WnckWindow, but again I'd need to debug this better.

[1] lp:~3v1n0/bamf/window-action-menu/+merge/206318

[Alberts Muktupāvels (muktupavels)]

> > > What about the context menu issue?
> >
> > Launching gwd with --gdk-debug=all and then trying to open context menu
> > application is crashing with X Window System error:
> > The error was 'BadMatch (invalid parameter attributes)'.
> >
> > Maybe you have some ideas what could cause it? gdb output -
> > http://pastebin.ubuntu.com/7867633/
>
> Mh, not much from that... I'd probably need to enter in a full debug session.
>
> > Most likely this is not problem with libwnck as I tried to create test menu
> > with one item. It did not show up too. :(
>
> Mh, weird... We're currently using this in unity as well right now (thought
> bamf, not to add libwnck dependency in unity itself) and works well. The code
> involved [1] is much like this one so, I don't see what could cause that.
> Maybe it might be also related to the WnckWindow, but again I'd need to debug
> this better.
>
> [1] lp:~3v1n0/bamf/window-action-menu/+merge/206318

Do you have time to debug this?

Today I found that context menu will show if opened with alt + space (without --gdk-debug=all, otherwise it will crash with same error). Seems that it does not work only when trying to open menu with mouse.

Maybe this is related to one of these bugs:
1) https://bugs.launchpad.net/ubuntu/+source/compiz/+bug/948059
2) https://bugs.launchpad.net/compiz-core/+bug/931473

With --gdk-debug=all I see only shadow and then gwd will crash.

Metacity is already merged and in -proposed. Can you merge gtk-window-decorator-2 and gtk-window-decorator-5?

[Alberts Muktupāvels (muktupavels)]

> On Sat, Jul 26, 2014 at 11:08 PM, Alberts Muktupāvels <
> <email address hidden>> wrote:
>
> > > Another thing: in switcher.c there's something like
> > >
> > > decor_post_delete_pixmap (xdisplay, wnck_window_get_xid (d->win),
> > > d->x11Pixmap);
> > >
> > > But the d->win is always null for the switcher, then we get a critical
> > error,
> > > and I think that nothing get still deleted on compiz side (as the window
> > sent
> > > to the decor plugin is an invalid value), so... Wondering if makes sense
> > to
> > > change this call to avoid errors.
> >
> > x11Pixmap is only used decor_post_delete_pixmap. Do we need this anymore?
> > We get this pixmap from surface. Is not pixmap deleted/destroyed when
> > cairo_surface_destroy is called?
> >
>
> It is deleted, but you need to tell compiz about the fact that it has been
> deleted so that it can remove it from its own internal cache. This is
> basically a synchronisation message to avoid a race condition in compiz
> since compiz can't actually know (without doing round-trips all the time)
> whether or not the pixmap has actually been destroyed and is safe or unsafe
> to bind.

Hmm... Ok, it is needed. But now my question is - does it has ever worked as it should? For example update_window_decoration_size function in decorator.c:
1) if d->surface then we destory it
2) if d->x11Pixmap we call decor_post_delete_pixmap
3) and then we do this d->x11Pixmap = cairo_xlib_surface_get_drawable (d->surface); but d->surface is destroyed already. That means d->x11Pixmap is always 0.

So how this should be fixed?
1) Get x11Pixmap from d->surface before destroying it and use it in decor_post_delete_pixmap. Then there is no need to store x11Pixmap in decor_t.
2) Or d->x11Pixmap should be created from surface not d->surface?

[Alberts Muktupāvels (muktupavels)]

Marco could you please reply to my previous comments?

And why lp:compiz is missing some fixes that are applied in lp:compiz/0.9.11?

[Alberts Muktupāvels (muktupavels)]

In revision 3907 I added error trap to fix crash.

Destroying event_windows[i][j].window and button_windows[i].window will every time generate BadWindow error. It is 19 errors every time when remove_frame_window is called.

event_windows and button_windows are created with parent window so most likely these windows are destroyed when parent is destroyed. At least documentation says that XDestroyWindow destroys specified window and all subwindows. But I could not find where and when parent window is destoryed.

[Alberts Muktupāvels (muktupavels)]

> What about the context menu issue?

If I change GButtonPress to GButtonRelease in menu_button_event in events.c then context menu works by clicking on menu icon.

Do you have any idea why it work with GButtonRelease but does not work with GButtonPress?

[Marco Trevisan (Treviño) (3v1n0)]

> Marco could you please reply to my previous comments?

Hi, sorry for the late reply, but I've been in holidays for a while...

> And why lp:compiz is missing some fixes that are applied in lp:compiz/0.9.11?

Mh, what fixes do you mean, specifically?

> > What about the context menu issue?
>
> If I change GButtonPress to GButtonRelease in menu_button_event in events.c
> then context menu works by clicking on menu icon.
>
> Do you have any idea why it work with GButtonRelease but does not work with
> GButtonPress?

Nice debug... This seems a grabbing issue, and in fact just doing something like:
http://pastebin.ubuntu.com/8141775/

Is enough to get things fixed.
This doesn't fix the crash when using --gdk-debug=all, though but it's related to some code inside gdk that is disabled when not debugging (see gdk_x11_window_end_frame, the code inside G_ENABLE_DEBUG #ifdef, that image seems to be a bad window).
I would love to avoid this, but from a quick look I've not been able to see why was that happening, and it doesn't seem harmful.

> Destroying event_windows[i][j].window and button_windows[i].window will every
> time generate BadWindow error. It is 19 errors every time when
> remove_frame_window is called.
>
> event_windows and button_windows are created with parent window so most likely
> these windows are destroyed when parent is destroyed. At least documentation
> says that XDestroyWindow destroys specified window and all subwindows. But I
> could not find where and when parent window is destoryed.

Since the parent window is created by compiz (in the decor plugin), and exported to the window through the _COMPIZ_WINDOW_DECOR_INPUT_FRAME atom, I believe that compiz might destroy that before than the decorator, and thus when the decorator tries to delete its children, then it fails.
I don't think that trapping the errors is a problem here, we just make sure that they get deleted.

[Marco Trevisan (Treviño) (3v1n0)]

> Hmm... Ok, it is needed. But now my question is - does it has ever worked as
> it should? For example update_window_decoration_size function in decorator.c:
> 1) if d->surface then we destory it
> 2) if d->x11Pixmap we call decor_post_delete_pixmap
> 3) and then we do this d->x11Pixmap = cairo_xlib_surface_get_drawable
> (d->surface); but d->surface is destroyed already. That means d->x11Pixmap is
> always 0.

No, on point (3), d->surface is now set to a new surface created above using create_native_surface_and_wrap

As for muting this error, btw I'd use something like http://pastebin.ubuntu.com/8142267/ (as the result won't change).

[Alberts Muktupāvels (muktupavels)]

I fixed context menu issue with your suggestion. But in switcher.c I replaced wnck_window_get_xid (d->win) with 0 as it seems that d->win is always NULL.

Is there someting else that still needs to be fixed for this branch or can we move to metacity part?

About missing fixes - my fault, everything is ok.

[Alberts Muktupāvels (muktupavels)]

Seems that there is still at least one problem. :( After loging in session sometimes decorator will crash. Do you know how to debug this? It is crashing with BadWindow error...

Metacity - https://code.launchpad.net/~albertsmuktupavels/compiz/gtk-window-decorator-4/+merge/224338

[Marco Trevisan (Treviño) (3v1n0)]

A possibility would be to make sure that compiz launches the gdk-widow-decorator using these args:
GDK_SYNCHRONIZE=1 ./gtk-window-decorator then attaching to the process from tty1 as soon as possible.

You might change the path of the decorator to launch in decor plugin settings in ccsm, to a script containing that call (if you don't want to include that env var everywhere), and then from tty1 using "sudo gdb $(pidof gtk-window-decorator)".

It would also possible to launch that decorator from gdbserver using a script with something like:

GDK_SYNCHRONIZE=1 gdbserver :2345 ./file/path/gtk-window-decorator

Then from tty1 you can launch it using:
gdb -q -ex "target remote localhost:2345" -ex "continue" ./file/path/gtk-window-decorator

Although you need to be fast as not sure if things might not fail otherwise.

Another possibility (the safest) would be to make sure that gtk-window-decorator generates a core file when it crashes. In that way you can then load it and debug.

[Marco Trevisan (Treviño) (3v1n0)]

This seems good to go from my POV now (no crashes here), but since you get some crashes, it would be better to squash them. Have you found anything?

review: Approve

[Alberts Muktupāvels (muktupavels)]

> This seems good to go from my POV now (no crashes here), but since you get
> some crashes, it would be better to squash them. Have you found anything?

Unfortunately, no.

[Marco Trevisan (Treviño) (3v1n0)]

No crashes or no way to debug them?

[Alberts Muktupāvels (muktupavels)]

> No crashes or no way to debug them?

I could not find why it is crashing.

[Alberts Muktupāvels (muktupavels)]

Added one more error trap. I have no idea why that part is generation BadWindow error. Looks like this fixes crashes with BadWindow for me. :) Please re-approve if everything looks good.

[lp:~muktupavels/compiz/gtk-window-decorator-3]

3917. By Alberts Muktupāvels on 2014-09-10

Revert 'Don't leak pixmaps' commit.

[Marco Trevisan (Treviño) (3v1n0)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-06-20 06:06:21 +0000
+++ debian/control	2014-09-10 12:50:41 +0000
@@ -20,7 +20,6 @@
                libboost-serialization-dev,
                libglib2.0-dev,
                libglibmm-2.4-dev,
-               libgtk2.0-dev,
                libgtk-3-dev,
                libice-dev (>= 1:1.0.1), 
                libmetacity-dev (>= 1:2.34.0),
@@ -28,7 +27,7 @@
                libpng12-dev | libpng-dev,
                librsvg2-dev, 
                libsm-dev (>= 1:1.0.1),
-               libwnck-dev (>= 1:2.30.7),
+               libwnck-3-dev,
                libx11-dev,
                libxcomposite-dev (>= 1:0.3-2),
                libxext-dev,

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2014-06-14 16:04:23 +0000
+++ gtk/CMakeLists.txt	2014-09-10 12:50:41 +0000
@@ -9,8 +9,8 @@
 if (USE_GTK)
     pkg_check_modules (GTK_WINDOW_DECORATOR
 	xrender>=0.8.4
-	gtk+-2.0>=2.18.0
-	libwnck-1.0
+	gtk+-3.0
+	libwnck-3.0
 	pangocairo
     )
     if (GTK_WINDOW_DECORATOR_FOUND)
@@ -25,15 +25,7 @@
         set (CMAKE_REQUIRED_LIBRARIES "")
 
         if (USE_METACITY)
-            pkg_check_modules (METACITY libmetacity-private)
-            if (METACITY_FOUND)
-		pkg_check_modules (METACITY_3_12_0 libmetacity-private>=3.12.0)
-		if (METACITY_3_12_0_FOUND)
-			compiz_set (USE_METACITY 0)
-		endif (METACITY_3_12_0_FOUND)
-            else (METACITY_FOUND)
 		compiz_set (USE_METACITY 0)
-            endif (METACITY_FOUND)
         endif (USE_METACITY)
 
 	if (USE_GNOME)

=== modified file 'gtk/window-decorator/actionmenu.c'
--- gtk/window-decorator/actionmenu.c	2014-06-12 21:26:33 +0000
+++ gtk/window-decorator/actionmenu.c	2014-09-10 12:50:41 +0000
@@ -78,8 +78,10 @@
 {
     GdkDisplay *gdkdisplay;
     GdkScreen  *screen;
+    Display    *display;
 
     gdkdisplay = gdk_display_get_default ();
+    display    = gdk_x11_display_get_xdisplay (gdkdisplay);
     screen     = gdk_display_get_default_screen (gdkdisplay);
 
     if (action_menu)
@@ -120,6 +122,9 @@
 
     gtk_widget_show (action_menu);
 
+    XUngrabPointer (display, time);
+    XUngrabKeyboard (display, time);
+
     if (!button || button == 1)
     {
 	gtk_menu_popup (GTK_MENU (action_menu),

=== modified file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	2012-10-06 16:11:05 +0000
+++ gtk/window-decorator/blurprops.c	2014-09-10 12:50:41 +0000
@@ -79,7 +79,7 @@
 			 32, PropModeReplace, (guchar *) data,
 			 2 + size * 6);
 	gdk_display_sync (gdk_display_get_default ());
-	gdk_error_trap_pop ();
+	gdk_error_trap_pop_ignored ();
 
 	free (data);
     }
@@ -88,6 +88,6 @@
 	gdk_error_trap_push ();
 	XDeleteProperty (xdisplay, d->prop_xid, win_blur_decor_atom);
 	gdk_display_sync (gdk_display_get_default ());
-	gdk_error_trap_pop ();
+	gdk_error_trap_pop_ignored ();
     }
 }

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2014-06-26 14:43:33 +0000
+++ gtk/window-decorator/cairo.c	2014-09-10 12:50:41 +0000
@@ -295,7 +295,7 @@
 {
     cairo_t       *cr;
     GtkStyle	  *style;
-    GdkDrawable   *drawable;
+    cairo_surface_t *surface;
     decor_color_t color;
     double        alpha;
     double        x1, y1, x2, y2, x, y, h;
@@ -303,10 +303,9 @@
     int		  top;
     int		  button_x;
 
-    if (!d->pixmap)
+    if (!d->surface)
 	return;
 
-
     style = gtk_widget_get_style (d->frame->style_window_rgba);
 
     if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
@@ -317,12 +316,12 @@
     color.g = style->bg[GTK_STATE_NORMAL].green / 65535.0;
     color.b = style->bg[GTK_STATE_NORMAL].blue  / 65535.0;
 
-    if (d->buffer_pixmap)
-	drawable = d->buffer_pixmap;
+    if (d->buffer_surface)
+	surface = d->buffer_surface;
     else
-	drawable = d->pixmap;
+	surface = d->surface;
 
-    cr = gdk_cairo_create (GDK_DRAWABLE (drawable));
+    cr = cairo_create (surface);
     if (!cr)
 	return;
 
@@ -691,8 +690,11 @@
     if (d->frame_window)
     {
 	GdkWindow *gdk_frame_window = gtk_widget_get_window (d->decor_window);
-
-	gtk_image_set_from_pixmap (GTK_IMAGE (d->decor_image), d->pixmap, NULL);
+	GdkPixbuf *pixbuf = gdk_pixbuf_get_from_surface (d->surface, 0, 0, d->width, d->height);
+
+	gtk_image_set_from_pixbuf (GTK_IMAGE (d->decor_image), pixbuf);
+	g_object_unref (pixbuf);
+
 	gtk_window_resize (GTK_WINDOW (d->decor_window), d->width, d->height);
 	gdk_window_move (gdk_frame_window, 0, 0);
 	gdk_window_lower (gdk_frame_window);

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2014-06-12 21:26:33 +0000
+++ gtk/window-decorator/decorator.c	2014-09-10 12:50:41 +0000
@@ -373,7 +373,7 @@
     }
 
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 }
 
 /*
@@ -525,10 +525,10 @@
 	d->icon = NULL;
     }
 
-    if (d->icon_pixmap)
+    if (d->icon_surface)
     {
-	g_object_unref (G_OBJECT (d->icon_pixmap));
-	d->icon_pixmap = NULL;
+	cairo_surface_destroy (d->icon_surface);
+	d->icon_surface = NULL;
     }
 
     if (d->icon_pixbuf)
@@ -544,12 +544,12 @@
 
 	/* 32 bit pixmap on pixmap mode, 24 for reparenting */
 	if (d->frame_window)
-	    d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
-						     d->frame->style_window_rgb);
+	    d->icon_surface = surface_new_from_pixbuf (d->icon_pixbuf,
+	                                               d->frame->style_window_rgb);
 	else
-	    d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
-						     d->frame->style_window_rgba);
-	cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
+	    d->icon_surface = surface_new_from_pixbuf (d->icon_pixbuf,
+	                                               d->frame->style_window_rgba);
+	cr = cairo_create (d->icon_surface);
 	d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
 	cairo_destroy (cr);
     }
@@ -616,7 +616,7 @@
 update_window_decoration_size (WnckWindow *win)
 {
     decor_t           *d;
-    GdkPixmap         *pixmap, *buffer_pixmap = NULL;
+    cairo_surface_t   *surface, *buffer_surface = NULL;
     Picture           picture;
     Display           *xdisplay;
     XRenderPictFormat *format;
@@ -636,52 +636,54 @@
     /* Get the correct depth for the frame window in reparenting mode, otherwise
      * enforce 32 */
     if (d->frame_window)
-	pixmap = create_native_pixmap_and_wrap (d->width, d->height, d->frame->style_window_rgb);
+	surface = create_native_surface_and_wrap (d->width, d->height, d->frame->style_window_rgb);
     else
-	pixmap = create_native_pixmap_and_wrap (d->width, d->height, d->frame->style_window_rgba);
+	surface = create_native_surface_and_wrap (d->width, d->height, d->frame->style_window_rgba);
 
     gdk_flush ();
 
     /* Handle failure */
-    if (!pixmap || gdk_error_trap_pop ())
+    if (!surface || gdk_error_trap_pop ())
     {
-	memset (pixmap, 0, sizeof (*pixmap));
+	if (surface)
+	    cairo_surface_destroy (surface);
 	return FALSE;
     }
 
     gdk_error_trap_push ();
 
     if (d->frame_window)
-	buffer_pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgb);
+	buffer_surface = create_surface (d->width, d->height, d->frame->style_window_rgb);
     else
-	buffer_pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgba);
+	buffer_surface = create_surface (d->width, d->height, d->frame->style_window_rgba);
 
     gdk_flush ();
 
     /* Handle failure */
-    if (!buffer_pixmap || gdk_error_trap_pop ())
+    if (!buffer_surface || gdk_error_trap_pop ())
     {
-	memset (buffer_pixmap, 0, sizeof (*buffer_pixmap));
-	g_object_unref (G_OBJECT (pixmap));
+	if (buffer_surface)
+	    cairo_surface_destroy (buffer_surface);
+	cairo_surface_destroy (surface);
 	return FALSE;
     }
 
     /* Create XRender context */
-    format = get_format_for_drawable (d, GDK_DRAWABLE (buffer_pixmap));
-    picture = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (buffer_pixmap),
+    format = get_format_for_surface (d, buffer_surface);
+    picture = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (buffer_surface),
 				    format, 0, NULL);
 
     /* Destroy the old pixmaps and pictures */
-    if (d->pixmap)
-	g_object_unref (d->pixmap);
+    if (d->surface)
+	cairo_surface_destroy (d->surface);
 
     if (d->x11Pixmap)
 	decor_post_delete_pixmap (xdisplay,
 				  wnck_window_get_xid (d->win),
 				  d->x11Pixmap);
 
-    if (d->buffer_pixmap)
-	g_object_unref (G_OBJECT (d->buffer_pixmap));
+    if (d->buffer_surface)
+	cairo_surface_destroy (d->buffer_surface);
 
     if (d->picture)
 	XRenderFreePicture (xdisplay, d->picture);
@@ -690,10 +692,10 @@
 	cairo_destroy (d->cr);
 
     /* Assign new pixmaps and pictures */
-    d->pixmap	     = pixmap;
-    d->x11Pixmap     = GDK_PIXMAP_XID (d->pixmap);
-    d->buffer_pixmap = buffer_pixmap;
-    d->cr	     = gdk_cairo_create (pixmap);
+    d->surface        = surface;
+    d->x11Pixmap      = cairo_xlib_surface_get_drawable (d->surface);
+    d->buffer_surface = buffer_surface;
+    d->cr             = cairo_create (surface);
 
     d->picture = picture;
 
@@ -725,10 +727,10 @@
 		   void		   *closure)
 {
     static XRenderColor white = { 0xffff, 0xffff, 0xffff, 0xffff };
-    GdkColormap		*colormap;
     decor_t		d;
     decor_shadow_info_t *info = (decor_shadow_info_t *) closure;
     double		save_decoration_alpha;
+    GdkScreen           *screen;
 
     memset (&d, 0, sizeof (d));
 
@@ -747,8 +749,13 @@
 	d.active = TRUE;
     }
 
-    d.pixmap  = gdk_pixmap_foreign_new_for_display (gdk_display_get_default (),
-						    pixmap);
+    screen = gdk_screen_get_default ();
+
+    d.surface = cairo_xlib_surface_create (GDK_SCREEN_XDISPLAY (screen),
+                                           pixmap,
+                                           GDK_VISUAL_XVISUAL (gdk_screen_get_rgba_visual (screen)),
+                                           width,
+                                           height);
     d.width   = width;
     d.height  = height;
     d.active  = TRUE;
@@ -764,9 +771,6 @@
 
     decor_get_default_layout (c, 1, 1, &d.border_layout);
 
-    colormap = get_colormap_for_drawable (GDK_DRAWABLE (d.pixmap));
-    gdk_drawable_set_colormap (d.pixmap, colormap);
-
     /* create shadow from opaque decoration
      * FIXME: Should not modify settings value
      * like this */
@@ -786,7 +790,7 @@
     if (!info)
 	gwd_decor_frame_unref (d.frame);
 
-    g_object_unref (G_OBJECT (d.pixmap));
+    cairo_surface_destroy (d.surface);
 }
 
 
@@ -1396,8 +1400,8 @@
 
         if (default_frames[i].d)
         {
-            if (default_frames[i].d->pixmap)
-                g_object_unref (G_OBJECT (default_frames[i].d->pixmap));
+            if (default_frames[i].d->surface)
+                cairo_surface_destroy (default_frames[i].d->surface);
 
             free (default_frames[i].d);
         }
@@ -1419,9 +1423,9 @@
         extents.top += frame->titlebar_height;
 
         default_frames[i].d->draw = theme_draw_window_decoration;
-	default_frames[i].d->pixmap = create_native_pixmap_and_wrap (default_frames[i].d->width,
-								     default_frames[i].d->height,
-								     frame->style_window_rgba);
+	default_frames[i].d->surface = create_native_surface_and_wrap (default_frames[i].d->width,
+	                                                               default_frames[i].d->height,
+	                                                               frame->style_window_rgba);
 
 	unsigned int j, k;
 
@@ -1439,7 +1443,7 @@
 	    default_frames[i].d->button_states[j] = 0;
 	}
 
-        if (default_frames[i].d->pixmap)
+        if (default_frames[i].d->surface)
         {
             gint	    nQuad;
             unsigned int   frame_type = populate_frame_type (default_frames[i].d);
@@ -1451,12 +1455,12 @@
                                                      &default_frames[i].d->border_layout);
 
             default_frames[i].d->picture = XRenderCreatePicture (xdisplay,
-                                                                          GDK_PIXMAP_XID (default_frames[i].d->pixmap),
-                                                                          xformat_rgba, 0, NULL);
+                                                                 cairo_xlib_surface_get_drawable (default_frames[i].d->surface),
+                                                                 xformat_rgba, 0, NULL);
 
             (*default_frames[i].d->draw) (default_frames[i].d);
 
-            decor_quads_to_property (data, i, GDK_PIXMAP_XID (default_frames[i].d->pixmap),
+            decor_quads_to_property (data, i, cairo_xlib_surface_get_drawable (default_frames[i].d->surface),
                                      &extents, &extents,
                                      &extents, &extents, 0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
         }
@@ -1483,10 +1487,10 @@
 void
 copy_to_front_buffer (decor_t *d)
 {
-    if (!d->buffer_pixmap)
+    if (!d->buffer_surface)
 	return;
 
     cairo_set_operator (d->cr, CAIRO_OPERATOR_SOURCE);
-    gdk_cairo_set_source_pixmap (d->cr, d->buffer_pixmap, 0, 0);
+    cairo_set_source_surface (d->cr, d->buffer_surface, 0, 0);
     cairo_paint (d->cr);
 }

=== modified file 'gtk/window-decorator/decorprops.c'
--- gtk/window-decorator/decorprops.c	2011-10-13 09:53:38 +0000
+++ gtk/window-decorator/decorprops.c	2014-09-10 12:50:41 +0000
@@ -66,7 +66,7 @@
     else
     {
         data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
-        decor_quads_to_property (data, nOffset - 1, GDK_PIXMAP_XID (d->pixmap),
+        decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
 			     &extents, &extents,
 			     &extents, &extents,
 			     ICON_SPACE + d->button_width,
@@ -81,7 +81,7 @@
 		     32, PropModeReplace, (guchar *) data,
 		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     top.rects = &top.extents;
     top.numRects = top.size = 1;
@@ -148,7 +148,7 @@
 						     32);
     
     data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
-    decor_quads_to_property (data, nOffset - 1, GDK_PIXMAP_XID (d->pixmap),
+    decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
 			     &d->frame->win_extents, &d->frame->win_extents,
 			     &d->frame->win_extents, &d->frame->win_extents,
 			     0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
@@ -169,7 +169,7 @@
     XChangeProperty (xdisplay, d->prop_xid, switcher_fg_atom,
 		     XA_INTEGER, 32, PropModeReplace, (guchar *) fgColor, 4);
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     free (data);
 }

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2014-06-12 21:26:33 +0000
+++ gtk/window-decorator/events.c	2014-09-10 12:50:41 +0000
@@ -920,7 +920,8 @@
 	{
 	    if (!wnck_window_get (xevent->xcreatewindow.window))
 	    {
-		GdkWindow *toplevel = create_foreign_window (xevent->xcreatewindow.window);
+		gdk_error_trap_push ();
+		GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display (gdkdisplay, xevent->xcreatewindow.window);
 
 		if (toplevel)
 		{
@@ -933,6 +934,7 @@
 		    if (get_window_prop (xevent->xcreatewindow.window, select_window_atom, &select))
 			update_switcher_window (xevent->xcreatewindow.window, select);
 		}
+	    gdk_error_trap_pop_ignored ();
 	    }
 	}
 	break;
@@ -998,7 +1000,7 @@
 		 xevent->xproperty.atom == compiz_shadow_color_atom)
 	{
 	    GdkScreen  *g_screen = gdk_display_get_default_screen (gdkdisplay);
-	    Window     root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (g_screen));
+	    Window     root = GDK_WINDOW_XID (gdk_screen_get_root_window (g_screen));
 	    WnckScreen *screen;
 
 	    screen = wnck_screen_get_for_root (root);

=== modified file 'gtk/window-decorator/forcequit.c'
--- gtk/window-decorator/forcequit.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/forcequit.c	2014-09-10 12:50:41 +0000
@@ -44,7 +44,7 @@
 				 FALSE, XA_STRING, &type, &format, &nitems,
 				 &bytes_after, &str);
 
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     if (result != Success)
 	return NULL;
@@ -92,7 +92,7 @@
     gdk_error_trap_push ();
     XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win));
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 }
 
 static void
@@ -103,10 +103,10 @@
 
     gdk_error_trap_push ();
     XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-			  GDK_WINDOW_XID (dialog->window),
+			  GDK_WINDOW_XID (gtk_widget_get_window (dialog)),
 			  wnck_window_get_xid (win));
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 }
 
 static void
@@ -134,6 +134,7 @@
     decor_t   *d = g_object_get_data (G_OBJECT (win), "decor");
     GtkWidget *dialog;
     gchar     *str, *tmp;
+    const gchar *message;
 
     if (d->force_quit_dialog)
 	return;
@@ -143,23 +144,17 @@
 
     g_free (tmp);
 
-    dialog = gtk_message_dialog_new (NULL, 0,
-				     GTK_MESSAGE_WARNING,
-				     GTK_BUTTONS_NONE,
-				     "<b>%s</b>\n\n%s",
-				     str,
-				     _("Forcing this application to "
-				     "quit will cause you to lose any "
-				     "unsaved changes."));
+    message = _("Forcing this application to quit will cause you to lose any unsaved changes.");
+    dialog = gtk_message_dialog_new_with_markup (NULL, 0,
+                                                 GTK_MESSAGE_WARNING,
+                                                 GTK_BUTTONS_NONE,
+                                                 "<b>%s</b>\n\n%s",
+                                                 str,
+                                                 message);
     g_free (str);
 
     gtk_window_set_icon_name (GTK_WINDOW (dialog), "force-quit");
 
-    gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-			      TRUE);
-    gtk_label_set_line_wrap (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-			     TRUE);
-
     gtk_dialog_add_buttons (GTK_DIALOG (dialog),
 			    GTK_STOCK_CANCEL,
 			    GTK_RESPONSE_REJECT,
@@ -181,7 +176,7 @@
 
     gtk_widget_realize (dialog);
 
-    gdk_x11_window_set_user_time (dialog->window, timestamp);
+    gdk_x11_window_set_user_time (gtk_widget_get_window (dialog), timestamp);
 
     gtk_widget_show (dialog);
 

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/frames.c	2014-09-10 12:50:41 +0000
@@ -201,7 +201,7 @@
 decor_frame_new (const gchar *type)
 {
     GdkScreen     *gdkscreen = gdk_screen_get_default ();
-    GdkColormap   *colormap;
+    GdkVisual     *visual;
     decor_frame_t *frame = malloc (sizeof (decor_frame_t));
 
     if (!frame)
@@ -224,9 +224,9 @@
 
     frame->style_window_rgba = gtk_window_new (GTK_WINDOW_POPUP);
 
-    colormap = gdk_screen_get_rgba_colormap (gdkscreen);
-    if (colormap)
-	gtk_widget_set_colormap (frame->style_window_rgba, colormap);
+    visual = gdk_screen_get_rgba_visual (gdkscreen);
+    if (visual)
+	gtk_widget_set_visual (frame->style_window_rgba, visual);
 
     gtk_widget_realize (frame->style_window_rgba);
 
@@ -241,9 +241,9 @@
 
     frame->style_window_rgb = gtk_window_new (GTK_WINDOW_POPUP);
 
-    colormap = gdk_screen_get_rgb_colormap (gdkscreen);
-    if (colormap)
-	gtk_widget_set_colormap (frame->style_window_rgb, colormap);
+    visual = gdk_screen_get_system_visual (gdkscreen);
+    if (visual)
+	gtk_widget_set_visual (frame->style_window_rgb, visual);
 
     gtk_widget_realize (frame->style_window_rgb);
 

=== modified file 'gtk/window-decorator/gdk.c'
--- gtk/window-decorator/gdk.c	2013-02-20 03:11:17 +0000
+++ gtk/window-decorator/gdk.c	2014-09-10 12:50:41 +0000
@@ -21,30 +21,31 @@
 
 #include "gtk-window-decorator.h"
 
-GdkPixmap *
-pixmap_new_from_pixbuf (GdkPixbuf *pixbuf, GtkWidget *parent)
+cairo_surface_t *
+surface_new_from_pixbuf (GdkPixbuf *pixbuf,
+                         GtkWidget *parent)
 {
-    GdkPixmap *pixmap;
-    guint     width, height;
-    cairo_t   *cr;
+    cairo_surface_t *surface;
+    guint            width;
+    guint            height;
+    cairo_t         *cr;
 
     width  = gdk_pixbuf_get_width (pixbuf);
     height = gdk_pixbuf_get_height (pixbuf);
 
-    pixmap = create_pixmap (width, height, parent);
-    if (!pixmap)
+    surface = create_surface (width, height, parent);
+    if (!surface)
 	return NULL;
 
-    cr = (cairo_t *) gdk_cairo_create (GDK_DRAWABLE (pixmap));
+    cr = cairo_create (surface);
     gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
     cairo_paint (cr);
     cairo_destroy (cr);
 
-    return pixmap;
+    return surface;
 }
 
-
 void
 gdk_cairo_set_source_color_alpha (cairo_t  *cr,
 				  GdkColor *color,
@@ -61,70 +62,57 @@
 create_gdk_window (Window xframe)
 {
     GdkDisplay  *display = gdk_display_get_default ();
-    GdkScreen   *screen  = gdk_display_get_default_screen (display);
-    GdkWindow   *window  = create_foreign_window (xframe);
-    GdkColormap *cmap    = gdk_screen_get_rgb_colormap (screen);
-
-    gdk_drawable_set_colormap (GDK_DRAWABLE (window), cmap);
+    GdkWindow   *window  = gdk_x11_window_foreign_new_for_display (display, xframe);
 
     return window;
 }
 
-GdkColormap *
-get_colormap_for_drawable (GdkDrawable *d)
-{
-    GdkDisplay *display = gdk_display_get_default ();
-    GdkScreen  *screen  = gdk_display_get_default_screen (display);
-
-    if (gdk_drawable_get_depth (d) == 32)
-	return gdk_screen_get_rgba_colormap (screen);
-
-    return gdk_screen_get_rgb_colormap (screen);
-}
-
 XRenderPictFormat *
-get_format_for_drawable (decor_t *d, GdkDrawable *drawable)
+get_format_for_surface (decor_t         *d,
+                        cairo_surface_t *surface)
 {
-    if (!d->frame_window || gdk_drawable_get_depth (drawable) == 32)
+    if (!d->frame_window || cairo_xlib_surface_get_depth (surface) == 32)
 	return xformat_rgba;
 
     return xformat_rgb;
 }
 
-GdkPixmap *
-create_native_pixmap_and_wrap (int	  w,
-			       int	  h,
-			       GtkWidget *parent_style_window)
+cairo_surface_t *
+create_native_surface_and_wrap (int        w,
+                                int        h,
+                                GtkWidget *parent_style_window)
 {
-    GdkWindow *window;
+    GdkWindow       *window;
+    GdkVisual       *visual;
+    cairo_surface_t *surface;
+    Display         *display;
+    Pixmap           pixmap;
 
     if (w <= 0 || h <= 0)
 	abort ();
 
+    display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
     window = gtk_widget_get_window (parent_style_window);
-    GdkPixmap *pixmap =
-	   gdk_pixmap_foreign_new (XCreatePixmap (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
-						  GDK_WINDOW_XID (window), w, h,
-						  gdk_drawable_get_depth (window)));
-    GdkColormap *cmap = get_colormap_for_drawable (GDK_DRAWABLE (pixmap));
-    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), cmap);
-    return pixmap;
+    visual = gdk_window_get_visual (window);
+    pixmap = XCreatePixmap (display, GDK_WINDOW_XID (window), w, h, gdk_visual_get_depth (visual));
+    surface = cairo_xlib_surface_create (display, pixmap, GDK_VISUAL_XVISUAL (visual), w, h);
+
+    return surface;
 }
 
-GdkPixmap *
-create_pixmap (int	  w,
-	       int	  h,
-	       GtkWidget *parent_style_window)
+cairo_surface_t *
+create_surface (int        w,
+                int        h,
+                GtkWidget *parent_style_window)
 {
-    GdkWindow *window;
+    GdkWindow       *window;
+    cairo_surface_t *surface;
 
     if (w == 0 || h == 0)
 	abort ();
 
     window = gtk_widget_get_window (parent_style_window);
-    GdkPixmap *pixmap = gdk_pixmap_new (GDK_DRAWABLE (window), w, h, -1 /* CopyFromParent */);
+    surface = gdk_window_create_similar_surface (window, CAIRO_CONTENT_COLOR_ALPHA, w, h);
 
-    GdkColormap *cmap = get_colormap_for_drawable (GDK_DRAWABLE (pixmap));
-    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), cmap);
-    return pixmap;
+    return surface;
 }

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2013-05-13 15:39:25 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2014-09-10 12:50:41 +0000
@@ -61,9 +61,6 @@
 
 guint cmdline_options = 0;
 
-GdkPixmap *decor_normal_pixmap = NULL;
-GdkPixmap *decor_active_pixmap = NULL;
-
 Atom frame_input_window_atom;
 Atom frame_output_window_atom;
 Atom win_decor_atom;
@@ -360,7 +357,7 @@
 
     if (!minimal)
     {
-	GdkWindow *root = create_foreign_window (gdk_x11_get_default_root_xwindow ());
+	GdkWindow *root = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), gdk_x11_get_default_root_xwindow ());
 
  	gdk_window_add_filter (NULL,
  			       event_filter_func,
@@ -371,7 +368,7 @@
 
 	for (i = 0; i < nchildren; ++i)
 	{
-	    GdkWindow *toplevel = create_foreign_window  (children[i]);
+	    GdkWindow *toplevel = gdk_x11_window_foreign_new_for_display (gdk_display_get_default (), children[i]);
 
 	    /* Need property notify on all windows */
 

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2014-07-09 10:47:48 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2014-09-10 12:50:41 +0000
@@ -37,30 +37,6 @@
 #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
-
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
@@ -73,7 +49,6 @@
 
 #define WNCK_I_KNOW_THIS_IS_UNSTABLE
 #include <libwnck/libwnck.h>
-#include <libwnck/window-action-menu.h>
 
 #include <cairo.h>
 #include <cairo-xlib.h>
@@ -329,8 +304,8 @@
     Box		      *last_pos_entered;
     guint	      button_states[BUTTON_NUM];
     Pixmap            x11Pixmap;
-    GdkPixmap	      *pixmap;
-    GdkPixmap	      *buffer_pixmap;
+    cairo_surface_t   *surface;
+    cairo_surface_t   *buffer_surface;
     GdkWindow	      *frame_window;
     GtkWidget         *decor_window;
     GtkWidget	      *decor_event_box;
@@ -350,7 +325,7 @@
     PangoLayout	      *layout;
     gchar	      *name;
     cairo_pattern_t   *icon;
-    GdkPixmap	      *icon_pixmap;
+    cairo_surface_t   *icon_surface;
     GdkPixbuf	      *icon_pixbuf;
     WnckWindowState   state;
     WnckWindowActions actions;
@@ -724,24 +699,21 @@
 GdkWindow *
 create_gdk_window (Window xframe);
 
-GdkColormap *
-get_colormap_for_drawable (GdkDrawable *d);
-
 XRenderPictFormat *
-get_format_for_drawable (decor_t *d, GdkDrawable *drawable);
+get_format_for_surface (decor_t *d, cairo_surface_t *surface);
 
-GdkPixmap *
-create_pixmap (int	 w,
+cairo_surface_t *
+create_surface (int	 w,
 	       int	 h,
 	       GtkWidget *parent_style_window);
 
-GdkPixmap *
-create_native_pixmap_and_wrap (int	  w,
+cairo_surface_t *
+create_native_surface_and_wrap (int	  w,
 			       int	  h,
 			       GtkWidget *parent_style_window);
 
-GdkPixmap *
-pixmap_new_from_pixbuf (GdkPixbuf *pixbuf, GtkWidget *parent);
+cairo_surface_t *
+surface_new_from_pixbuf (GdkPixbuf *pixbuf, GtkWidget *parent);
 
 /* metacity.c */
 #ifdef USE_METACITY

=== modified file 'gtk/window-decorator/gwd-settings-notified.h'
--- gtk/window-decorator/gwd-settings-notified.h	2012-10-06 16:11:05 +0000
+++ gtk/window-decorator/gwd-settings-notified.h	2014-09-10 12:50:41 +0000
@@ -21,7 +21,8 @@
 #define _COMPIZ_GWD_SETTINGS_NOTIFIED_H
 
 #include <glib-object.h>
-#include <libwnck/screen.h>
+#define WNCK_I_KNOW_THIS_IS_UNSTABLE
+#include <libwnck/libwnck.h>
 #include <gwd-fwd.h>
 
 G_BEGIN_DECLS

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2014-06-12 21:26:33 +0000
+++ gtk/window-decorator/metacity.c	2014-09-10 12:50:41 +0000
@@ -138,7 +138,7 @@
 		     32, PropModeReplace, (guchar *) data,
 		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     free (data);
 
@@ -773,11 +773,7 @@
 
 	if (d->frame_window)
 	{
-	    GdkColormap *cmap;
-
-	    cmap   = get_colormap_for_drawable (GDK_DRAWABLE (d->pixmap));
 	    pixmap = create_pixmap (size, rect.height, d->frame->style_window_rgb);
-	    gdk_drawable_set_colormap (GDK_DRAWABLE (pixmap), cmap);
 	}
 	else
 	    pixmap = create_pixmap (size, rect.height, d->frame->style_window_rgba);

=== modified file 'gtk/window-decorator/style.c'
--- gtk/window-decorator/style.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/style.c	2014-09-10 12:50:41 +0000
@@ -30,7 +30,7 @@
     style = gtk_widget_get_style (widget);
     g_object_ref (G_OBJECT (style));
     
-    style = gtk_style_attach (style, widget->window);
+    style = gtk_style_attach (style, gtk_widget_get_window (widget));
     
     spot_color.r = style->bg[GTK_STATE_SELECTED].red   / 65535.0;
     spot_color.g = style->bg[GTK_STATE_SELECTED].green / 65535.0;

=== modified file 'gtk/window-decorator/switcher.c'
--- gtk/window-decorator/switcher.c	2013-02-11 17:44:19 +0000
+++ gtk/window-decorator/switcher.c	2014-09-10 12:50:41 +0000
@@ -82,7 +82,7 @@
     unsigned long pixel;
     ushort	  a = SWITCHER_ALPHA;
 
-    if (!d->buffer_pixmap)
+    if (!d->buffer_surface)
 	return;
 
     style = gtk_widget_get_style (d->frame->style_window_rgba);
@@ -91,7 +91,7 @@
     color.g = style->bg[GTK_STATE_NORMAL].green / 65535.0;
     color.b = style->bg[GTK_STATE_NORMAL].blue  / 65535.0;
 
-    cr = gdk_cairo_create (GDK_DRAWABLE (d->buffer_pixmap));
+    cr = cairo_create (d->buffer_surface);
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
@@ -261,7 +261,7 @@
     XClearWindow (xdisplay, d->prop_xid);
 
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     d->prop_xid = 0;
 }
@@ -273,12 +273,12 @@
     GtkStyle	  *style;
     double	  alpha = SWITCHER_ALPHA / 65535.0;
 
-    if (!d->pixmap || !d->buffer_pixmap)
+    if (!d->surface || !d->buffer_surface)
 	return;
 
     style = gtk_widget_get_style (d->frame->style_window_rgba);
 
-    cr = gdk_cairo_create (GDK_DRAWABLE (d->buffer_pixmap));
+    cr = cairo_create (d->buffer_surface);
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
@@ -338,11 +338,11 @@
     if (d->name)
 	g_free (d->name);
 
-    if (d->pixmap)
-	g_object_unref (G_OBJECT (d->pixmap));
+    if (d->surface)
+	cairo_surface_destroy (d->surface);
 
-    if (d->buffer_pixmap)
-	g_object_unref (G_OBJECT (d->buffer_pixmap));
+    if (d->buffer_surface)
+	cairo_surface_destroy (d->buffer_surface);
 
     if (d->cr)
 	cairo_destroy (d->cr);
@@ -375,7 +375,7 @@
 			Window     selected)
 {
     decor_t           *d = switcher_window;
-    GdkPixmap         *pixmap, *buffer_pixmap = NULL;
+    cairo_surface_t   *surface, *buffer_surface = NULL;
     unsigned int      height, width = 0, border, depth;
     int		      x, y;
     Window	      root_return;
@@ -472,27 +472,27 @@
 	switcher_selected_window = selected;
     }
 
-    pixmap = create_native_pixmap_and_wrap (width, height, d->frame->style_window_rgba);
-    if (!pixmap)
+    surface = create_native_surface_and_wrap (width, height, d->frame->style_window_rgba);
+    if (!surface)
 	return FALSE;
 
-    buffer_pixmap = create_pixmap (width, height, d->frame->style_window_rgba);
-    if (!buffer_pixmap)
+    buffer_surface = create_surface (width, height, d->frame->style_window_rgba);
+    if (!buffer_surface)
     {
-	g_object_unref (G_OBJECT (pixmap));
+	cairo_surface_destroy (surface);
 	return FALSE;
     }
 
-    if (d->pixmap)
-	g_object_unref (G_OBJECT (d->pixmap));
+    if (d->surface)
+	cairo_surface_destroy (d->surface);
 
     if (d->x11Pixmap)
 	decor_post_delete_pixmap (xdisplay,
-				  wnck_window_get_xid (d->win),
+				  0,
 				  d->x11Pixmap);
 
-    if (d->buffer_pixmap)
-	g_object_unref (G_OBJECT (d->buffer_pixmap));
+    if (d->buffer_surface)
+	cairo_surface_destroy (d->buffer_surface);
 
     if (d->cr)
 	cairo_destroy (d->cr);
@@ -500,13 +500,13 @@
     if (d->picture)
 	XRenderFreePicture (xdisplay, d->picture);
 
-    d->pixmap	     = pixmap;
-    d->x11Pixmap     = GDK_PIXMAP_XID (d->pixmap);
-    d->buffer_pixmap = buffer_pixmap;
-    d->cr	     = gdk_cairo_create (pixmap);
+    d->surface        = surface;
+    d->x11Pixmap      = cairo_xlib_surface_get_drawable (d->surface);
+    d->buffer_surface = buffer_surface;
+    d->cr             = cairo_create (surface);
 
-    format = get_format_for_drawable (d, GDK_DRAWABLE (d->buffer_pixmap));
-    d->picture = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (buffer_pixmap),
+    format = get_format_for_surface (d, d->buffer_surface);
+    d->picture = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (buffer_surface),
 				       format, 0, NULL);
 
     d->width  = width;

=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2013-05-14 07:07:45 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2014-09-10 12:50:41 +0000
@@ -126,6 +126,7 @@
     compiz_discover_tests (compiz_test_gwd_cairo_decorations COVERAGE
 			   gtk_window_decorator_cairo_window_decoration_util)
 
+    if (METACITY_FOUND)
     add_executable (compiz_test_gwd_metacity_decorations
 		    ${CMAKE_CURRENT_SOURCE_DIR}/test_gwd_metacity_decorations.cpp)
 
@@ -139,5 +140,6 @@
 
     compiz_discover_tests (compiz_test_gwd_metacity_decorations COVERAGE
 			   gtk_window_decorator_metacity_window_decoration_util)
+    endif (METACITY_FOUND)
 
 endif (COMPIZ_TEST_GTK_WINDOW_DECORATOR_FOUND)

=== modified file 'gtk/window-decorator/tooltip.c'
--- gtk/window-decorator/tooltip.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/tooltip.c	2014-09-10 12:50:41 +0000
@@ -130,14 +130,15 @@
 }
 
 static gint
-tooltip_paint_window (GtkWidget *tooltip)
+tooltip_paint_window (GtkWidget *tooltip,
+                      cairo_t   *cr)
 {
     GtkRequisition req;
 
     gtk_widget_size_request (tip_window, &req);
-    gtk_paint_flat_box (tip_window->style, tip_window->window,
+    gtk_paint_flat_box (gtk_widget_get_style (tip_window), cr,
 			GTK_STATE_NORMAL, GTK_SHADOW_OUT,
-			NULL, GTK_WIDGET (tip_window), "tooltip",
+			GTK_WIDGET (tip_window), "tooltip",
 			0, 0, req.width, req.height);
 
     return FALSE;
@@ -153,14 +154,11 @@
     gtk_widget_set_name (tip_window, "gtk-tooltips");
     gtk_container_set_border_width (GTK_CONTAINER (tip_window), 4);
 
-#if GTK_CHECK_VERSION (2, 10, 0)
-    if (!gtk_check_version (2, 10, 0))
-	gtk_window_set_type_hint (GTK_WINDOW (tip_window),
-				  GDK_WINDOW_TYPE_HINT_TOOLTIP);
-#endif
+    gtk_window_set_type_hint (GTK_WINDOW (tip_window),
+                              GDK_WINDOW_TYPE_HINT_TOOLTIP);
 
     g_signal_connect_swapped (tip_window,
-			      "expose_event",
+			      "draw",
 			      G_CALLBACK (tooltip_paint_window),
 			      0);
 

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2013-09-27 16:21:43 +0000
+++ gtk/window-decorator/wnck.c	2014-09-10 12:50:41 +0000
@@ -56,7 +56,7 @@
 					 0L, 1024L, FALSE, XA_ATOM, &actual, &format,
 					 &n, &left, &data);
 	    gdk_flush ();
-	    gdk_error_trap_pop ();
+	    gdk_error_trap_pop_ignored ();
 
 	    if (result == Success && data)
 	    {
@@ -254,7 +254,7 @@
 
     if (action_menu_mapped)
     {
-	gtk_object_destroy (GTK_OBJECT (action_menu));
+	gtk_widget_destroy (action_menu);
 	return;
     }
 
@@ -321,19 +321,11 @@
 
     if (mode)
     {
-	GdkColormap *colormap;
-
 	d->frame_window = create_gdk_window (frame);
 	d->decor_window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-	colormap = get_colormap_for_drawable (GDK_DRAWABLE (d->frame_window));
-
 	d->decor_image = gtk_image_new ();
-
-	gtk_widget_set_colormap (d->decor_window, colormap);
-	gtk_widget_set_colormap (d->decor_image, colormap);
-
 	d->decor_event_box = gtk_event_box_new ();
+
 	gtk_event_box_set_visible_window (GTK_EVENT_BOX (d->decor_event_box),
 					  FALSE);
 	gtk_widget_set_events (d->decor_event_box, GDK_BUTTON_PRESS_MASK |
@@ -465,6 +457,8 @@
     {
 	int i, j;
 
+	gdk_error_trap_push ();
+
 	for (i = 0; i < 3; ++i)
 	{
 	    for (j = 0; j < 3; ++j)
@@ -481,18 +475,20 @@
 
 	    d->button_states[i] = 0;
 	}
-    }
-
-    if (d->pixmap)
-    {
-	g_object_unref (G_OBJECT (d->pixmap));
-	d->pixmap = NULL;
-    }
-
-    if (d->buffer_pixmap)
-    {
-	g_object_unref (G_OBJECT (d->buffer_pixmap));
-	d->buffer_pixmap = NULL;
+
+	gdk_error_trap_pop_ignored ();
+    }
+
+    if (d->surface)
+    {
+	cairo_surface_destroy (d->surface);
+	d->surface = NULL;
+    }
+
+    if (d->buffer_surface)
+    {
+	cairo_surface_destroy (d->buffer_surface);
+	d->buffer_surface = NULL;
     }
 
     if (d->cr)
@@ -525,10 +521,10 @@
 	d->icon = NULL;
     }
 
-    if (d->icon_pixmap)
+    if (d->icon_surface)
     {
-	g_object_unref (G_OBJECT (d->icon_pixmap));
-	d->icon_pixmap = NULL;
+	cairo_surface_destroy (d->icon_surface);
+	d->icon_surface = NULL;
     }
 
     if (d->icon_pixbuf)
@@ -578,7 +574,7 @@
     gdk_error_trap_push ();
     XDeleteProperty (xdisplay, wnck_window_get_xid (win), win_decor_atom);
     gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop ();
+    gdk_error_trap_pop_ignored ();
 
     d->width  = 0;
     d->height = 0;
@@ -690,7 +686,7 @@
 	    if (d->win != NULL &&
 		!request_update_window_decoration_size (d->win) &&
 		d->decorated &&
-		d->pixmap)
+		d->surface)
 		queue_decor_draw (d);
 
 	}
@@ -759,7 +755,7 @@
 	    if (d->win != NULL &&
 		!request_update_window_decoration_size (d->win) &&
 		d->decorated &&
-		d->pixmap)
+		d->surface)
 		queue_decor_draw (d);
 
 	}
@@ -811,9 +807,9 @@
     d->draw = theme_draw_window_decoration;
 
     d->created = FALSE;
-    d->pixmap = NULL;
+    d->surface = NULL;
     d->cr = NULL;
-    d->buffer_pixmap = NULL;
+    d->buffer_surface = NULL;
     d->picture = None;
 
     connect_window (win);