discomfitor pushed a commit to branch enlightenment-0.21. http://git.enlightenment.org/core/enlightenment.git/commit/?id=755f03fd65125a5a3b6184e17355d4d495418c76
commit 755f03fd65125a5a3b6184e17355d4d495418c76 Author: Mike Blumenkrantz <[email protected]> Date: Fri Jun 16 14:59:42 2017 -0400 simplify drm output update event by using randr screen refresh queuing also moves all the output add/del into e_comp_wl --- src/modules/wl_drm/e_mod_main.c | 50 ++--------------------------------------- 1 file changed, 2 insertions(+), 48 deletions(-) diff --git a/src/modules/wl_drm/e_mod_main.c b/src/modules/wl_drm/e_mod_main.c index f3116c580..12f69da23 100644 --- a/src/modules/wl_drm/e_mod_main.c +++ b/src/modules/wl_drm/e_mod_main.c @@ -81,56 +81,10 @@ end: } static Eina_Bool -_e_mod_drm_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event) +_e_mod_drm_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event EINA_UNUSED) { - const Eina_List *l; - E_Randr2_Screen *screen; - Eina_Bool connected = EINA_FALSE; - int subpixel = 0; -#ifdef HAVE_DRM2 - Ecore_Drm2_Event_Output_Changed *e; -#else - Ecore_Drm_Event_Output *e; -#endif - - if (!(e = event)) goto end; - - DBG("WL_DRM OUTPUT CHANGE"); - - EINA_LIST_FOREACH(e_randr2->screens, l, screen) - { - if ((!strcmp(screen->info.name, e->name)) && - (!strcmp(screen->info.screen, e->model))) - { -#ifdef HAVE_DRM2 - connected = e->enabled; - subpixel = e->subpixel; -#else - connected = e->plug; - subpixel = e->subpixel_order; -#endif - - if (connected) - { - if (!e_comp_wl_output_init(screen->id, e->make, e->model, - e->x, e->y, e->w, e->h, - e->phys_width, e->phys_height, - e->refresh, subpixel, - e->transform)) - { - ERR("Could not setup new output: %s", screen->id); - } - } - else - e_comp_wl_output_remove(screen->id); - - break; - } - } - -end: if (!e_randr2_cfg->ignore_hotplug_events) - e_randr2_screen_refresh_queue(EINA_TRUE); + e_randr2_screen_refresh_queue(1); return ECORE_CALLBACK_PASS_ON; } --
