On Tue, Jul 12, 2011 at 01:10, Christopher Michael
<cpmicha...@comcast.net> wrote:
[…]
> 2) It may not build on your system (tho it builds on all boxes I have
> tried so far).
It doesn't build on my boxes (gentoo and arch linux up-to-date).
I've got xcb 1.7 and it introduced a split up of xcb-util.
I've attached a patch to make ecore_xcb compatible with xcb 1.7.
I haven't committed it since it would break your setup.
--
Boris Faure
diff --git a/ecore/configure.ac b/ecore/configure.ac
index fa7ab9d..5c5ecde 100644
--- a/ecore/configure.ac
+++ b/ecore/configure.ac
@@ -784,7 +784,14 @@ if test "x$want_ecore_x_xcb" = "xyes" ; then
fi
## x11-xcb
- PKG_CHECK_MODULES(XCB, x11-xcb xcb xcb-shm xcb-icccm xcb-image xcb-keysyms,
+ PKG_CHECK_MODULES(XCB,
+ x11-xcb
+ xcb
+ xcb-shm
+ xcb-icccm >= 0.3.8
+ xcb-util >= 0.3.8
+ xcb-image
+ xcb-keysyms,
[ have_ecore_x_xcb="yes"
requirements_ecore_x="x11-xcb xcb xcb-shm xcb-icccm xcb-image xcb-keysyms ${requirements_ecore_x}" ],
[ have_ecore_x_xcb="no" ])
diff --git a/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c b/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
index c58c13c..9f58feb 100644
--- a/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
+++ b/ecore/src/lib/ecore_x/xcb/ecore_xcb_error.c
@@ -67,9 +67,9 @@ _ecore_xcb_error_handle(xcb_generic_error_t *err)
WRN("Got Error:");
WRN("\tEvent: %s", xcb_event_get_request_label(err->major_code));
WRN("\tError: %s", xcb_event_get_error_label(err->error_code));
- if (err->error_code == XCB_EVENT_ERROR_BAD_VALUE)
+ if (err->error_code == XCB_VALUE)
WRN("\tBad Value: %d", ((xcb_value_error_t *)err)->bad_value);
- else if (err->error_code == XCB_EVENT_ERROR_BAD_WINDOW)
+ else if (err->error_code == XCB_WINDOW)
WRN("\tBad Window: %d", ((xcb_window_error_t *)err)->bad_value);
_error_request_code = err->sequence;
diff --git a/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c b/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
index eb2c959..8dbaade 100644
--- a/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
+++ b/ecore/src/lib/ecore_x/xcb/ecore_xcb_events.c
@@ -240,14 +240,14 @@ _ecore_xcb_events_handle(xcb_generic_event_t *ev)
* so trap those cases and ignore. We also ignore BadValue from
* xcb_grab/ungrab_button (happens when we are using any_mod)
* and a few others */
- if (err->error_code == XCB_EVENT_ERROR_BAD_WINDOW) return;
- else if (err->error_code == XCB_EVENT_ERROR_BAD_MATCH)
+ if (err->error_code == XCB_WINDOW) return;
+ else if (err->error_code == XCB_MATCH)
{
if ((err->major_code == XCB_SET_INPUT_FOCUS) ||
(err->major_code == XCB_CONFIGURE_WINDOW))
return;
}
- else if (err->error_code == XCB_EVENT_ERROR_BAD_VALUE)
+ else if (err->error_code == XCB_VALUE)
{
if ((err->major_code == XCB_KILL_CLIENT) ||
(err->major_code == XCB_GRAB_BUTTON) ||
@@ -1628,7 +1628,7 @@ _ecore_xcb_event_handle_client_message(xcb_generic_event_t *event)
ecore_event_add(ECORE_X_EVENT_WINDOW_STATE_REQUEST, e, NULL, NULL);
}
else if ((ev->type == ECORE_X_ATOM_WM_CHANGE_STATE) &&
- (ev->format == 32) && (ev->data.data32[0] == XCB_WM_STATE_ICONIC))
+ (ev->format == 32) && (ev->data.data32[0] == XCB_ICCCM_WM_STATE_ICONIC))
{
Ecore_X_Event_Window_State_Request *e;
diff --git a/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c b/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
index 6c86686..03dd2cb 100644
--- a/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
+++ b/ecore/src/lib/ecore_x/xcb/ecore_xcb_icccm.c
@@ -161,7 +161,7 @@ EAPI char *
ecore_x_icccm_title_get(Ecore_X_Window win)
{
xcb_get_property_cookie_t cookie;
- xcb_get_text_property_reply_t prop;
+ xcb_icccm_get_text_property_reply_t prop;
uint8_t ret = 0;
char *title = NULL;
@@ -169,18 +169,18 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
if (!win) return NULL;
- cookie = xcb_get_wm_name_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_name_reply(_ecore_xcb_conn, cookie, &prop, NULL);
+ cookie = xcb_icccm_get_wm_name_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_name_reply(_ecore_xcb_conn, cookie, &prop, NULL);
if (ret == 0) return NULL;
if (prop.name_len < 1)
{
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return NULL;
}
if (!(title = malloc((prop.name_len + 1) * sizeof(char *))))
{
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return NULL;
}
memcpy(title, prop.name, sizeof(char *) * prop.name_len);
@@ -210,7 +210,7 @@ ecore_x_icccm_title_get(Ecore_X_Window win)
}
}
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return title;
}
@@ -238,13 +238,13 @@ ecore_x_icccm_title_set(Ecore_X_Window win, const char *title)
if (ret)
{
- xcb_set_wm_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING,
+ xcb_icccm_set_wm_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING, 8,
strlen(prop.value), prop.value);
if (prop.value) free(prop.value);
}
else
- xcb_set_wm_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING,
+ xcb_icccm_set_wm_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING, 8,
strlen(title), title);
free(list[0]);
}
@@ -261,7 +261,7 @@ EAPI void
ecore_x_icccm_name_class_get(Ecore_X_Window win, char **name, char **class)
{
xcb_get_property_cookie_t cookie;
- xcb_get_wm_class_reply_t prop;
+ xcb_icccm_get_wm_class_reply_t prop;
uint8_t ret = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -269,14 +269,14 @@ ecore_x_icccm_name_class_get(Ecore_X_Window win, char **name, char **class)
if (name) *name = NULL;
if (class) *class = NULL;
- cookie = xcb_get_wm_class_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_class_reply(_ecore_xcb_conn, cookie, &prop, NULL);
+ cookie = xcb_icccm_get_wm_class_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_class_reply(_ecore_xcb_conn, cookie, &prop, NULL);
if (ret == 0) return;
if (name) *name = strdup(prop.instance_name);
if (class) *class = strdup(prop.class_name);
- xcb_get_wm_class_reply_wipe(&prop);
+ xcb_icccm_get_wm_class_reply_wipe(&prop);
}
/**
@@ -361,8 +361,8 @@ ecore_x_icccm_transient_for_get(Ecore_X_Window win)
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- cookie = xcb_get_wm_transient_for_unchecked(_ecore_xcb_conn, win);
- xcb_get_wm_transient_for_reply(_ecore_xcb_conn, cookie, &forwin, NULL);
+ cookie = xcb_icccm_get_wm_transient_for_unchecked(_ecore_xcb_conn, win);
+ xcb_icccm_get_wm_transient_for_reply(_ecore_xcb_conn, cookie, &forwin, NULL);
return forwin;
}
@@ -454,13 +454,13 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
prop = (uint8_t *)xcb_get_property_value(reply);
switch (prop[0])
{
- case XCB_WM_STATE_WITHDRAWN:
+ case XCB_ICCCM_WM_STATE_WITHDRAWN:
hint = ECORE_X_WINDOW_STATE_HINT_WITHDRAWN;
break;
- case XCB_WM_STATE_NORMAL:
+ case XCB_ICCCM_WM_STATE_NORMAL:
hint = ECORE_X_WINDOW_STATE_HINT_NORMAL;
break;
- case XCB_WM_STATE_ICONIC:
+ case XCB_ICCCM_WM_STATE_ICONIC:
hint = ECORE_X_WINDOW_STATE_HINT_ICONIC;
break;
default:
@@ -474,22 +474,22 @@ ecore_x_icccm_state_get(Ecore_X_Window win)
EAPI void
ecore_x_icccm_state_set(Ecore_X_Window win, Ecore_X_Window_State_Hint state)
{
- xcb_wm_hints_t hints;
+ xcb_icccm_wm_hints_t hints;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- xcb_wm_hints_set_none(&hints);
+ xcb_icccm_wm_hints_set_none(&hints);
- hints.flags = XCB_WM_HINT_STATE;
+ hints.flags = XCB_ICCCM_WM_HINT_STATE;
if (state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN)
- xcb_wm_hints_set_withdrawn(&hints);
+ xcb_icccm_wm_hints_set_withdrawn(&hints);
else if (state == ECORE_X_WINDOW_STATE_HINT_NORMAL)
- xcb_wm_hints_set_normal(&hints);
+ xcb_icccm_wm_hints_set_normal(&hints);
else if (state == ECORE_X_WINDOW_STATE_HINT_ICONIC)
- xcb_wm_hints_set_iconic(&hints);
+ xcb_icccm_wm_hints_set_iconic(&hints);
- xcb_set_wm_hints(_ecore_xcb_conn, win, &hints);
+ xcb_icccm_set_wm_hints(_ecore_xcb_conn, win, &hints);
}
EAPI void
@@ -504,34 +504,34 @@ ecore_x_icccm_delete_window_send(Ecore_X_Window win, Ecore_X_Time t)
EAPI void
ecore_x_icccm_hints_set(Ecore_X_Window win, Eina_Bool accepts_focus, Ecore_X_Window_State_Hint initial_state, Ecore_X_Pixmap icon_pixmap, Ecore_X_Pixmap icon_mask, Ecore_X_Window icon_window, Ecore_X_Window window_group, Eina_Bool is_urgent)
{
- xcb_wm_hints_t hints;
+ xcb_icccm_wm_hints_t hints;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- xcb_wm_hints_set_none(&hints);
- xcb_wm_hints_set_input(&hints, accepts_focus);
+ xcb_icccm_wm_hints_set_none(&hints);
+ xcb_icccm_wm_hints_set_input(&hints, accepts_focus);
if (initial_state == ECORE_X_WINDOW_STATE_HINT_WITHDRAWN)
- xcb_wm_hints_set_withdrawn(&hints);
+ xcb_icccm_wm_hints_set_withdrawn(&hints);
else if (initial_state == ECORE_X_WINDOW_STATE_HINT_NORMAL)
- xcb_wm_hints_set_normal(&hints);
+ xcb_icccm_wm_hints_set_normal(&hints);
else if (initial_state == ECORE_X_WINDOW_STATE_HINT_ICONIC)
- xcb_wm_hints_set_iconic(&hints);
+ xcb_icccm_wm_hints_set_iconic(&hints);
- if (icon_pixmap != 0) xcb_wm_hints_set_icon_pixmap(&hints, icon_pixmap);
- if (icon_mask != 0) xcb_wm_hints_set_icon_mask(&hints, icon_mask);
- if (icon_window != 0) xcb_wm_hints_set_icon_window(&hints, icon_window);
- if (window_group != 0) xcb_wm_hints_set_window_group(&hints, window_group);
- if (is_urgent) xcb_wm_hints_set_urgency(&hints);
+ if (icon_pixmap != 0) xcb_icccm_wm_hints_set_icon_pixmap(&hints, icon_pixmap);
+ if (icon_mask != 0) xcb_icccm_wm_hints_set_icon_mask(&hints, icon_mask);
+ if (icon_window != 0) xcb_icccm_wm_hints_set_icon_window(&hints, icon_window);
+ if (window_group != 0) xcb_icccm_wm_hints_set_window_group(&hints, window_group);
+ if (is_urgent) xcb_icccm_wm_hints_set_urgency(&hints);
- xcb_set_wm_hints(_ecore_xcb_conn, win, &hints);
+ xcb_icccm_set_wm_hints(_ecore_xcb_conn, win, &hints);
}
EAPI Eina_Bool
ecore_x_icccm_hints_get(Ecore_X_Window win, Eina_Bool *accepts_focus, Ecore_X_Window_State_Hint *initial_state, Ecore_X_Pixmap *icon_pixmap, Ecore_X_Pixmap *icon_mask, Ecore_X_Window *icon_window, Ecore_X_Window *window_group, Eina_Bool *is_urgent)
{
xcb_get_property_cookie_t cookie;
- xcb_wm_hints_t hints;
+ xcb_icccm_wm_hints_t hints;
uint8_t ret = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
@@ -544,12 +544,12 @@ ecore_x_icccm_hints_get(Ecore_X_Window win, Eina_Bool *accepts_focus, Ecore_X_Wi
if (window_group) *window_group = 0;
if (is_urgent) *is_urgent = EINA_FALSE;
- xcb_wm_hints_set_none(&hints);
- cookie = xcb_get_wm_hints_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
+ xcb_icccm_wm_hints_set_none(&hints);
+ cookie = xcb_icccm_get_wm_hints_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
if (!ret) return EINA_FALSE;
- if ((hints.flags & XCB_WM_HINT_INPUT) && (accepts_focus))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_INPUT) && (accepts_focus))
{
if (hints.input)
*accepts_focus = EINA_TRUE;
@@ -557,29 +557,29 @@ ecore_x_icccm_hints_get(Ecore_X_Window win, Eina_Bool *accepts_focus, Ecore_X_Wi
*accepts_focus = EINA_FALSE;
}
- if ((hints.flags & XCB_WM_HINT_STATE) && (initial_state))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_STATE) && (initial_state))
{
- if (hints.initial_state == XCB_WM_STATE_WITHDRAWN)
+ if (hints.initial_state == XCB_ICCCM_WM_STATE_WITHDRAWN)
*initial_state = ECORE_X_WINDOW_STATE_HINT_WITHDRAWN;
- else if (hints.initial_state == XCB_WM_STATE_NORMAL)
+ else if (hints.initial_state == XCB_ICCCM_WM_STATE_NORMAL)
*initial_state = ECORE_X_WINDOW_STATE_HINT_NORMAL;
- else if (hints.initial_state == XCB_WM_STATE_ICONIC)
+ else if (hints.initial_state == XCB_ICCCM_WM_STATE_ICONIC)
*initial_state = ECORE_X_WINDOW_STATE_HINT_ICONIC;
}
- if ((hints.flags & XCB_WM_HINT_ICON_PIXMAP) && (icon_pixmap))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_ICON_PIXMAP) && (icon_pixmap))
*icon_pixmap = hints.icon_pixmap;
- if ((hints.flags & XCB_WM_HINT_ICON_MASK) && (icon_mask))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_ICON_MASK) && (icon_mask))
*icon_mask = hints.icon_mask;
- if ((hints.flags & XCB_WM_HINT_ICON_WINDOW) && (icon_window))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_ICON_WINDOW) && (icon_window))
*icon_window = hints.icon_window;
- if ((hints.flags & XCB_WM_HINT_WINDOW_GROUP) && (window_group))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_WINDOW_GROUP) && (window_group))
*window_group = hints.window_group;
- if ((hints.flags & XCB_WM_HINT_X_URGENCY) && (is_urgent))
+ if ((hints.flags & XCB_ICCCM_WM_HINT_X_URGENCY) && (is_urgent))
*is_urgent = EINA_TRUE;
return EINA_TRUE;
@@ -596,7 +596,7 @@ EAPI char *
ecore_x_icccm_icon_name_get(Ecore_X_Window win)
{
xcb_get_property_cookie_t cookie;
- xcb_get_text_property_reply_t prop;
+ xcb_icccm_get_text_property_reply_t prop;
uint8_t ret = 0;
char *tmp = NULL;
@@ -604,19 +604,19 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win)
if (!win) return NULL;
- cookie = xcb_get_wm_icon_name_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_icon_name_reply(_ecore_xcb_conn, cookie, &prop, NULL);
+ cookie = xcb_icccm_get_wm_icon_name_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_icon_name_reply(_ecore_xcb_conn, cookie, &prop, NULL);
if (ret == 0) return NULL;
if (prop.name_len < 1)
{
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return NULL;
}
if (!(tmp = malloc((prop.name_len + 1) * sizeof(char *))))
{
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return NULL;
}
memcpy(tmp, prop.name, sizeof(char *) * prop.name_len);
@@ -646,7 +646,7 @@ ecore_x_icccm_icon_name_get(Ecore_X_Window win)
}
}
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return tmp;
}
@@ -681,14 +681,14 @@ ecore_x_icccm_icon_name_set(Ecore_X_Window win, const char *name)
if (ret)
{
- xcb_set_wm_icon_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING,
- strlen(prop.value), prop.value);
+ xcb_icccm_set_wm_icon_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING,
+ 8, strlen(prop.value), prop.value);
if (prop.value) free(prop.value);
}
else
- xcb_set_wm_icon_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING,
- strlen(name), name);
+ xcb_icccm_set_wm_icon_name(_ecore_xcb_conn, win, ECORE_X_ATOM_STRING, 8,
+ strlen(name), name);
free(list[0]);
}
@@ -709,7 +709,7 @@ ecore_x_icccm_iconic_request_send(Ecore_X_Window win, Ecore_X_Window root)
ev.format = 32;
ev.window = win;
ev.type = ECORE_X_ATOM_WM_CHANGE_STATE;
- ev.data.data32[0] = XCB_WM_STATE_ICONIC;
+ ev.data.data32[0] = XCB_ICCCM_WM_STATE_ICONIC;
xcb_send_event(_ecore_xcb_conn, 0, root,
(XCB_EVENT_MASK_SUBSTRUCTURE_NOTIFY |
@@ -728,15 +728,15 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, Ecore_X_WM_Protocol protocol, Ein
{
Ecore_X_Atom proto;
xcb_get_property_cookie_t cookie;
- xcb_get_wm_protocols_reply_t protos;
+ xcb_icccm_get_wm_protocols_reply_t protos;
int i = 0, count = 0, set = 0;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return;
proto = _ecore_xcb_atoms_wm_protocol[protocol];
- cookie = xcb_get_wm_protocols_unchecked(_ecore_xcb_conn, win, proto);
- if (!xcb_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos, NULL))
+ cookie = xcb_icccm_get_wm_protocols_unchecked(_ecore_xcb_conn, win, proto);
+ if (!xcb_icccm_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos, NULL))
count = 0;
else
count = protos.atoms_len;
@@ -762,9 +762,9 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, Ecore_X_WM_Protocol protocol, Ein
for (i = 0; i < count; i++)
atoms[i] = protos.atoms[i];
atoms[count] = proto;
- xcb_set_wm_protocols(_ecore_xcb_conn,
- ECORE_X_ATOM_WM_PROTOCOLS,
- win, count, atoms);
+ xcb_icccm_set_wm_protocols(_ecore_xcb_conn,
+ ECORE_X_ATOM_WM_PROTOCOLS,
+ win, count, atoms);
free(atoms);
}
}
@@ -782,9 +782,10 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, Ecore_X_WM_Protocol protocol, Ein
for (j = (i + 1); j < count; j++)
protos.atoms[j - 1] = protos.atoms[j];
if (count > 1)
- xcb_set_wm_protocols(_ecore_xcb_conn,
- ECORE_X_ATOM_WM_PROTOCOLS,
- win, count - 1, protos.atoms);
+ xcb_icccm_set_wm_protocols(_ecore_xcb_conn,
+ ECORE_X_ATOM_WM_PROTOCOLS,
+ win, count - 1,
+ protos.atoms);
else
ecore_x_window_prop_property_del(win,
ECORE_X_ATOM_WM_PROTOCOLS);
@@ -794,7 +795,7 @@ ecore_x_icccm_protocol_set(Ecore_X_Window win, Ecore_X_WM_Protocol protocol, Ein
}
}
- xcb_get_wm_protocols_reply_wipe(&protos);
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
}
/**
@@ -809,7 +810,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol)
Ecore_X_Atom proto;
Eina_Bool ret = EINA_FALSE;
xcb_get_property_cookie_t cookie;
- xcb_get_wm_protocols_reply_t reply;
+ xcb_icccm_get_wm_protocols_reply_t reply;
uint8_t val = 0;
unsigned int i = 0;
@@ -818,8 +819,8 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol)
if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return EINA_FALSE;
proto = _ecore_xcb_atoms_wm_protocol[protocol];
- cookie = xcb_get_wm_protocols_unchecked(_ecore_xcb_conn, win, proto);
- val = xcb_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &reply, NULL);
+ cookie = xcb_icccm_get_wm_protocols_unchecked(_ecore_xcb_conn, win, proto);
+ val = xcb_icccm_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &reply, NULL);
if (!val) return EINA_FALSE;
for (i = 0; i < reply.atoms_len; i++)
@@ -829,7 +830,7 @@ ecore_x_icccm_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol protocol)
break;
}
- xcb_get_wm_protocols_reply_wipe(&reply);
+ xcb_icccm_get_wm_protocols_reply_wipe(&reply);
return ret;
}
@@ -845,8 +846,8 @@ ecore_x_icccm_protocol_atoms_set(Ecore_X_Window win, Ecore_X_Atom *protos, int n
LOGFN(__FILE__, __LINE__, __FUNCTION__);
if (num > 0)
- xcb_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS,
- win, num, protos);
+ xcb_icccm_set_wm_protocols(_ecore_xcb_conn, ECORE_X_ATOM_WM_PROTOCOLS,
+ win, num, protos);
else
ecore_x_window_prop_property_del(win, ECORE_X_ATOM_WM_PROTOCOLS);
@@ -879,28 +880,28 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, Eina_Bool *request_pos, Eco
if (min_aspect) *min_aspect = mina;
if (max_aspect) *max_aspect = maxa;
- cookie = xcb_get_wm_normal_hints_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_normal_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
+ cookie = xcb_icccm_get_wm_normal_hints_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_normal_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
if (!ret) return EINA_FALSE;
- if ((hints.flags & XCB_SIZE_HINT_US_POSITION) ||
- (hints.flags & XCB_SIZE_HINT_P_POSITION))
+ if ((hints.flags & XCB_ICCCM_SIZE_HINT_US_POSITION) ||
+ (hints.flags & XCB_ICCCM_SIZE_HINT_P_POSITION))
{
if (request_pos) *request_pos = EINA_TRUE;
}
- if (hints.flags & XCB_SIZE_HINT_P_WIN_GRAVITY)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_WIN_GRAVITY)
{
if (gravity) *gravity = hints.win_gravity;
}
- if (hints.flags & XCB_SIZE_HINT_P_MIN_SIZE)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MIN_SIZE)
{
minw = hints.min_width;
minh = hints.min_height;
}
- if (hints.flags & XCB_SIZE_HINT_P_MAX_SIZE)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_MAX_SIZE)
{
maxw = hints.max_width;
maxh = hints.max_height;
@@ -908,7 +909,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, Eina_Bool *request_pos, Eco
if (maxh < minh) maxh = minh;
}
- if (hints.flags & XCB_SIZE_HINT_BASE_SIZE)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_BASE_SIZE)
{
basew = hints.base_width;
baseh = hints.base_height;
@@ -916,7 +917,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, Eina_Bool *request_pos, Eco
if (baseh > minh) minh = baseh;
}
- if (hints.flags & XCB_SIZE_HINT_P_RESIZE_INC)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_RESIZE_INC)
{
stepx = hints.width_inc;
stepy = hints.height_inc;
@@ -924,7 +925,7 @@ ecore_x_icccm_size_pos_hints_get(Ecore_X_Window win, Eina_Bool *request_pos, Eco
if (stepy < 1) stepy = 1;
}
- if (hints.flags & XCB_SIZE_HINT_P_ASPECT)
+ if (hints.flags & XCB_ICCCM_SIZE_HINT_P_ASPECT)
{
if (hints.min_aspect_den > 0)
mina = ((double)hints.min_aspect_num) / ((double)hints.min_aspect_den);
@@ -956,30 +957,30 @@ ecore_x_icccm_size_pos_hints_set(Ecore_X_Window win, Eina_Bool request_pos, Ecor
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- cookie = xcb_get_wm_normal_hints_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_normal_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
+ cookie = xcb_icccm_get_wm_normal_hints_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_normal_hints_reply(_ecore_xcb_conn, cookie, &hints, NULL);
if (!ret) memset(&hints, 0, sizeof(xcb_size_hints_t));
hints.flags = 0;
if (request_pos)
- hints.flags |= XCB_SIZE_HINT_US_POSITION;
+ hints.flags |= XCB_ICCCM_SIZE_HINT_US_POSITION;
if (gravity != ECORE_X_GRAVITY_NW)
- xcb_size_hints_set_win_gravity(&hints, gravity);
+ xcb_icccm_size_hints_set_win_gravity(&hints, gravity);
if ((min_w > 0) || (min_h > 0))
- xcb_size_hints_set_min_size(&hints, min_w, min_h);
+ xcb_icccm_size_hints_set_min_size(&hints, min_w, min_h);
if ((max_w > 0) || (max_h > 0))
- xcb_size_hints_set_max_size(&hints, max_w, max_h);
+ xcb_icccm_size_hints_set_max_size(&hints, max_w, max_h);
if ((base_w > 0) || (base_h > 0))
- xcb_size_hints_set_base_size(&hints, base_w, base_h);
+ xcb_icccm_size_hints_set_base_size(&hints, base_w, base_h);
if ((step_x > 1) || (step_y > 1))
- xcb_size_hints_set_resize_inc(&hints, step_x, step_y);
+ xcb_icccm_size_hints_set_resize_inc(&hints, step_x, step_y);
if ((min_aspect > 0.0) || (max_aspect > 0.0))
- xcb_size_hints_set_aspect(&hints,
+ xcb_icccm_size_hints_set_aspect(&hints,
(int32_t)(min_aspect * 10000), 10000,
(int32_t)(max_aspect * 10000), 10000);
- xcb_set_wm_normal_hints(_ecore_xcb_conn, win, &hints);
+ xcb_icccm_set_wm_normal_hints(_ecore_xcb_conn, win, &hints);
}
EAPI void
@@ -1019,26 +1020,26 @@ EAPI char *
ecore_x_icccm_client_machine_get(Ecore_X_Window win)
{
xcb_get_property_cookie_t cookie;
- xcb_get_text_property_reply_t prop;
+ xcb_icccm_get_text_property_reply_t prop;
uint8_t ret = 0;
char *tmp = NULL;
LOGFN(__FILE__, __LINE__, __FUNCTION__);
- cookie = xcb_get_wm_client_machine_unchecked(_ecore_xcb_conn, win);
- ret = xcb_get_wm_client_machine_reply(_ecore_xcb_conn, cookie, &prop, NULL);
+ cookie = xcb_icccm_get_wm_client_machine_unchecked(_ecore_xcb_conn, win);
+ ret = xcb_icccm_get_wm_client_machine_reply(_ecore_xcb_conn, cookie, &prop, NULL);
if (ret == 0) return NULL;
tmp = malloc((prop.name_len + 1) * sizeof(char *));
if (!tmp)
{
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return NULL;
}
memcpy(tmp, prop.name, sizeof(char *) * prop.name_len);
tmp[prop.name_len] = '\0';
- xcb_get_text_property_reply_wipe(&prop);
+ xcb_icccm_get_text_property_reply_wipe(&prop);
return tmp;
}
diff --git a/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c b/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
index 9961d45..27d0222 100644
--- a/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
+++ b/ecore/src/lib/ecore_x/xcb/ecore_xcb_window_prop.c
@@ -339,9 +339,9 @@ ecore_x_window_prop_property_get(Ecore_X_Window win, Ecore_X_Atom property, Ecor
if (win == 0)
win = ((xcb_screen_t *)_ecore_xcb_screen)->root;
- cookie =
- xcb_get_property_unchecked(_ecore_xcb_conn, 0, win,
- property, type, 0, LONG_MAX);
+ cookie =
+ xcb_get_property_unchecked(_ecore_xcb_conn, 0, win,
+ property, type, 0, UINT32_MAX);
reply = xcb_get_property_reply(_ecore_xcb_conn, cookie, NULL);
if (!reply) return 0;
if ((reply->format != size) || (reply->value_len == 0))
@@ -507,7 +507,7 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol proto
{
Eina_Bool ret = EINA_FALSE;
Ecore_X_Atom proto;
- xcb_get_wm_protocols_reply_t protos;
+ xcb_icccm_get_wm_protocols_reply_t protos;
xcb_get_property_cookie_t cookie;
uint8_t reply;
uint32_t count = 0, i = 0;
@@ -517,9 +517,10 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol proto
if (protocol >= ECORE_X_WM_PROTOCOL_NUM) return EINA_FALSE;
proto = _ecore_xcb_atoms_wm_protocol[protocol];
- cookie = xcb_get_wm_protocols_unchecked(_ecore_xcb_conn, win,
- ECORE_X_ATOM_WM_PROTOCOLS);
- reply = xcb_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos, NULL);
+ cookie = xcb_icccm_get_wm_protocols_unchecked(_ecore_xcb_conn, win,
+ ECORE_X_ATOM_WM_PROTOCOLS);
+ reply = xcb_icccm_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos,
+ NULL);
if (!reply) return EINA_FALSE;
count = protos.atoms_len;
@@ -532,14 +533,14 @@ ecore_x_window_prop_protocol_isset(Ecore_X_Window win, Ecore_X_WM_Protocol proto
}
}
- xcb_get_wm_protocols_reply_wipe(&protos);
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
return ret;
}
EAPI Ecore_X_WM_Protocol *
ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, int *num_ret)
{
- xcb_get_wm_protocols_reply_t protos;
+ xcb_icccm_get_wm_protocols_reply_t protos;
xcb_get_property_cookie_t cookie;
uint8_t reply;
uint32_t count = 0, i = 0;
@@ -551,22 +552,23 @@ ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, int *num_ret)
*num_ret = 0;
- cookie = xcb_get_wm_protocols_unchecked(_ecore_xcb_conn, win,
+ cookie = xcb_icccm_get_wm_protocols_unchecked(_ecore_xcb_conn, win,
ECORE_X_ATOM_WM_PROTOCOLS);
- reply = xcb_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos, NULL);
+ reply = xcb_icccm_get_wm_protocols_reply(_ecore_xcb_conn, cookie, &protos,
+ NULL);
if (!reply) return NULL;
count = protos.atoms_len;
if (count <= 0)
{
- xcb_get_wm_protocols_reply_wipe(&protos);
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
return NULL;
}
prot_ret = calloc(1, count * sizeof(Ecore_X_WM_Protocol));
if (!prot_ret)
{
- xcb_get_wm_protocols_reply_wipe(&protos);
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
return NULL;
}
@@ -584,7 +586,7 @@ ecore_x_window_prop_protocol_list_get(Ecore_X_Window win, int *num_ret)
if (num_ret) *num_ret = count;
- xcb_get_wm_protocols_reply_wipe(&protos);
+ xcb_icccm_get_wm_protocols_reply_wipe(&protos);
return prot_ret;
}
------------------------------------------------------------------------------
Got Input? Slashdot Needs You.
Take our quick survey online. Come on, we don't ask for help often.
Plus, you'll get a chance to win $100 to spend on ThinkGeek.
http://p.sf.net/sfu/slashdot-survey
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
