src/bin/e_zone.h \
src/bin/e_util_transform.h \
src/bin/e_comp_hwc.h \
-src/bin/e_comp_drm.h \
+src/bin/e_comp_screen.h \
src/bin/e_info_protocol.h
if HAVE_WAYLAND
src/bin/e_comp_canvas.c \
src/bin/e_comp_cfdata.c \
src/bin/e_comp_object.c \
-src/bin/e_comp_drm.c \
+src/bin/e_comp_screen.c \
src/bin/e_config.c \
src/bin/e_config_data.c \
src/bin/e_dbusmenu.c \
e_comp_new();
- e_main_ts("\tE_Comp_DRM Init");
- if (!e_comp_drm_init())
+ e_main_ts("\tE_Comp_Screen Init");
+ if (!e_comp_screen_init())
{
- ERR("Fail to init e_comp_drm");
+ ERR("Fail to init e_comp_screen");
e_object_del(E_OBJECT(e_comp));
E_FREE_FUNC(ignores, eina_hash_free);
return EINA_FALSE;
}
- e_main_ts("\tE_Comp_DRM Init Done");
+ e_main_ts("\tE_Comp_Screen Init Done");
e_comp->comp_type = E_PIXMAP_TYPE_WL;
#endif
e_comp_wl_shutdown();
- e_comp_drm_shutdown();
+ e_comp_screen_shutdown();
e_object_del(E_OBJECT(e_comp));
E_FREE_LIST(handlers, ecore_event_handler_del);
+++ /dev/null
-#include "e.h"
-#include <Ecore_Drm.h>
-
-static Eina_List *event_handlers = NULL;
-static Eina_Bool session_state = EINA_FALSE;
-
-static Eina_Bool dont_set_ecore_drm_keymap = EINA_FALSE;
-static Eina_Bool dont_use_xkb_cache = EINA_FALSE;
-
-static Eina_Bool
-_e_comp_drm_cb_activate(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
- Ecore_Drm_Event_Activate *e;
-
- if (!(e = event)) goto end;
-
- if (e->active)
- {
- E_Client *ec;
-
- if (session_state) goto end;
- session_state = EINA_TRUE;
-
- ecore_evas_show(e_comp->ee);
- E_CLIENT_FOREACH(ec)
- {
- if (ec->visible && (!ec->input_only))
- e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
- }
- e_comp_render_queue();
- e_comp_shape_queue_block(0);
- ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
- }
- else
- {
- session_state = EINA_FALSE;
- ecore_evas_hide(e_comp->ee);
- edje_file_cache_flush();
- edje_collection_cache_flush();
- evas_image_cache_flush(e_comp->evas);
- evas_font_cache_flush(e_comp->evas);
- evas_render_dump(e_comp->evas);
-
- e_comp_render_queue();
- e_comp_shape_queue_block(1);
- ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
- }
-
-end:
- return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_comp_drm_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
- const Eina_List *l;
- E_Output_Screen *screen;
- Ecore_Drm_Event_Output *e;
-
- if (!(e = event)) goto end;
-
- DBG("WL_DRM OUTPUT CHANGE");
-
- EINA_LIST_FOREACH(e_output->screens, l, screen)
- {
- if ((!strcmp(screen->info.name, e->name)) &&
- (!strcmp(screen->info.screen, e->model)))
- {
- if (e->plug)
- {
- 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, e->subpixel_order,
- e->transform))
- {
- ERR("Could not setup new output: %s", screen->id);
- }
- }
- else
- e_comp_wl_output_remove(screen->id);
-
- break;
- }
- }
-
- /* previous calculation of e_scale gave unsuitable value because
- * there were no sufficient information to calculate dpi.
- * so it's considerable to re-calculate e_scale with output geometry.
- */
- e_scale_manual_update(((e->w * 254 / e->phys_width) + 5) / 10);
-
-end:
- return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_comp_drm_cb_input_device_add(void *data, int type, void *event)
-{
- Ecore_Drm_Event_Input_Device_Add *e;
- E_Comp *comp = data;
-
- if (!(e = event)) goto end;
-
- if (e->caps & EVDEV_SEAT_POINTER)
- {
- if (comp->wl_comp_data->ptr.num_devices == 0)
- {
- e_pointer_object_set(comp->pointer, NULL, 0, 0);
- e_comp_wl_input_pointer_enabled_set(EINA_TRUE);
- }
- comp->wl_comp_data->ptr.num_devices++;
- }
- if (e->caps & EVDEV_SEAT_KEYBOARD)
- {
- comp->wl_comp_data->kbd.num_devices++;
- e_comp_wl_input_keyboard_enabled_set(EINA_TRUE);
- }
- if (e->caps & EVDEV_SEAT_TOUCH)
- {
- e_comp_wl_input_touch_enabled_set(EINA_TRUE);
- comp->wl_comp_data->touch.num_devices++;
- }
-
-end:
- return ECORE_CALLBACK_PASS_ON;
-}
-
-static Eina_Bool
-_e_comp_drm_cb_input_device_del(void *data, int type, void *event)
-{
- Ecore_Drm_Event_Input_Device_Del *e;
- E_Comp *comp = data;
-
- if (!(e = event)) goto end;
-
- if (e->caps & EVDEV_SEAT_POINTER)
- {
- comp->wl_comp_data->ptr.num_devices--;
- if (comp->wl_comp_data->ptr.num_devices == 0)
- {
- e_comp_wl_input_pointer_enabled_set(EINA_FALSE);
- e_pointer_object_set(comp->pointer, NULL, 0, 0);
- e_pointer_hide(e_comp->pointer);
- }
- }
-
-end:
-
- return ECORE_CALLBACK_PASS_ON;
-}
-
-static void
-_e_comp_drm_cb_ee_resize(Ecore_Evas *ee EINA_UNUSED)
-{
- e_comp_canvas_update();
-}
-
-static Ecore_Drm_Output_Mode *
-_e_comp_drm_mode_screen_find(E_Output_Screen *s, Ecore_Drm_Output *output)
-{
- Ecore_Drm_Output_Mode *mode, *m = NULL;
- const Eina_List *l;
- int diff, distance = 0x7fffffff;
-
- EINA_LIST_FOREACH(ecore_drm_output_modes_get(output), l, mode)
- {
- diff = (100 * abs(s->config.mode.w - mode->width)) +
- (100 * abs(s->config.mode.h - mode->height)) +
- fabs((100 * s->config.mode.refresh) - (100 * mode->refresh));
- if (diff < distance)
- {
- m = mode;
- distance = diff;
- }
- }
-
- return m;
-}
-
-static Eina_Bool
-_e_comp_drm_output_exists(Ecore_Drm_Output *output, unsigned int crtc)
-{
- /* find out if this output can go into the 'possibles' */
- return ecore_drm_output_possible_crtc_get(output, crtc);
-}
-
-static char *
-_e_comp_drm_output_screen_get(Ecore_Drm_Output *output)
-{
- const char *model;
-
- model = ecore_drm_output_model_get(output);
- if (!model) return NULL;
-
- return strdup(model);
-}
-
-EINTERN E_Output *
-e_comp_drm_create(void)
-{
- Ecore_Drm_Device *dev;
- Ecore_Drm_Output *output;
- const Eina_List *l, *ll;
- E_Output *r = NULL;
-
- r = E_NEW(E_Output, 1);
- if (!r) return NULL;
-
- EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
- {
- EINA_LIST_FOREACH(dev->outputs, ll, output)
- {
- E_Output_Screen *s;
- const Eina_List *m;
- Ecore_Drm_Output_Mode *omode;
- unsigned int j;
- int priority;
- Eina_Bool ok = EINA_FALSE;
- Eina_Bool possible = EINA_FALSE;
- int len = 0;
-
- s = E_NEW(E_Output_Screen, 1);
- if (!s) continue;
-
- s->info.name = ecore_drm_output_name_get(output);
- printf("COMP DRM: .... out %s\n", s->info.name);
-
- s->info.connected = ecore_drm_output_connected_get(output);
- printf("COMP DRM: ...... connected %i\n", s->info.connected);
-
- s->info.screen = _e_comp_drm_output_screen_get(output);
-
- s->info.edid = ecore_drm_output_edid_get(output);
- if (s->info.edid)
- s->id = malloc(strlen(s->info.name) + 1 + strlen(s->info.edid) + 1);
- else
- s->id = malloc(strlen(s->info.name) + 1 + 1);
- if (!s->id)
- {
- free(s->info.screen);
- free(s->info.edid);
- free(s);
- continue;
- }
- len = strlen(s->info.name);
- strncpy(s->id, s->info.name, len + 1);
- strncat(s->id, "/", 1);
- if (s->info.edid) strncat(s->id, s->info.edid, strlen(s->info.edid));
-
- printf("COMP DRM: ...... screen: %s\n", s->id);
-
- ecore_drm_output_physical_size_get(output, &s->info.size.w,
- &s->info.size.h);
-
- EINA_LIST_FOREACH(ecore_drm_output_modes_get(output), m, omode)
- {
- E_Output_Mode *rmode;
-
- rmode = malloc(sizeof(E_Output_Mode));
- if (!rmode) continue;
-
- rmode->w = omode->width;
- rmode->h = omode->height;
- rmode->refresh = omode->refresh;
- rmode->preferred = (omode->flags & DRM_MODE_TYPE_PREFERRED);
-
- s->info.modes = eina_list_append(s->info.modes, rmode);
- }
-
- priority = 0;
- if (ecore_drm_output_primary_get(dev) == output)
- priority = 100;
- s->config.priority = priority;
-
- for (j = 0; j < dev->crtc_count; j++)
- {
- if (dev->crtcs[j] == ecore_drm_output_crtc_id_get(output))
- {
- ok = EINA_TRUE;
- break;
- }
- }
-
- if (!ok)
- {
- /* get possible crtcs, compare to output_crtc_id_get */
- for (j = 0; j < dev->crtc_count; j++)
- {
- if (_e_comp_drm_output_exists(output, dev->crtcs[j]))
- {
- ok = EINA_TRUE;
- possible = EINA_TRUE;
- break;
- }
- }
- }
-
- if (ok)
- {
- if (!possible)
- {
- unsigned int refresh;
-
- ecore_drm_output_position_get(output, &s->config.geom.x,
- &s->config.geom.y);
- ecore_drm_output_crtc_size_get(output, &s->config.geom.w,
- &s->config.geom.h);
-
- ecore_drm_output_current_resolution_get(output,
- &s->config.mode.w,
- &s->config.mode.h,
- &refresh);
- s->config.mode.refresh = refresh;
- s->config.enabled =
- ((s->config.mode.w != 0) && (s->config.mode.h != 0));
-
- printf("COMP DRM: '%s' %i %i %ix%i\n", s->info.name,
- s->config.geom.x, s->config.geom.y,
- s->config.geom.w, s->config.geom.h);
-
- }
-
- /* TODO: are rotations possible ?? */
- }
- s->plane_count = 1; // TODO: get proper value using libtdm
- printf("COMP DRM: planes %i\n", s->plane_count);
- for (j = 0; j < s->plane_count; j++)
- {
- printf("COMP DRM: added plane %i\n", j);
- e_plane_new(s);
- }
-
- r->screens = eina_list_append(r->screens, s);
- }
- }
-
- return r;
-}
-
-EINTERN void
-e_comp_drm_apply(void)
-{
- Ecore_Drm_Device *dev;
- Ecore_Drm_Output *out;
- E_Output_Screen *s;
- const Eina_List *l, *ll;
- int nw, nh, pw, ph, ww, hh;
- int minw, minh, maxw, maxh;
- int top_priority = 0;
-
- /* TODO: what the actual fuck */
- nw = e_output->w;
- nh = e_output->h;
- EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
- {
- ecore_drm_screen_size_range_get(dev, &minw, &minh, &maxw, &maxh);
- printf("COMP DRM: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
-
- ecore_drm_outputs_geometry_get(dev, NULL, NULL, &pw, &ph);
- if (nw > maxw) nw = maxw;
- if (nh > maxh) nh = maxh;
- if (nw < minw) nw = minw;
- if (nh < minh) nh = minh;
- ww = nw;
- hh = nh;
- if (nw < pw) ww = pw;
- if (nh < ph) hh = ph;
-
- printf("COMP DRM: set vsize: %ix%i\n", ww, hh);
-
- EINA_LIST_FOREACH(e_output->screens, ll, s)
- {
- Ecore_Drm_Output_Mode *mode = NULL;
- printf("COMP DRM: find output for '%s'\n", s->info.name);
-
- out = ecore_drm_device_output_name_find(dev, s->info.name);
- if (!out) continue;
-
- mode = _e_comp_drm_mode_screen_find(s, out);
-
- if (s->config.priority > top_priority)
- top_priority = s->config.priority;
-
- printf("\tCOMP DRM: Priority: %d\n", s->config.priority);
-
- printf("\tCOMP DRM: Geom: %d %d %d %d\n",
- s->config.geom.x, s->config.geom.y,
- s->config.geom.w, s->config.geom.h);
-
- if (mode)
- {
- printf("\tCOMP DRM: Found Valid Drm Mode\n");
- printf("\t\tCOMP DRM: %dx%d\n", mode->width, mode->height);
- }
- else
- printf("\tCOMP DRM: No Valid Drm Mode Found\n");
-
- ecore_drm_output_mode_set(out, mode,
- s->config.geom.x, s->config.geom.y);
- if (s->config.priority == top_priority)
- ecore_drm_output_primary_set(out);
-
- ecore_drm_output_enable(out);
-
- printf("\tCOMP DRM: Mode\n");
- printf("\t\tCOMP DRM: Geom: %d %d\n",
- s->config.mode.w, s->config.mode.h);
- printf("\t\tCOMP DRM: Refresh: %f\n", s->config.mode.refresh);
- printf("\t\tCOMP DRM: Preferred: %d\n",
- s->config.mode.preferred);
- }
- }
-}
-
-static void
-_drm_read_pixels(E_Comp_Wl_Output *output, void *pixels)
-{
- Ecore_Drm_Device *dev;
- Ecore_Drm_Fb *fb;
- const Eina_List *drm_devs, *l;
- int i = 0, bstride;
- unsigned char *s, *d = pixels;
-
- drm_devs = ecore_drm_devices_get();
- EINA_LIST_FOREACH(drm_devs, l, dev)
- {
- fb = dev->next;
- if (!fb) fb = dev->current;
- if (fb) break;
- }
-
- if (!fb) return;
-
- bstride = output->w * sizeof(int);
-
- for (i = output->y; i < output->y + output->h; i++)
- {
- s = fb->mmap;
- s += (fb->stride * i) + (output->x * sizeof(int));
- memcpy(d, s, (output->w * sizeof(int)));
- d += bstride;
- }
-}
-
-E_API void
-_e_comp_drm_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map)
-{
- char *keymap_path = NULL;
- struct xkb_context *context;
- struct xkb_keymap *keymap;
- struct xkb_rule_names names = {0,};
-
- TRACE_INPUT_BEGIN(_e_comp_drm_keymap_set);
-
- context = xkb_context_new(0);
- EINA_SAFETY_ON_NULL_RETURN(context);
-
- /* assemble xkb_rule_names so we can fetch keymap */
- memset(&names, 0, sizeof(names));
- names.rules = strdup("evdev");
- names.model = strdup("pc105");
- names.layout = strdup("us");
-
- keymap = e_comp_wl_input_keymap_compile(context, names, &keymap_path);
- eina_stringshare_del(keymap_path);
- EINA_SAFETY_ON_NULL_GOTO(keymap, cleanup);
-
- *ctx = context;
- *map = keymap;
-
- if (dont_set_ecore_drm_keymap == EINA_FALSE)
- {
- ecore_drm_device_keyboard_cached_context_set(*ctx);
- ecore_drm_device_keyboard_cached_keymap_set(*map);
- }
-
-cleanup:
- free((char *)names.rules);
- free((char *)names.model);
- free((char *)names.layout);
-
- TRACE_INPUT_END();
-}
-
-E_API Eina_Bool
-e_comp_drm_init()
-{
- E_Comp *comp;
- int w = 0, h = 0, scr_w = 1, scr_h = 1;
- struct xkb_context *ctx = NULL;
- struct xkb_keymap *map = NULL;
- char buf[1024];
-
- e_main_ts("\te_comp_drm Init Begin");
-
- dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
- dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
-
- TRACE_DS_BEGIN(WL_DRM:INIT);
-
- if (!(comp = e_comp))
- {
- comp = e_comp_new();
- if (!comp)
- {
- TRACE_DS_END();
- EINA_SAFETY_ON_NULL_RETURN_VAL(comp, EINA_FALSE);
- }
-
- comp->comp_type = E_PIXMAP_TYPE_WL;
- }
-
- /* set gl available if we have ecore_evas support */
- if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
- e_comp_gl_set(EINA_TRUE);
-
- INF("GL available:%d config engine:%d screen size:%dx%d",
- e_comp_gl_get(), e_comp_config_get()->engine, scr_w, scr_h);
-
- if (e_config->xkb.use_cache && !dont_use_xkb_cache)
- {
- e_main_ts("\tDRM Keymap Init");
- _e_comp_drm_keymap_set(&ctx, &map);
- e_main_ts("\tDRM Keymap Init Done");
- }
-
- if ((e_comp_gl_get()) &&
- (e_comp_config_get()->engine == E_COMP_ENGINE_GL))
- {
- e_main_ts("\tEE_GL_DRM New");
- comp->ee = ecore_evas_gl_drm_new(NULL, 0, 0, 0, scr_w, scr_h);
- snprintf(buf, sizeof(buf), "\tEE_GL_DRM New Done %p %dx%d", comp->ee, scr_w, scr_h);
- e_main_ts(buf);
-
- if (!comp->ee)
- e_comp_gl_set(EINA_FALSE);
- else
- {
- Evas_GL *evasgl = NULL;
- Evas_GL_API *glapi = NULL;
-
- e_main_ts("\tEvas_GL New");
- evasgl = evas_gl_new(ecore_evas_get(comp->ee));
- if (evasgl)
- {
- glapi = evas_gl_api_get(evasgl);
- if (!((glapi) && (glapi->evasglBindWaylandDisplay)))
- {
- e_comp_gl_set(EINA_FALSE);
- ecore_evas_free(comp->ee);
- comp->ee = NULL;
- e_main_ts("\tEvas_GL New Failed 1");
- }
- else
- {
- e_main_ts("\tEvas_GL New Done");
- }
- }
- else
- {
- e_comp_gl_set(EINA_FALSE);
- ecore_evas_free(comp->ee);
- comp->ee = NULL;
- e_main_ts("\tEvas_GL New Failed 2");
- }
- evas_gl_free(evasgl);
- }
- }
-
- /* fallback to framebuffer drm (non-accel) */
- if (!comp->ee)
- {
- e_main_ts("\tEE_DRM New");
- comp->ee = ecore_evas_drm_new(NULL, 0, 0, 0, scr_w, scr_h);
- snprintf(buf, sizeof(buf), "\tEE_DRM New Done %p %dx%d", comp->ee, scr_w, scr_h);
- e_main_ts(buf);
- }
-
- if (!comp->ee)
- {
- fprintf(stderr, "Could not create ecore_evas_drm canvas");
- TRACE_DS_END();
- return EINA_FALSE;
- }
-
- ecore_evas_data_set(e_comp->ee, "comp", e_comp);
-
- /* get the current screen geometry */
- ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
-
- /* resize the canvas */
- if (!((scr_w == w) && (scr_h == h)))
- {
- snprintf(buf, sizeof(buf), "\tEE Resize %dx%d -> %dx%d", scr_w, scr_h, w, h);
- e_main_ts(buf);
-
- ecore_evas_resize(comp->ee, w, h);
-
- e_main_ts("\tEE Resize Done");
- }
-
- ecore_evas_callback_resize_set(e_comp->ee, _e_comp_drm_cb_ee_resize);
-
- e_main_ts("\tE_Output Init");
- if (!e_output_init())
- {
- e_error_message_show(_("Enlightenment cannot initialize drm output!\n"));
- TRACE_DS_END();
- return EINA_FALSE;
- }
- e_output_screens_setup(-1, -1);
- e_main_ts("\tE_Output Init Done");
-
- e_main_ts("\tE_Comp_Wl Init");
- if (!e_comp_wl_init())
- {
- TRACE_DS_END();
- return EINA_FALSE;
- }
- e_main_ts("\tE_Comp_Wl Init Done");
-
- e_main_ts("\tE_Comp_Canvas Init");
- if (!e_comp_canvas_init(w, h))
- {
- TRACE_DS_END();
- return EINA_FALSE;
- }
- e_main_ts("\tE_Comp_Canvas Init Done");
-
- e_comp_wl->screenshooter.read_pixels = _drm_read_pixels;
-
- ecore_evas_pointer_xy_get(e_comp->ee,
- &e_comp_wl->ptr.x,
- &e_comp_wl->ptr.y);
-
- evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
-
- /* comp->pointer = */
- /* e_pointer_window_new(ecore_evas_window_get(comp->ee), 1); */
- e_main_ts("\tE_Pointer New");
- if ((comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE)))
- {
- comp->pointer->color = EINA_TRUE;
- e_pointer_hide(comp->pointer);
- }
- e_main_ts("\tE_Pointer New Done");
-
- /* FIXME: We need a way to trap for user changing the keymap inside of E
- * without the event coming from X11 */
-
- /* FIXME: We should make a decision here ...
- *
- * Fetch the keymap from drm, OR set this to what the E config is....
- */
-
- /* FIXME: This is just for testing at the moment....
- * happens to jive with what drm does */
- e_main_ts("\tE_Comp_WL Keymap Init");
- e_comp_wl_input_keymap_set("evdev", "pc105", "us", ctx, map);
- e_main_ts("\tE_Comp_WL Keymap Init Done");
-
- E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_ACTIVATE, _e_comp_drm_cb_activate, comp);
- E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_OUTPUT, _e_comp_drm_cb_output, comp);
- E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_INPUT_DEVICE_ADD, _e_comp_drm_cb_input_device_add, comp);
- E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_INPUT_DEVICE_DEL, _e_comp_drm_cb_input_device_del, comp);
-
- TRACE_DS_END();
-
- return EINA_TRUE;
-}
-
-E_API void
-e_comp_drm_shutdown()
-{
- /* shutdown ecore_drm */
- /* ecore_drm_shutdown(); */
- e_output_shutdown();
-
- dont_set_ecore_drm_keymap = EINA_FALSE;
- dont_use_xkb_cache = EINA_FALSE;
- E_FREE_LIST(event_handlers, ecore_event_handler_del);
-
-}
+++ /dev/null
-#ifdef E_TYPEDEFS
-
-
-#else
-#ifndef E_COMP_DRM_H
-#define E_COMP_DRM_H
-
-
-E_API Eina_Bool e_comp_drm_init(void);
-E_API void e_comp_drm_shutdown(void);
-
-EINTERN E_Output * e_comp_drm_create(void);
-EINTERN void e_comp_drm_apply(void);
-
-#endif /*E_COMP_DRM_H*/
-
-#endif
--- /dev/null
+#include "e.h"
+#include <Ecore_Drm.h>
+
+static Eina_List *event_handlers = NULL;
+static Eina_Bool session_state = EINA_FALSE;
+
+static Eina_Bool dont_set_ecore_drm_keymap = EINA_FALSE;
+static Eina_Bool dont_use_xkb_cache = EINA_FALSE;
+
+static Eina_Bool
+_e_comp_screen_cb_activate(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+ Ecore_Drm_Event_Activate *e;
+
+ if (!(e = event)) goto end;
+
+ if (e->active)
+ {
+ E_Client *ec;
+
+ if (session_state) goto end;
+ session_state = EINA_TRUE;
+
+ ecore_evas_show(e_comp->ee);
+ E_CLIENT_FOREACH(ec)
+ {
+ if (ec->visible && (!ec->input_only))
+ e_comp_object_damage(ec->frame, 0, 0, ec->w, ec->h);
+ }
+ e_comp_render_queue();
+ e_comp_shape_queue_block(0);
+ ecore_event_add(E_EVENT_COMPOSITOR_ENABLE, NULL, NULL, NULL);
+ }
+ else
+ {
+ session_state = EINA_FALSE;
+ ecore_evas_hide(e_comp->ee);
+ edje_file_cache_flush();
+ edje_collection_cache_flush();
+ evas_image_cache_flush(e_comp->evas);
+ evas_font_cache_flush(e_comp->evas);
+ evas_render_dump(e_comp->evas);
+
+ e_comp_render_queue();
+ e_comp_shape_queue_block(1);
+ ecore_event_add(E_EVENT_COMPOSITOR_DISABLE, NULL, NULL, NULL);
+ }
+
+end:
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_e_comp_screen_cb_output(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+ const Eina_List *l;
+ E_Output_Screen *screen;
+ Ecore_Drm_Event_Output *e;
+
+ if (!(e = event)) goto end;
+
+ DBG("WL_DRM OUTPUT CHANGE");
+
+ EINA_LIST_FOREACH(e_output->screens, l, screen)
+ {
+ if ((!strcmp(screen->info.name, e->name)) &&
+ (!strcmp(screen->info.screen, e->model)))
+ {
+ if (e->plug)
+ {
+ 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, e->subpixel_order,
+ e->transform))
+ {
+ ERR("Could not setup new output: %s", screen->id);
+ }
+ }
+ else
+ e_comp_wl_output_remove(screen->id);
+
+ break;
+ }
+ }
+
+ /* previous calculation of e_scale gave unsuitable value because
+ * there were no sufficient information to calculate dpi.
+ * so it's considerable to re-calculate e_scale with output geometry.
+ */
+ e_scale_manual_update(((e->w * 254 / e->phys_width) + 5) / 10);
+
+end:
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_e_comp_screen_cb_input_device_add(void *data, int type, void *event)
+{
+ Ecore_Drm_Event_Input_Device_Add *e;
+ E_Comp *comp = data;
+
+ if (!(e = event)) goto end;
+
+ if (e->caps & EVDEV_SEAT_POINTER)
+ {
+ if (comp->wl_comp_data->ptr.num_devices == 0)
+ {
+ e_pointer_object_set(comp->pointer, NULL, 0, 0);
+ e_comp_wl_input_pointer_enabled_set(EINA_TRUE);
+ }
+ comp->wl_comp_data->ptr.num_devices++;
+ }
+ if (e->caps & EVDEV_SEAT_KEYBOARD)
+ {
+ comp->wl_comp_data->kbd.num_devices++;
+ e_comp_wl_input_keyboard_enabled_set(EINA_TRUE);
+ }
+ if (e->caps & EVDEV_SEAT_TOUCH)
+ {
+ e_comp_wl_input_touch_enabled_set(EINA_TRUE);
+ comp->wl_comp_data->touch.num_devices++;
+ }
+
+end:
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_e_comp_screen_cb_input_device_del(void *data, int type, void *event)
+{
+ Ecore_Drm_Event_Input_Device_Del *e;
+ E_Comp *comp = data;
+
+ if (!(e = event)) goto end;
+
+ if (e->caps & EVDEV_SEAT_POINTER)
+ {
+ comp->wl_comp_data->ptr.num_devices--;
+ if (comp->wl_comp_data->ptr.num_devices == 0)
+ {
+ e_comp_wl_input_pointer_enabled_set(EINA_FALSE);
+ e_pointer_object_set(comp->pointer, NULL, 0, 0);
+ e_pointer_hide(e_comp->pointer);
+ }
+ }
+
+end:
+
+ return ECORE_CALLBACK_PASS_ON;
+}
+
+static void
+_e_comp_screen_cb_ee_resize(Ecore_Evas *ee EINA_UNUSED)
+{
+ e_comp_canvas_update();
+}
+
+static Ecore_Drm_Output_Mode *
+_e_comp_screen_mode_screen_find(E_Output_Screen *s, Ecore_Drm_Output *output)
+{
+ Ecore_Drm_Output_Mode *mode, *m = NULL;
+ const Eina_List *l;
+ int diff, distance = 0x7fffffff;
+
+ EINA_LIST_FOREACH(ecore_drm_output_modes_get(output), l, mode)
+ {
+ diff = (100 * abs(s->config.mode.w - mode->width)) +
+ (100 * abs(s->config.mode.h - mode->height)) +
+ fabs((100 * s->config.mode.refresh) - (100 * mode->refresh));
+ if (diff < distance)
+ {
+ m = mode;
+ distance = diff;
+ }
+ }
+
+ return m;
+}
+
+static Eina_Bool
+_e_comp_screen_output_exists(Ecore_Drm_Output *output, unsigned int crtc)
+{
+ /* find out if this output can go into the 'possibles' */
+ return ecore_drm_output_possible_crtc_get(output, crtc);
+}
+
+static char *
+_e_comp_screen_output_screen_get(Ecore_Drm_Output *output)
+{
+ const char *model;
+
+ model = ecore_drm_output_model_get(output);
+ if (!model) return NULL;
+
+ return strdup(model);
+}
+
+EINTERN E_Output *
+e_comp_screen_init_outputs(void)
+{
+ Ecore_Drm_Device *dev;
+ Ecore_Drm_Output *output;
+ const Eina_List *l, *ll;
+ E_Output *r = NULL;
+
+ r = E_NEW(E_Output, 1);
+ if (!r) return NULL;
+
+ EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
+ {
+ EINA_LIST_FOREACH(dev->outputs, ll, output)
+ {
+ E_Output_Screen *s;
+ const Eina_List *m;
+ Ecore_Drm_Output_Mode *omode;
+ unsigned int j;
+ int priority;
+ Eina_Bool ok = EINA_FALSE;
+ Eina_Bool possible = EINA_FALSE;
+ int len = 0;
+
+ s = E_NEW(E_Output_Screen, 1);
+ if (!s) continue;
+
+ s->info.name = ecore_drm_output_name_get(output);
+ printf("COMP DRM: .... out %s\n", s->info.name);
+
+ s->info.connected = ecore_drm_output_connected_get(output);
+ printf("COMP DRM: ...... connected %i\n", s->info.connected);
+
+ s->info.screen = _e_comp_screen_output_screen_get(output);
+
+ s->info.edid = ecore_drm_output_edid_get(output);
+ if (s->info.edid)
+ s->id = malloc(strlen(s->info.name) + 1 + strlen(s->info.edid) + 1);
+ else
+ s->id = malloc(strlen(s->info.name) + 1 + 1);
+ if (!s->id)
+ {
+ free(s->info.screen);
+ free(s->info.edid);
+ free(s);
+ continue;
+ }
+ len = strlen(s->info.name);
+ strncpy(s->id, s->info.name, len + 1);
+ strncat(s->id, "/", 1);
+ if (s->info.edid) strncat(s->id, s->info.edid, strlen(s->info.edid));
+
+ printf("COMP DRM: ...... screen: %s\n", s->id);
+
+ ecore_drm_output_physical_size_get(output, &s->info.size.w,
+ &s->info.size.h);
+
+ EINA_LIST_FOREACH(ecore_drm_output_modes_get(output), m, omode)
+ {
+ E_Output_Mode *rmode;
+
+ rmode = malloc(sizeof(E_Output_Mode));
+ if (!rmode) continue;
+
+ rmode->w = omode->width;
+ rmode->h = omode->height;
+ rmode->refresh = omode->refresh;
+ rmode->preferred = (omode->flags & DRM_MODE_TYPE_PREFERRED);
+
+ s->info.modes = eina_list_append(s->info.modes, rmode);
+ }
+
+ priority = 0;
+ if (ecore_drm_output_primary_get(dev) == output)
+ priority = 100;
+ s->config.priority = priority;
+
+ for (j = 0; j < dev->crtc_count; j++)
+ {
+ if (dev->crtcs[j] == ecore_drm_output_crtc_id_get(output))
+ {
+ ok = EINA_TRUE;
+ break;
+ }
+ }
+
+ if (!ok)
+ {
+ /* get possible crtcs, compare to output_crtc_id_get */
+ for (j = 0; j < dev->crtc_count; j++)
+ {
+ if (_e_comp_screen_output_exists(output, dev->crtcs[j]))
+ {
+ ok = EINA_TRUE;
+ possible = EINA_TRUE;
+ break;
+ }
+ }
+ }
+
+ if (ok)
+ {
+ if (!possible)
+ {
+ unsigned int refresh;
+
+ ecore_drm_output_position_get(output, &s->config.geom.x,
+ &s->config.geom.y);
+ ecore_drm_output_crtc_size_get(output, &s->config.geom.w,
+ &s->config.geom.h);
+
+ ecore_drm_output_current_resolution_get(output,
+ &s->config.mode.w,
+ &s->config.mode.h,
+ &refresh);
+ s->config.mode.refresh = refresh;
+ s->config.enabled =
+ ((s->config.mode.w != 0) && (s->config.mode.h != 0));
+
+ printf("COMP DRM: '%s' %i %i %ix%i\n", s->info.name,
+ s->config.geom.x, s->config.geom.y,
+ s->config.geom.w, s->config.geom.h);
+
+ }
+
+ /* TODO: are rotations possible ?? */
+ }
+ s->plane_count = 1; // TODO: get proper value using libtdm
+ printf("COMP DRM: planes %i\n", s->plane_count);
+ for (j = 0; j < s->plane_count; j++)
+ {
+ printf("COMP DRM: added plane %i\n", j);
+ e_plane_new(s);
+ }
+
+ r->screens = eina_list_append(r->screens, s);
+ }
+ }
+
+ return r;
+}
+
+EINTERN Eina_Bool
+e_comp_screen_available(void)
+{
+ return EINA_TRUE;
+}
+
+EINTERN void
+e_comp_screen_apply(void)
+{
+ Ecore_Drm_Device *dev;
+ Ecore_Drm_Output *out;
+ E_Output_Screen *s;
+ const Eina_List *l, *ll;
+ int nw, nh, pw, ph, ww, hh;
+ int minw, minh, maxw, maxh;
+ int top_priority = 0;
+
+ /* TODO: what the actual fuck */
+ nw = e_output->w;
+ nh = e_output->h;
+ EINA_LIST_FOREACH(ecore_drm_devices_get(), l, dev)
+ {
+ ecore_drm_screen_size_range_get(dev, &minw, &minh, &maxw, &maxh);
+ printf("COMP DRM: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
+
+ ecore_drm_outputs_geometry_get(dev, NULL, NULL, &pw, &ph);
+ if (nw > maxw) nw = maxw;
+ if (nh > maxh) nh = maxh;
+ if (nw < minw) nw = minw;
+ if (nh < minh) nh = minh;
+ ww = nw;
+ hh = nh;
+ if (nw < pw) ww = pw;
+ if (nh < ph) hh = ph;
+
+ printf("COMP DRM: set vsize: %ix%i\n", ww, hh);
+
+ EINA_LIST_FOREACH(e_output->screens, ll, s)
+ {
+ Ecore_Drm_Output_Mode *mode = NULL;
+ printf("COMP DRM: find output for '%s'\n", s->info.name);
+
+ out = ecore_drm_device_output_name_find(dev, s->info.name);
+ if (!out) continue;
+
+ mode = _e_comp_screen_mode_screen_find(s, out);
+
+ if (s->config.priority > top_priority)
+ top_priority = s->config.priority;
+
+ printf("\tCOMP DRM: Priority: %d\n", s->config.priority);
+
+ printf("\tCOMP DRM: Geom: %d %d %d %d\n",
+ s->config.geom.x, s->config.geom.y,
+ s->config.geom.w, s->config.geom.h);
+
+ if (mode)
+ {
+ printf("\tCOMP DRM: Found Valid Drm Mode\n");
+ printf("\t\tCOMP DRM: %dx%d\n", mode->width, mode->height);
+ }
+ else
+ printf("\tCOMP DRM: No Valid Drm Mode Found\n");
+
+ ecore_drm_output_mode_set(out, mode,
+ s->config.geom.x, s->config.geom.y);
+ if (s->config.priority == top_priority)
+ ecore_drm_output_primary_set(out);
+
+ ecore_drm_output_enable(out);
+
+ printf("\tCOMP DRM: Mode\n");
+ printf("\t\tCOMP DRM: Geom: %d %d\n",
+ s->config.mode.w, s->config.mode.h);
+ printf("\t\tCOMP DRM: Refresh: %f\n", s->config.mode.refresh);
+ printf("\t\tCOMP DRM: Preferred: %d\n",
+ s->config.mode.preferred);
+ }
+ }
+}
+
+static void
+_drm_read_pixels(E_Comp_Wl_Output *output, void *pixels)
+{
+ Ecore_Drm_Device *dev;
+ Ecore_Drm_Fb *fb;
+ const Eina_List *drm_devs, *l;
+ int i = 0, bstride;
+ unsigned char *s, *d = pixels;
+
+ drm_devs = ecore_drm_devices_get();
+ EINA_LIST_FOREACH(drm_devs, l, dev)
+ {
+ fb = dev->next;
+ if (!fb) fb = dev->current;
+ if (fb) break;
+ }
+
+ if (!fb) return;
+
+ bstride = output->w * sizeof(int);
+
+ for (i = output->y; i < output->y + output->h; i++)
+ {
+ s = fb->mmap;
+ s += (fb->stride * i) + (output->x * sizeof(int));
+ memcpy(d, s, (output->w * sizeof(int)));
+ d += bstride;
+ }
+}
+
+E_API void
+_e_comp_screen_keymap_set(struct xkb_context **ctx, struct xkb_keymap **map)
+{
+ char *keymap_path = NULL;
+ struct xkb_context *context;
+ struct xkb_keymap *keymap;
+ struct xkb_rule_names names = {0,};
+
+ TRACE_INPUT_BEGIN(_e_comp_screen_keymap_set);
+
+ context = xkb_context_new(0);
+ EINA_SAFETY_ON_NULL_RETURN(context);
+
+ /* assemble xkb_rule_names so we can fetch keymap */
+ memset(&names, 0, sizeof(names));
+ names.rules = strdup("evdev");
+ names.model = strdup("pc105");
+ names.layout = strdup("us");
+
+ keymap = e_comp_wl_input_keymap_compile(context, names, &keymap_path);
+ eina_stringshare_del(keymap_path);
+ EINA_SAFETY_ON_NULL_GOTO(keymap, cleanup);
+
+ *ctx = context;
+ *map = keymap;
+
+ if (dont_set_ecore_drm_keymap == EINA_FALSE)
+ {
+ ecore_drm_device_keyboard_cached_context_set(*ctx);
+ ecore_drm_device_keyboard_cached_keymap_set(*map);
+ }
+
+cleanup:
+ free((char *)names.rules);
+ free((char *)names.model);
+ free((char *)names.layout);
+
+ TRACE_INPUT_END();
+}
+
+E_API Eina_Bool
+e_comp_screen_init()
+{
+ E_Comp *comp;
+ int w = 0, h = 0, scr_w = 1, scr_h = 1;
+ struct xkb_context *ctx = NULL;
+ struct xkb_keymap *map = NULL;
+ char buf[1024];
+
+ dont_set_ecore_drm_keymap = getenv("NO_ECORE_DRM_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
+ dont_use_xkb_cache = getenv("NO_KEYMAP_CACHE") ? EINA_TRUE : EINA_FALSE;
+
+ TRACE_DS_BEGIN(WL_DRM:INIT);
+
+ if (!(comp = e_comp))
+ {
+ comp = e_comp_new();
+ if (!comp)
+ {
+ TRACE_DS_END();
+ EINA_SAFETY_ON_NULL_RETURN_VAL(comp, EINA_FALSE);
+ }
+
+ comp->comp_type = E_PIXMAP_TYPE_WL;
+ }
+
+ /* set gl available if we have ecore_evas support */
+ if (ecore_evas_engine_type_supported_get(ECORE_EVAS_ENGINE_OPENGL_DRM))
+ e_comp_gl_set(EINA_TRUE);
+
+ INF("GL available:%d config engine:%d screen size:%dx%d",
+ e_comp_gl_get(), e_comp_config_get()->engine, scr_w, scr_h);
+
+ if (e_config->xkb.use_cache && !dont_use_xkb_cache)
+ {
+ e_main_ts("\tDRM Keymap Init");
+ _e_comp_screen_keymap_set(&ctx, &map);
+ e_main_ts("\tDRM Keymap Init Done");
+ }
+
+ if ((e_comp_gl_get()) &&
+ (e_comp_config_get()->engine == E_COMP_ENGINE_GL))
+ {
+ e_main_ts("\tEE_GL_DRM New");
+ comp->ee = ecore_evas_gl_drm_new(NULL, 0, 0, 0, scr_w, scr_h);
+ snprintf(buf, sizeof(buf), "\tEE_GL_DRM New Done %p %dx%d", comp->ee, scr_w, scr_h);
+ e_main_ts(buf);
+
+ if (!comp->ee)
+ e_comp_gl_set(EINA_FALSE);
+ else
+ {
+ Evas_GL *evasgl = NULL;
+ Evas_GL_API *glapi = NULL;
+
+ e_main_ts("\tEvas_GL New");
+ evasgl = evas_gl_new(ecore_evas_get(comp->ee));
+ if (evasgl)
+ {
+ glapi = evas_gl_api_get(evasgl);
+ if (!((glapi) && (glapi->evasglBindWaylandDisplay)))
+ {
+ e_comp_gl_set(EINA_FALSE);
+ ecore_evas_free(comp->ee);
+ comp->ee = NULL;
+ e_main_ts("\tEvas_GL New Failed 1");
+ }
+ else
+ {
+ e_main_ts("\tEvas_GL New Done");
+ }
+ }
+ else
+ {
+ e_comp_gl_set(EINA_FALSE);
+ ecore_evas_free(comp->ee);
+ comp->ee = NULL;
+ e_main_ts("\tEvas_GL New Failed 2");
+ }
+ evas_gl_free(evasgl);
+ }
+ }
+
+ /* fallback to framebuffer drm (non-accel) */
+ if (!comp->ee)
+ {
+ e_main_ts("\tEE_DRM New");
+ comp->ee = ecore_evas_drm_new(NULL, 0, 0, 0, scr_w, scr_h);
+ snprintf(buf, sizeof(buf), "\tEE_DRM New Done %p %dx%d", comp->ee, scr_w, scr_h);
+ e_main_ts(buf);
+ }
+
+ if (!comp->ee)
+ {
+ fprintf(stderr, "Could not create ecore_evas_drm canvas");
+ TRACE_DS_END();
+ return EINA_FALSE;
+ }
+
+ ecore_evas_data_set(e_comp->ee, "comp", e_comp);
+
+ /* get the current screen geometry */
+ ecore_evas_screen_geometry_get(e_comp->ee, NULL, NULL, &w, &h);
+
+ /* resize the canvas */
+ if (!((scr_w == w) && (scr_h == h)))
+ {
+ snprintf(buf, sizeof(buf), "\tEE Resize %dx%d -> %dx%d", scr_w, scr_h, w, h);
+ e_main_ts(buf);
+
+ ecore_evas_resize(comp->ee, w, h);
+
+ e_main_ts("\tEE Resize Done");
+ }
+
+ ecore_evas_callback_resize_set(e_comp->ee, _e_comp_screen_cb_ee_resize);
+
+ e_main_ts("\tE_Output Init");
+ if (!e_output_init())
+ {
+ e_error_message_show(_("Enlightenment cannot initialize output!\n"));
+ TRACE_DS_END();
+ return EINA_FALSE;
+ }
+ e_output_screens_setup(-1, -1);
+ e_main_ts("\tE_Output Init Done");
+
+ e_main_ts("\tE_Comp_Wl Init");
+ if (!e_comp_wl_init())
+ {
+ TRACE_DS_END();
+ return EINA_FALSE;
+ }
+ e_main_ts("\tE_Comp_Wl Init Done");
+
+ e_main_ts("\tE_Comp_Canvas Init");
+ if (!e_comp_canvas_init(w, h))
+ {
+ TRACE_DS_END();
+ return EINA_FALSE;
+ }
+ e_main_ts("\tE_Comp_Canvas Init Done");
+
+ e_comp_wl->screenshooter.read_pixels = _drm_read_pixels;
+
+ ecore_evas_pointer_xy_get(e_comp->ee,
+ &e_comp_wl->ptr.x,
+ &e_comp_wl->ptr.y);
+
+ evas_event_feed_mouse_in(e_comp->evas, 0, NULL);
+
+ /* comp->pointer = */
+ /* e_pointer_window_new(ecore_evas_window_get(comp->ee), 1); */
+ e_main_ts("\tE_Pointer New");
+ if ((comp->pointer = e_pointer_canvas_new(comp->ee, EINA_TRUE)))
+ {
+ comp->pointer->color = EINA_TRUE;
+ e_pointer_hide(comp->pointer);
+ }
+ e_main_ts("\tE_Pointer New Done");
+
+ /* FIXME: We need a way to trap for user changing the keymap inside of E
+ * without the event coming from X11 */
+
+ /* FIXME: We should make a decision here ...
+ *
+ * Fetch the keymap from drm, OR set this to what the E config is....
+ */
+
+ /* FIXME: This is just for testing at the moment....
+ * happens to jive with what drm does */
+ e_main_ts("\tE_Comp_WL Keymap Init");
+ e_comp_wl_input_keymap_set("evdev", "pc105", "us", ctx, map);
+ e_main_ts("\tE_Comp_WL Keymap Init Done");
+
+ E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_ACTIVATE, _e_comp_screen_cb_activate, comp);
+ E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_OUTPUT, _e_comp_screen_cb_output, comp);
+ E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_INPUT_DEVICE_ADD, _e_comp_screen_cb_input_device_add, comp);
+ E_LIST_HANDLER_APPEND(event_handlers, ECORE_DRM_EVENT_INPUT_DEVICE_DEL, _e_comp_screen_cb_input_device_del, comp);
+
+ TRACE_DS_END();
+
+ return EINA_TRUE;
+}
+
+E_API void
+e_comp_screen_shutdown()
+{
+ /* shutdown ecore_drm */
+ /* ecore_drm_shutdown(); */
+ e_output_shutdown();
+
+ dont_set_ecore_drm_keymap = EINA_FALSE;
+ dont_use_xkb_cache = EINA_FALSE;
+ E_FREE_LIST(event_handlers, ecore_event_handler_del);
+
+}
--- /dev/null
+#ifdef E_TYPEDEFS
+
+
+#else
+#ifndef E_COMP_SCREEN_H
+#define E_COMP_SCREEN_H
+
+
+EINTERN Eina_Bool e_comp_screen_available(void);
+EINTERN void e_comp_screen_stub(void);
+EINTERN void e_comp_screen_apply(void);
+EINTERN E_Output * e_comp_screen_init_outputs(void);
+EINTERN void e_comp_screen_dpms(int set);
+
+E_API Eina_Bool e_comp_screen_init(void);
+E_API void e_comp_screen_shutdown(void);
+
+#endif /*E_COMP_SCREEN_H*/
+
+#endif
#include "e_hints.h"
#include "e_plane.h"
#include "e_comp_hwc.h"
-#include "e_comp_drm.h"
+#include "e_comp_screen.h"
#include "e_output.h"
#ifdef HAVE_WAYLAND
e_output_init(void)
{
if (!E_EVENT_SCREEN_CHANGE) E_EVENT_SCREEN_CHANGE = ecore_event_type_new();
+ if (!e_comp_screen_available()) return EINA_FALSE;
+
+ e_output = e_comp_screen_init_outputs();
_do_apply();
static void
_do_apply(void)
{
- // take current screen config and apply it to the driver
- printf("OUTPUT: re-get info before applying..\n");
- _info_free(e_output);
- e_output = e_comp_drm_create();
+ // take current e_output config and apply it to the driver
_screen_config_maxsize();
printf("OUTPUT: eval config...\n");
_screen_config_eval();
printf("OUTPUT: really apply config...\n");
- e_comp_drm_apply();
+ e_comp_screen_apply();
printf("OUTPUT: done config...\n");
}
projects / platform / upstream / enlightenment.git / commitdiff