jf_simon
/
enlightenment_my
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

e wl - fix randr fully to not even init if managed 

@fix
This commit is contained in:
Carsten Haitzler 2020-11-10 11:37:09 +00:00
parent a9a877feca
commit e8ca66527a
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/e_randr2.c
View File

@ -35,6 +35,7 @@ static Ecore_Timer *_screen_delay_timer = NULL;
static Eina_Bool event_screen = EINA_FALSE; static Eina_Bool event_screen = EINA_FALSE;
static Eina_Bool event_ignore = EINA_FALSE; static Eina_Bool event_ignore = EINA_FALSE;
static Eina_Bool initted = EINA_FALSE; static Eina_Bool initted = EINA_FALSE;
static Eina_Bool blocked = EINA_FALSE;
///////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////
E_API E_Config_Randr2 *e_randr2_cfg = NULL; E_API E_Config_Randr2 *e_randr2_cfg = NULL;
@ -55,6 +56,7 @@ e_randr2_init(void)
int count; int count;
if (!E_EVENT_RANDR_CHANGE) E_EVENT_RANDR_CHANGE = ecore_event_type_new(); if (!E_EVENT_RANDR_CHANGE) E_EVENT_RANDR_CHANGE = ecore_event_type_new();
if (blocked) return EINA_FALSE;
if ((!e_comp->screen) || (!e_comp->screen->available) || (!e_comp->screen->available())) return EINA_FALSE; if ((!e_comp->screen) || (!e_comp->screen->available) || (!e_comp->screen->available())) return EINA_FALSE;
initted = EINA_TRUE; initted = EINA_TRUE;
// create data descriptors for config storage // create data descriptors for config storage
@ -150,7 +152,8 @@ e_randr2_shutdown(void)
E_API void E_API void
e_randr2_stop(void) e_randr2_stop(void)
{ {
e_randr2_shutdown(); blocked = EINA_TRUE;
if (initted) e_randr2_shutdown();
} }
E_API Eina_Bool E_API Eina_Bool

2
src/modules/wl_x11/e_mod_main.c
View File

@ -36,6 +36,7 @@ e_modapi_init(E_Module *m)
if (win == win2) managed = EINA_TRUE; if (win == win2) managed = EINA_TRUE;
} }
} }
if (managed) e_randr2_stop();
if (!e_comp->ee) if (!e_comp->ee)
{ {
@ -66,7 +67,6 @@ e_modapi_init(E_Module *m)
e_comp_wl->dmabuf_disable = EINA_TRUE; e_comp_wl->dmabuf_disable = EINA_TRUE;
if (managed) e_randr2_stop();
return m; return m;
} }