aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2018-01-24 16:06:29 -0500
committerMike Blumenkrantz <zmike@osg.samsung.com>2018-01-24 16:18:51 -0500
commitb28d6ac5e6fd03de9468c7ade293d7f4b7468168 (patch)
tree48bd25145945fd1ec4144cf5104c4722abd2c4c3
parentecore-x: filter XkbNewKeyboardNotifyEvent before emitting ecore-x event (diff)
downloadefl-b28d6ac5e6fd03de9468c7ade293d7f4b7468168.tar.gz
ecore-x: re-add implementation of ecore_x_connection_get()
this symbol has been missing since the removal of xcb @fix
-rw-r--r--m4/efl_find_x.m41
-rw-r--r--src/lib/ecore_x/ecore_x.c7
-rw-r--r--src/lib/ecore_x/ecore_x_private.h1
3 files changed, 9 insertions, 0 deletions
diff --git a/m4/efl_find_x.m4 b/m4/efl_find_x.m4
index dad401fcf8..8c9f5c3677 100644
--- a/m4/efl_find_x.m4
+++ b/m4/efl_find_x.m4
@@ -120,6 +120,7 @@ AC_DEFUN([EFL_FIND_X],
efl_x11_lib=
fi
done
+ efl_x11_modules="$efl_x11_modules x11-xcb"
PKG_CHECK_EXISTS([$efl_x11_modules],
[
diff --git a/src/lib/ecore_x/ecore_x.c b/src/lib/ecore_x/ecore_x.c
index 51491f4543..81eae65294 100644
--- a/src/lib/ecore_x/ecore_x.c
+++ b/src/lib/ecore_x/ecore_x.c
@@ -2519,6 +2519,13 @@ ecore_x_default_depth_get(Ecore_X_Display *disp,
return depth;
}
+EAPI Ecore_X_Connection *
+ecore_x_connection_get(void)
+{
+ EINA_SAFETY_ON_NULL_RETURN_VAL(_ecore_x_disp, NULL);
+ return XGetXCBConnection(_ecore_x_disp);
+}
+
EAPI void
ecore_x_xkb_select_group(int group)
{
diff --git a/src/lib/ecore_x/ecore_x_private.h b/src/lib/ecore_x/ecore_x_private.h
index 2254f150dc..7374a0d9ee 100644
--- a/src/lib/ecore_x/ecore_x_private.h
+++ b/src/lib/ecore_x/ecore_x_private.h
@@ -7,6 +7,7 @@
#endif /* ifndef MAXHOSTNAMELEN */
#include <X11/Xlib.h>
+#include <X11/Xlib-xcb.h>
#include <X11/Xproto.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>