forked from enlightenment/enlightenment
E Comp (wayland): Rename HAVE_WAYLAND to HAVE_WAYLAND_CLIENTS so there
is no confusion wrt the "wayland only" version of e17. SVN revision: 67636
This commit is contained in:
parent
75b6d29ad6
commit
3e337912bd
12
configure.ac
12
configure.ac
|
@ -727,7 +727,7 @@ define([CHECK_MODULE_OFONO],
|
||||||
AC_SUBST(EOFONO_CFLAGS)
|
AC_SUBST(EOFONO_CFLAGS)
|
||||||
AC_SUBST(EOFONO_LIBS)
|
AC_SUBST(EOFONO_LIBS)
|
||||||
|
|
||||||
have_wayland=no
|
have_wayland_clients=no
|
||||||
AC_ARG_ENABLE([wayland-clients],
|
AC_ARG_ENABLE([wayland-clients],
|
||||||
AS_HELP_STRING([--enable-wayland-clients],[enable wayland clients in composite module @<:@default=disabled@:>@]),
|
AS_HELP_STRING([--enable-wayland-clients],[enable wayland clients in composite module @<:@default=disabled@:>@]),
|
||||||
[e_cv_want_wayland_clients=$enableval],
|
[e_cv_want_wayland_clients=$enableval],
|
||||||
|
@ -739,15 +739,15 @@ AC_MSG_RESULT([${e_cv_want_wayland_clients}])
|
||||||
if test "x$e_cv_want_wayland_clients" != "xno";then
|
if test "x$e_cv_want_wayland_clients" != "xno";then
|
||||||
PKG_CHECK_MODULES([WAYLAND], [wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image],
|
PKG_CHECK_MODULES([WAYLAND], [wayland-server egl >= 7.10 glesv2 gl pixman-1 xcb-image],
|
||||||
[
|
[
|
||||||
have_wayland=yes
|
have_wayland_clients=yes
|
||||||
AC_DEFINE_UNQUOTED([HAVE_WAYLAND],[1],[enable wayland client support])
|
AC_DEFINE_UNQUOTED([HAVE_WAYLAND_CLIENTS],[1],[enable wayland client support])
|
||||||
],
|
],
|
||||||
[have_wayland=no])
|
[have_wayland_clients=no])
|
||||||
else
|
else
|
||||||
have_wayland=no
|
have_wayland_clients=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
AM_CONDITIONAL([HAVE_WAYLAND], [test "x${have_wayland}" = "xyes"])
|
AM_CONDITIONAL([HAVE_WAYLAND_CLIENTS], [test "x${have_wayland_clients}" = "xyes"])
|
||||||
|
|
||||||
|
|
||||||
AC_E_OPTIONAL_MODULE([ibar], true)
|
AC_E_OPTIONAL_MODULE([ibar], true)
|
||||||
|
|
|
@ -31,7 +31,7 @@ module_la_SOURCES = e_mod_main.c \
|
||||||
e_mod_comp_update.h \
|
e_mod_comp_update.h \
|
||||||
e_mod_comp_cfdata.c \
|
e_mod_comp_cfdata.c \
|
||||||
e_mod_comp_cfdata.h
|
e_mod_comp_cfdata.h
|
||||||
if HAVE_WAYLAND
|
if HAVE_WAYLAND_CLIENTS
|
||||||
module_la_SOURCES += e_mod_comp_wl.h \
|
module_la_SOURCES += e_mod_comp_wl.h \
|
||||||
e_mod_comp_wl.c \
|
e_mod_comp_wl.c \
|
||||||
e_mod_comp_wl_comp.h \
|
e_mod_comp_wl_comp.h \
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#include "e_mod_comp.h"
|
#include "e_mod_comp.h"
|
||||||
#include "e_mod_comp_update.h"
|
#include "e_mod_comp_update.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
#include "e_mod_comp_wl.h"
|
#include "e_mod_comp_wl.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -513,7 +513,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
Ecore_X_Pixmap pm = 0;
|
Ecore_X_Pixmap pm = 0;
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
if ((cw->bd) && (cw->bd->borderless))
|
if ((cw->bd) && (cw->bd->borderless))
|
||||||
pm = e_mod_comp_wl_pixmap_get(cw->win);
|
pm = e_mod_comp_wl_pixmap_get(cw->win);
|
||||||
#endif
|
#endif
|
||||||
|
@ -598,7 +598,7 @@ _e_mod_comp_win_update(E_Comp_Win *cw)
|
||||||
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
|
if ((cw->c->gl) && (_comp_mod->conf->texture_from_pixmap) &&
|
||||||
(!cw->shaped) && (!cw->rects))
|
(!cw->shaped) && (!cw->rects))
|
||||||
{
|
{
|
||||||
/* #ifdef HAVE_WAYLAND */
|
/* #ifdef HAVE_WAYLAND_CLIENTS */
|
||||||
/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
|
/* DBG("DEBUG - pm now %x\n", e_mod_comp_wl_pixmap_get(cw->win)); */
|
||||||
/* #endif */
|
/* #endif */
|
||||||
/* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
|
/* DBG("DEBUG - pm now %x\n", ecore_x_composite_name_window_pixmap_get(cw->win)); */
|
||||||
|
@ -1118,7 +1118,7 @@ nocomp:
|
||||||
printf(" redr\n");
|
printf(" redr\n");
|
||||||
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
if ((cw->bd) && (cw->bd->borderless))
|
if ((cw->bd) && (cw->bd->borderless))
|
||||||
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
||||||
#endif
|
#endif
|
||||||
|
@ -2064,7 +2064,7 @@ _e_mod_comp_win_show(E_Comp_Win *cw)
|
||||||
{
|
{
|
||||||
// we redirect all subwindows anyway
|
// we redirect all subwindows anyway
|
||||||
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
// ecore_x_composite_redirect_window(cw->win, ECORE_X_COMPOSITE_UPDATE_MANUAL);
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
if ((cw->bd) && (cw->bd->borderless))
|
if ((cw->bd) && (cw->bd->borderless))
|
||||||
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
cw->pixmap = e_mod_comp_wl_pixmap_get(cw->win);
|
||||||
#endif
|
#endif
|
||||||
|
@ -3506,7 +3506,7 @@ e_mod_comp_init(void)
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
if (!e_mod_comp_wl_init())
|
if (!e_mod_comp_wl_init())
|
||||||
EINA_LOG_ERR("Failed to initialize Wayland Client Support !!\n");
|
EINA_LOG_ERR("Failed to initialize Wayland Client Support !!\n");
|
||||||
#endif
|
#endif
|
||||||
|
@ -3533,7 +3533,7 @@ e_mod_comp_shutdown(void)
|
||||||
|
|
||||||
E_FREE_LIST(handlers, ecore_event_handler_del);
|
E_FREE_LIST(handlers, ecore_event_handler_del);
|
||||||
|
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
e_mod_comp_wl_shutdown();
|
e_mod_comp_wl_shutdown();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include <xcb/xcb_image.h>
|
# include <xcb/xcb_image.h>
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_comp.h"
|
# include "e_mod_comp_wl_comp.h"
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#include "e_mod_comp.h"
|
#include "e_mod_comp.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_buffer.h"
|
# include "e_mod_comp_wl_buffer.h"
|
||||||
# include "e_mod_comp_wl_comp.h"
|
# include "e_mod_comp_wl_comp.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_comp.h"
|
# include "e_mod_comp_wl_comp.h"
|
||||||
# include "e_mod_comp_wl_shm.h"
|
# include "e_mod_comp_wl_shm.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_input.h"
|
# include "e_mod_comp_wl_input.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_output.h"
|
# include "e_mod_comp_wl_output.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_comp.h"
|
# include "e_mod_comp_wl_comp.h"
|
||||||
# include "e_mod_comp_wl_output.h"
|
# include "e_mod_comp_wl_output.h"
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_shm.h"
|
# include "e_mod_comp_wl_shm.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
#include "e.h"
|
#include "e.h"
|
||||||
#include "e_mod_main.h"
|
#include "e_mod_main.h"
|
||||||
#ifdef HAVE_WAYLAND
|
#ifdef HAVE_WAYLAND_CLIENTS
|
||||||
# include "e_mod_comp_wl.h"
|
# include "e_mod_comp_wl.h"
|
||||||
# include "e_mod_comp_wl_comp.h"
|
# include "e_mod_comp_wl_comp.h"
|
||||||
# include "e_mod_comp_wl_output.h"
|
# include "e_mod_comp_wl_output.h"
|
||||||
|
|
Loading…
Reference in New Issue