Re: Split up of xcb-util
On 27.04.2011 08:52, Arnaud Fontaine wrote: Hi, I noticed that the patch does not apply cleanly on master, therefore I have just updated it and attached it to this email. Could you please apply it? Thanks. Also, I have attached to this email a patch against 3.4 branch as I guess some people are still using this branch or for distributions shipping 3.4... Thanks, both patches are pushed now. Let's see how long it takes for someone to complain. :-) Cheers, Uli -- Do you know that books smell like nutmeg or some spice from a foreign land? -- Faber in Fahrenheit 451 -- To unsubscribe, send mail to awesome-devel-unsubscr...@naquadah.org.
Re: Split up of xcb-util
Hi,
I noticed that the patch does not apply cleanly on master, therefore I
have just updated it and attached it to this email. Could you please
apply it? Thanks.
Also, I have attached to this email a patch against 3.4 branch as I
guess some people are still using this branch or for distributions
shipping 3.4...
Cheers,
--
Arnaud Fontaine
From fb91f5fb005b3666cc5f04bae3287cc49338c641 Mon Sep 17 00:00:00 2001
From: Arnaud Fontaine ar...@debian.org
Date: Wed, 27 Apr 2011 13:49:56 +0900
Subject: [PATCH] Update the code following release of xcb-util 0.3.8.
xcb-util is now split into several repositories since 0.3.8. This
release also cleaned up the API a lot, thus update the code
accordingly.
Signed-off-by: Arnaud Fontaine ar...@debian.org
---
awesome.c |2 +-
awesomeConfig.cmake |7 ++---
common/xutil.c |1 -
event.c |2 +-
objects/client.c| 42 ++--
objects/client.h|6 ++--
property.c | 57 ++-
selection.c | 16 +++---
systray.c |2 +-
xwindow.c |2 +-
10 files changed, 68 insertions(+), 69 deletions(-)
diff --git a/awesome.c b/awesome.c
index 9327808..292e3a6 100644
--- a/awesome.c
+++ b/awesome.c
@@ -129,7 +129,7 @@ scan(void)
if(!attr_r || attr_r-override_redirect
|| attr_r-map_state == XCB_MAP_STATE_UNMAPPED
- || state == XCB_WM_STATE_WITHDRAWN)
+ || state == XCB_ICCCM_WM_STATE_WITHDRAWN)
{
geom_wins[i] = NULL;
p_delete(attr_r);
diff --git a/awesomeConfig.cmake b/awesomeConfig.cmake
index aeb0b2b..ff23df9 100644
--- a/awesomeConfig.cmake
+++ b/awesomeConfig.cmake
@@ -126,7 +126,7 @@ execute_process(
# Use pkgconfig to get most of the libraries
pkg_check_modules(AWESOME_COMMON_REQUIRED REQUIRED
-xcb=1.4)
+xcb=1.6)
pkg_check_modules(AWESOME_REQUIRED REQUIRED
glib-2.0
@@ -137,10 +137,9 @@ pkg_check_modules(AWESOME_REQUIRED REQUIRED
xcb-randr
xcb-xtest
xcb-xinerama
-xcb-aux=0.3.0
-xcb-atom=0.3.0
+xcb-util=0.3.8
xcb-keysyms=0.3.4
-xcb-icccm=0.3.6
+xcb-icccm=0.3.8
xcb-image=0.3.0
cairo-xcb
libstartup-notification-1.0=0.10
diff --git a/common/xutil.c b/common/xutil.c
index fd53d9c..8b62da7 100644
--- a/common/xutil.c
+++ b/common/xutil.c
@@ -25,7 +25,6 @@
#include common/util.h
#include xcb/xcb.h
-#include xcb/xcb_atom.h
#include xcb/xcb_icccm.h
#include common/xutil.h
diff --git a/event.c b/event.c
index 7ece36f..4dfe288 100644
--- a/event.c
+++ b/event.c
@@ -619,7 +619,7 @@ event_handle_clientmessage(xcb_client_message_event_t *ev)
client_t *c;
if((c = client_getbywin(ev-window))
ev-format == 32
-ev-data.data32[0] == XCB_WM_STATE_ICONIC)
+ev-data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC)
{
luaA_object_push(globalconf.L, c);
client_set_minimized(globalconf.L, -1, true);
diff --git a/objects/client.c b/objects/client.c
index 53e3df2..f0a9b6d 100644
--- a/objects/client.c
+++ b/objects/client.c
@@ -41,7 +41,7 @@ static void
client_wipe(client_t *c)
{
key_array_wipe(c-keys);
-xcb_get_wm_protocols_reply_wipe(c-protocols);
+xcb_icccm_get_wm_protocols_reply_wipe(c-protocols);
p_delete(c-machine);
p_delete(c-class);
p_delete(c-instance);
@@ -66,20 +66,20 @@ client_set_urgent(lua_State *L, int cidx, bool urgent)
if(c-urgent != urgent)
{
xcb_get_property_cookie_t hints =
-xcb_get_wm_hints_unchecked(globalconf.connection, c-window);
+xcb_icccm_get_wm_hints_unchecked(globalconf.connection, c-window);
c-urgent = urgent;
/* update ICCCM hints */
-xcb_wm_hints_t wmh;
-xcb_get_wm_hints_reply(globalconf.connection, hints, wmh, NULL);
+xcb_icccm_wm_hints_t wmh;
+xcb_icccm_get_wm_hints_reply(globalconf.connection, hints, wmh, NULL);
if(urgent)
-wmh.flags |= XCB_WM_HINT_X_URGENCY;
+wmh.flags |= XCB_ICCCM_WM_HINT_X_URGENCY;
else
-wmh.flags = ~XCB_WM_HINT_X_URGENCY;
+wmh.flags = ~XCB_ICCCM_WM_HINT_X_URGENCY;
-xcb_set_wm_hints(globalconf.connection, c-window, wmh);
+xcb_icccm_set_wm_hints(globalconf.connection, c-window, wmh);
luaA_object_emit_signal(L, cidx, property::urgent, 0);
}
@@ -507,7 +507,7 @@ HANDLE_GEOM(height)
*
* At this stage it's just safer to keep it in normal state and avoid confusion.
*/
-xwindow_set_state(c-window, XCB_WM_STATE_NORMAL);
+xwindow_set_state(c-window, XCB_ICCCM_WM_STATE_NORMAL);
if(!startup)
{
@@ -625,9 +625,9 @@ client_set_minimized(lua_State *L, int cidx, bool s)
c-minimized = s;
banning_need_update();
if(s)
-xwindow_set_state(c-window,
Re: Split up of xcb-util
hi. xcb-util-0.3.8 was released on Apr 25. http://lists.freedesktop.org/archives/xcb/2011-April/006996.html thanks, matsuu 2011/3/7 Arnaud Fontaine arn...@andesi.org: Hi, thanks a lot for the patch, that should save us quite some time. :-) You're welcome. However, I see that xcb-util 0.3.8 isn't released yet. (and there never was a 0.3.7?) I don't think it makes sense to make everyone build xcb-util from git. Is there any ETA for a release? I have just pushed everything, so I want to wait a week before releasing in case someone spots anything wrong. So if everything is fine, it will be released at the end of next week. I should have mentioned in my previous email that, as you pointed out, it does not make much sense to commit the patch I sent before it is released... I also forgot to mention that util-wm now implements EWMH, in addition of ICCCM, so perhaps Awesome could use it too? If I have some time, I will prepare a patch for that. Cheers, Arnaud -- To unsubscribe, send mail to awesome-devel-unsubscr...@naquadah.org. -- To unsubscribe, send mail to awesome-devel-unsubscr...@naquadah.org.
Re: Split up of xcb-util
Hi, hi. xcb-util-0.3.8 was released on Apr 25. http://lists.freedesktop.org/archives/xcb/2011-April/006996.html If you have not already prepared a patch to use xcb-util-wm/ewmh, I will work on it and will send you a patch soonish. Cheers, -- Arnaud Fontaine pgpNE832LKAI4.pgp Description: PGP signature
Re: Split up of xcb-util
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Am 06.03.2011 12:32, Arnaud Fontaine wrote: Hello, I have just sent an email announcing xcb-util split up[0], so here is a patch for Awesome following the split up. Hope that's ok. Hi, thanks a lot for the patch, that should save us quite some time. :-) However, I see that xcb-util 0.3.8 isn't released yet. (and there never was a 0.3.7?) I don't think it makes sense to make everyone build xcb-util from git. Is there any ETA for a release? Cheers, Uli - -- Q: Because it reverses the logical flow of conversation. A: Why is putting a reply at the top of the message frowned upon? -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAEBCAAGBQJNc6PKAAoJECLkKOvLj8sGzFEH/2hc2Pw4BV1lMSumFQ9yw9+6 QzodlEUB+UTatieGZl4ZTYIVA/x9dCqovjUZ4heYONg6RfrCclqOBfnBo1kuZ2RY wlbKCiugMXw0N15J1iGKapOOByJjNanIkGXHL8S6quoFh6slZMTFznNkuJk3dOP3 tFJsEXwivd+w9lwP1VUusErDnLbQy4NUECVDPlA0S0VtFnzrTG0+lvuqFFAs7tjK cVMzBmCXZ4NJdyyrR4M/qUzWLyrfV7jfgTWbPCrOdR8ThX1tId+YKahyFGWMvR+R BLDQubtvjEngTPYS60hr8E5q9hQv0hl3Jr1oi5I5ICSfWu6Os94QyL3tqspC5/M= =ivNn -END PGP SIGNATURE- -- To unsubscribe, send mail to awesome-devel-unsubscr...@naquadah.org.
Re: Split up of xcb-util
Hi, thanks a lot for the patch, that should save us quite some time. :-) You're welcome. However, I see that xcb-util 0.3.8 isn't released yet. (and there never was a 0.3.7?) I don't think it makes sense to make everyone build xcb-util from git. Is there any ETA for a release? I have just pushed everything, so I want to wait a week before releasing in case someone spots anything wrong. So if everything is fine, it will be released at the end of next week. I should have mentioned in my previous email that, as you pointed out, it does not make much sense to commit the patch I sent before it is released... I also forgot to mention that util-wm now implements EWMH, in addition of ICCCM, so perhaps Awesome could use it too? If I have some time, I will prepare a patch for that. Cheers, Arnaud -- To unsubscribe, send mail to awesome-devel-unsubscr...@naquadah.org.
