discomfitor pushed a commit to branch master.
http://git.enlightenment.org/core/enlightenment.git/commit/?id=ae0e6c73a85aa86a5e4db7c98b7aa9e030f213c7
commit ae0e6c73a85aa86a5e4db7c98b7aa9e030f213c7
Author: Mike Blumenkrantz <zm...@osg.samsung.com>
Date: Mon Dec 7 18:14:33 2015 -0500
disable redirection toggling for the nocomp client
#ThisBreaksTheCompositor!
---
src/bin/e_comp.c | 6 +++++-
src/bin/e_int_client_menu.c | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/bin/e_comp.c b/src/bin/e_comp.c
index 451d640..fb5a883 100644
--- a/src/bin/e_comp.c
+++ b/src/bin/e_comp.c
@@ -980,7 +980,11 @@ _e_comp_act_opacity_set_go(E_Object * obj EINA_UNUSED,
const char *params)
static void
_e_comp_act_redirect_toggle_go(E_Object * obj EINA_UNUSED, const char *params
EINA_UNUSED)
{
- e_comp_client_redirect_toggle(e_client_focused_get());
+ E_Client *ec;
+
+ ec = e_client_focused_get();
+ if ((!ec) || (!e_pixmap_is_x(ec->pixmap)) || (ec == e_comp->nocomp_ec))
return;
+ e_comp_client_redirect_toggle(ec);
}
//////////////////////////////////////////////////////////////////////////
diff --git a/src/bin/e_int_client_menu.c b/src/bin/e_int_client_menu.c
index f2a1df1..637bd7b 100644
--- a/src/bin/e_int_client_menu.c
+++ b/src/bin/e_int_client_menu.c
@@ -224,7 +224,7 @@ e_int_client_menu_create(E_Client *ec)
e_menu_item_submenu_set(mi, subm);
e_object_unref(E_OBJECT(subm));
e_object_data_set(E_OBJECT(subm), e_comp);
- if (e_pixmap_type_get(ec->pixmap) == E_PIXMAP_TYPE_X)
+ if (e_pixmap_is_x(ec->pixmap) && (e_comp->nocomp_ec != ec))
{
mi = e_menu_item_new(subm);
e_menu_item_check_set(mi, 1);
--
