From a2bcacf09ff069760c495281d8f74fed66b92f8f Mon Sep 17 00:00:00 2001 From: SooChan Lim Date: Mon, 2 Dec 2024 18:13:20 +0900 Subject: [PATCH] e_comp: remove nocomp variable It is not used anymore Change-Id: I83735dd2ab6211b78a435be209b5044faee7106c --- src/bin/compmgr/e_comp.c | 4 +--- src/bin/compmgr/e_comp_object.c | 1 - src/bin/compmgr/e_comp_object_intern.h | 1 - src/include/e_comp.h | 1 - 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/bin/compmgr/e_comp.c b/src/bin/compmgr/e_comp.c index aecc298ecc..cd7b819d45 100644 --- a/src/bin/compmgr/e_comp.c +++ b/src/bin/compmgr/e_comp.c @@ -664,7 +664,7 @@ e_comp_grab_input(Eina_Bool mouse, Eina_Bool kbd) mwin = e_comp->ee_win; if (kbd || e_comp->input_mouse_grabs) kwin = e_comp->ee_win; - //e_comp_override_add(); //nocomp condition + if ((e_comp->input_mouse_grabs && e_comp->input_key_grabs) || e_grabinput_get(mwin, 0, kwin)) { @@ -697,7 +697,6 @@ e_comp_ungrab_input(Eina_Bool mouse, Eina_Bool kbd) if (kbd && (!e_comp->input_key_grabs)) kwin = e_comp->ee_win; - //e_comp_override_timed_pop(); //nocomp condition if ((!mwin) && (!kwin)) return; e_grabinput_release(mwin, kwin); evas_event_feed_mouse_out(e_comp->evas, 0, NULL); @@ -1544,7 +1543,6 @@ e_comp_ungrab_input_without_inout(Eina_Bool mouse, Eina_Bool kbd) if (kbd && (!e_comp->input_key_grabs)) kwin = e_comp->ee_win; - //e_comp_override_timed_pop(); //nocomp condition if ((!mwin) && (!kwin)) return; e_grabinput_release(mwin, kwin); if (e_client_focused_get()) return; diff --git a/src/bin/compmgr/e_comp_object.c b/src/bin/compmgr/e_comp_object.c index 9044f2d9c1..22ea3ad726 100644 --- a/src/bin/compmgr/e_comp_object.c +++ b/src/bin/compmgr/e_comp_object.c @@ -3640,7 +3640,6 @@ e_comp_object_damage(Evas_Object *obj, int x, int y, int w, int h) API_ENTRY; if (cw->ec->input_only || (!cw->updates)) return; - if (cw->nocomp) return; if (e_comp_is_on_overlay(cw->ec)) { diff --git a/src/bin/compmgr/e_comp_object_intern.h b/src/bin/compmgr/e_comp_object_intern.h index 054740c927..5f12edca43 100644 --- a/src/bin/compmgr/e_comp_object_intern.h +++ b/src/bin/compmgr/e_comp_object_intern.h @@ -71,7 +71,6 @@ struct _E_Comp_Object Eina_Bool redirected : 1; // has updates to fetch Eina_Bool native : 1; // native - Eina_Bool nocomp : 1; // nocomp applied Eina_Bool hwc_need_update : 1; // this window updated while on e_plane to do hw composite Eina_Bool real_hid : 1; // last hide was a real window unmap diff --git a/src/include/e_comp.h b/src/include/e_comp.h index 9d7508f153..bfe0369759 100644 --- a/src/include/e_comp.h +++ b/src/include/e_comp.h @@ -120,7 +120,6 @@ struct _E_Comp Ecore_Timer *nocomp_delay_timer; Ecore_Timer *nocomp_override_timer; int nocomp_override; //number of times hwc override has been requested - Eina_Bool nocomp : 1; // TODO: remove it from E_Comp!! Eina_Bool hwc : 1; Eina_Bool hwc_send_redraw_request; Eina_Bool hwc_prefer_gbm; -- 2.34.1