forked from enlightenment/efl
parent
48cd6930f1
commit
6a509fe506
|
@ -813,3 +813,9 @@
|
||||||
* Fix ecore-fb string lookup table to include ctrl+keys
|
* Fix ecore-fb string lookup table to include ctrl+keys
|
||||||
* Fix ecore-fb to trap sigint (ctrl+c) so it doesnt exit your fb app
|
* Fix ecore-fb to trap sigint (ctrl+c) so it doesnt exit your fb app
|
||||||
* Fix ecore-fb mouse to swap button 2 and 3 ro work right.
|
* Fix ecore-fb mouse to swap button 2 and 3 ro work right.
|
||||||
|
|
||||||
|
2012-07-16 Carsten Haitzler (The Rasterman)
|
||||||
|
|
||||||
|
* Fix ecore-x selection handling to fall back to getting
|
||||||
|
selection directly if getting targets fails. This fixes e17 to
|
||||||
|
elm cnp.
|
||||||
|
|
|
@ -1333,7 +1333,15 @@ _ecore_xcb_event_handle_selection_notify(xcb_generic_event_t *event)
|
||||||
format =
|
format =
|
||||||
ecore_x_window_prop_property_get(ev->requestor, ev->property,
|
ecore_x_window_prop_property_get(ev->requestor, ev->property,
|
||||||
XCB_ATOM_ATOM, 32, &data, &num);
|
XCB_ATOM_ATOM, 32, &data, &num);
|
||||||
if (!format) return;
|
if (!format)
|
||||||
|
{
|
||||||
|
/* fallback if targets handling is not working and try get the
|
||||||
|
* selection directly */
|
||||||
|
xcb_convert_selection(_ecore_xcb_conn, ev->requestor,
|
||||||
|
selection, selection,
|
||||||
|
ECORE_X_ATOM_UTF8_STRING, XCB_CURRENT_TIME);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
|
@ -1403,7 +1403,16 @@ _ecore_x_event_handle_selection_notify(XEvent *xevent)
|
||||||
xevent->xselection.property,
|
xevent->xselection.property,
|
||||||
XA_ATOM, 32, &data, &num_ret);
|
XA_ATOM, 32, &data, &num_ret);
|
||||||
if (!format)
|
if (!format)
|
||||||
return;
|
{
|
||||||
|
/* fallback if targets handling is not working and try get the
|
||||||
|
* selection directly */
|
||||||
|
XConvertSelection(_ecore_x_disp, selection,
|
||||||
|
ECORE_X_ATOM_UTF8_STRING,
|
||||||
|
selection,
|
||||||
|
xevent->xselection.requestor,
|
||||||
|
CurrentTime);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue