move all x11-related randr code into e_comp_x_randr.c
authorMike Blumenkrantz <zmike@osg.samsung.com>
Wed, 22 Apr 2015 20:16:05 +0000 (16:16 -0400)
committerMike Blumenkrantz <zmike@osg.samsung.com>
Wed, 22 Apr 2015 20:16:05 +0000 (16:16 -0400)
src/bin/Makefile.mk
src/bin/e_comp_x_randr.c [new file with mode: 0644]
src/bin/e_comp_x_randr.h [new file with mode: 0644]
src/bin/e_includes.h
src/bin/e_randr2.c

index ecc6f7b..0266f21 100644 (file)
@@ -59,6 +59,7 @@ src/bin/e_comp_canvas.h \
 src/bin/e_comp_cfdata.h \
 src/bin/e_comp_object.h \
 src/bin/e_comp_x.h \
+src/bin/e_comp_x_randr.h \
 src/bin/e_config_data.h \
 src/bin/e_config_dialog.h \
 src/bin/e_config.h \
@@ -358,6 +359,7 @@ $(ENLIGHTENMENTHEADERS)
 if ! HAVE_WAYLAND_ONLY
 enlightenment_src += \
 src/bin/e_comp_x.c \
+src/bin/e_comp_x_randr.c \
 src/bin/e_alert.c \
 src/bin/e_randr2.c \
 src/bin/e_xsettings.c
diff --git a/src/bin/e_comp_x_randr.c b/src/bin/e_comp_x_randr.c
new file mode 100644 (file)
index 0000000..eeb73c5
--- /dev/null
@@ -0,0 +1,797 @@
+#include "e.h"
+
+static char *_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
+static Ecore_X_Randr_Edid_Display_Interface_Type _output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
+static char *_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
+static Eina_Bool _is_lid_name(const char *name);
+static Eina_Bool _cb_screen_change(void *data, int type, void *event);
+static Eina_Bool _cb_crtc_change(void *data, int type, void *event);
+static Eina_Bool _cb_output_change(void *data, int type, void *event);
+static Eina_Bool _output_name_find(Ecore_X_Window root, const char *name, Ecore_X_Randr_Output *outputs, int outputs_num, Ecore_X_Randr_Output *out_ret);
+static Eina_Bool _output_exists(Ecore_X_Randr_Output out, Ecore_X_Randr_Crtc_Info *info);
+static Eina_Bool _rotation_exists(int rot, Ecore_X_Randr_Crtc_Info *info);
+static Ecore_X_Randr_Mode _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output out);
+
+static Eina_List *handlers;
+
+
+static char *
+_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
+{
+   // get the name of the screen - likely a model name or manufacturer name
+   char *name;
+   unsigned long len = 0;
+   unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len);
+   if (!edid) return NULL;
+   name = ecore_x_randr_edid_display_name_get(edid, len);
+   free(edid);
+   return name;
+}
+
+static Ecore_X_Randr_Edid_Display_Interface_Type
+_output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
+{
+   // get what kind of connector (hdmi, dvi, displayport etc.) - vga is 
+   Ecore_X_Randr_Edid_Display_Interface_Type type;
+   unsigned long len = 0;
+   unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len);
+   if (!edid) return ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_UNDEFINED;
+   type = ecore_x_randr_edid_display_interface_type_get(edid, len);
+   free(edid);
+   return type;
+}
+
+static char *
+_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
+{
+   // get the output name - like connector (hdmi-0, dp1, dvi-0-1 etc.)
+   char *name = ecore_x_randr_output_name_get(root, o, NULL);
+   if (name) return name;
+   return _output_screen_get(root, o);
+}
+
+static Eina_Bool
+_is_lid_name(const char *name)
+{
+   // a fixed list of possible built in connector names - likely a laptop
+   // or device internal display
+   if (!name) return EINA_FALSE;
+   if      (strstr(name, "LVDS")) return EINA_TRUE;
+   else if (strstr(name, "lvds")) return EINA_TRUE;
+   else if (strstr(name, "Lvds")) return EINA_TRUE;
+   else if (strstr(name, "LCD"))  return EINA_TRUE;
+   else if (strstr(name, "eDP"))  return EINA_TRUE;
+   else if (strstr(name, "edp"))  return EINA_TRUE;
+   else if (strstr(name, "EDP"))  return EINA_TRUE;
+   return EINA_FALSE;
+}
+
+static char *
+_edid_string_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
+{
+   // convert the edid binary data into a hex string so we can use it as
+   // part of a name
+   unsigned char *edid = NULL;
+   unsigned long len = 0;
+   char *edid_str = NULL;
+
+   edid = ecore_x_randr_output_edid_get(root, o, &len);
+   if (edid)
+     {
+        unsigned int k, kk;
+
+        edid_str = malloc((len * 2) + 1);
+        if (edid_str)
+          {
+             const char *hexch = "0123456789abcdef";
+
+             for (kk = 0, k = 0; k < len; k++)
+               {
+                  edid_str[kk    ] = hexch[(edid[k] >> 4) & 0xf];
+                  edid_str[kk + 1] = hexch[ edid[k]       & 0xf];
+                  kk += 2;
+               }
+             edid_str[kk] = 0;
+          }
+        free(edid);
+     }
+   return edid_str;
+}
+
+static E_Randr2_Screen *
+_info_unconf_primary_find(E_Randr2 *r)
+{
+   Eina_List *l;
+   E_Randr2_Screen *s, *s_primary = NULL;
+   int priority = 0;
+
+   EINA_LIST_FOREACH(r->screens, l, s)
+     {
+        if (!((s->config.enabled) &&
+              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
+              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
+          continue;
+        if (s->config.priority > priority)
+          {
+             s_primary = s;
+             priority = s->config.priority;
+          }
+     }
+   return s_primary;
+}
+
+static E_Randr2_Screen *
+_info_unconf_left_find(E_Randr2 *r)
+{
+   Eina_List *l;
+   E_Randr2_Screen *s, *s_left = NULL;
+   int left_x = 0x7fffffff;
+   int left_size = 0;
+
+   EINA_LIST_FOREACH(r->screens, l, s)
+     {
+        if (!((s->config.enabled) &&
+              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
+              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
+          continue;
+        if ((s->config.geom.x <= left_x) &&
+            ((s->config.geom.w * s->config.geom.h) > left_size))
+          {
+             left_size = s->config.geom.w * s->config.geom.h;
+             left_x = s->config.geom.x;
+             s_left = s;
+          }
+     }
+   return s_left;
+}
+
+static E_Randr2_Screen *
+_info_unconf_closest_find(E_Randr2 *r, E_Randr2_Screen *s2, Eina_Bool configured)
+{
+   Eina_List *l;
+   E_Randr2_Screen *s, *s_sel = NULL;
+   int dist = 0x7fffffff;
+   int dx, dy;
+
+   EINA_LIST_FOREACH(r->screens, l, s)
+     {
+        if (s == s2) continue;
+        if (!((s->config.enabled) &&
+              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
+              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
+          continue;
+        if ((!configured) &&
+            (s->config.relative.mode != E_RANDR2_RELATIVE_UNKNOWN))
+          continue;
+        else if ((configured) &&
+                 (s->config.relative.mode == E_RANDR2_RELATIVE_UNKNOWN))
+          continue;
+        dx = (s->config.geom.x + (s->config.geom.w / 2)) -
+          (s2->config.geom.x + (s2->config.geom.w / 2));
+        dy = (s->config.geom.y + (s->config.geom.h / 2)) -
+          (s2->config.geom.y + (s2->config.geom.h / 2));
+        dx = sqrt((dx * dx) + (dy * dy));
+        if (dx < dist)
+          {
+             s_sel = s;
+             dist = dx;
+          }
+     }
+   return s_sel;
+}
+
+static void
+_info_relative_fixup(E_Randr2 *r)
+{
+   E_Randr2_Screen *s, *s2;
+   int d, dx, dy;
+
+   s = _info_unconf_primary_find(r);
+   if (s) s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
+   else
+     {
+        s = _info_unconf_left_find(r);
+        if (!s) return;
+        s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
+     }
+   for (;;)
+     {
+        // find the next screen that is closest to the last one we configured
+        /// that is still not configured yet
+        s = _info_unconf_closest_find(r, s, EINA_FALSE);
+        if (!s) break;
+        s2 = _info_unconf_closest_find(r, s, EINA_TRUE);
+        // fix up s->config.relative.mode, s->config.relative.to and
+        // s->config.relative.align to match (as closely as possible)
+        // the geometry given - config s relative to s2
+        if (!s2) s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
+        else
+          {
+             s->config.relative.to = strdup(s2->id);
+             s->config.relative.align = 0.0;
+             s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
+             if ((s->config.geom.x + s->config.geom.w) <=
+                 s2->config.geom.x)
+               {
+                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_LEFT;
+                  d = s->config.geom.h - s2->config.geom.h;
+                  dy = s2->config.geom.y - s->config.geom.y;
+                  if (d != 0)
+                    s->config.relative.align = ((double)dy) / ((double)d);
+               }
+             else if (s->config.geom.x >=
+                      (s2->config.geom.x + s2->config.geom.w))
+               {
+                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_RIGHT;
+                  d = s->config.geom.h - s2->config.geom.h;
+                  dy = s2->config.geom.y - s->config.geom.y;
+                  if (d != 0)
+                    s->config.relative.align = ((double)dy) / ((double)d);
+               }
+             else if ((s->config.geom.y + s->config.geom.h) <=
+                      s2->config.geom.y)
+               {
+                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_ABOVE;
+                  d = s->config.geom.w - s2->config.geom.w;
+                  dx = s2->config.geom.x - s->config.geom.x;
+                  if (d != 0)
+                    s->config.relative.align = ((double)dx) / ((double)d);
+               }
+             else if (s->config.geom.y >=
+                      (s2->config.geom.y + s2->config.geom.h))
+               {
+                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_BELOW;
+                  d = s->config.geom.w - s2->config.geom.w;
+                  dx = s2->config.geom.x - s->config.geom.x;
+                  if (d != 0)
+                    s->config.relative.align = ((double)dx) / ((double)d);
+               }
+             else if ((s->config.geom.x == s2->config.geom.x) &&
+                      (s->config.geom.y == s2->config.geom.y) &&
+                      (s->config.geom.w == s2->config.geom.w) &&
+                      (s->config.geom.h == s2->config.geom.h))
+               {
+                  s->config.relative.mode = E_RANDR2_RELATIVE_CLONE;
+               }
+             if (s->config.relative.align < 0.0)
+               s->config.relative.align = 0.0;
+             else if (s->config.relative.align > 1.0)
+               s->config.relative.align = 1.0;
+          }
+     }
+}
+
+static Eina_Bool
+_cb_screen_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_X_Event_Screen_Change *ev = event;
+   printf("RRR: CB screen change...\n");
+   ecore_x_randr_config_timestamp_get(ev->root);
+   ecore_x_randr_screen_current_size_get(ev->root, NULL, NULL, NULL, NULL);
+   ecore_x_sync();
+   if (!e_randr2_cfg->ignore_hotplug_events)
+     e_randr2_screen_refresh_queue(EINA_TRUE);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_cb_crtc_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_X_Event_Randr_Crtc_Change *ev = event;
+   printf("RRR: CB crtc change...\n");
+   ecore_x_randr_config_timestamp_get(ev->win);
+   ecore_x_randr_screen_current_size_get(ev->win, NULL, NULL, NULL, NULL);
+   ecore_x_sync();
+   if (!e_randr2_cfg->ignore_hotplug_events)
+     e_randr2_screen_refresh_queue(EINA_FALSE);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
+{
+   Ecore_X_Event_Randr_Output_Change *ev = event;
+   printf("RRR: CB output change...\n");
+   ecore_x_randr_config_timestamp_get(ev->win);
+   ecore_x_randr_screen_current_size_get(ev->win, NULL, NULL, NULL, NULL);
+   ecore_x_sync();
+   if (!e_randr2_cfg->ignore_hotplug_events)
+     e_randr2_screen_refresh_queue(EINA_TRUE);
+   return EINA_TRUE;
+}
+
+static Eina_Bool
+_output_name_find(Ecore_X_Window root, const char *name, Ecore_X_Randr_Output *outputs, int outputs_num, Ecore_X_Randr_Output *out_ret)
+{
+   int i;
+   char *n;
+
+   for (i = 0; i < outputs_num; i++)
+     {
+        n = _output_name_get(root, outputs[i]);
+        if ((n) && (!strcmp(n, name)))
+          {
+             free(n);
+             *out_ret = outputs[i];
+             return EINA_TRUE;
+          }
+        free(n);
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_output_exists(Ecore_X_Randr_Output out, Ecore_X_Randr_Crtc_Info *info)
+{
+   int i;
+
+   for (i = 0; i < info->npossible; i++)
+     {
+        if (out == info->possible[i]) return EINA_TRUE;
+     }
+   return EINA_FALSE;
+}
+
+static Eina_Bool
+_rotation_exists(int rot, Ecore_X_Randr_Crtc_Info *info)
+{
+   if ((rot == 0) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_0))
+     return EINA_TRUE;
+   if ((rot == 90) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_90))
+     return EINA_TRUE;
+   if ((rot == 180) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_180))
+     return EINA_TRUE;
+   if ((rot == 270) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_270))
+     return EINA_TRUE;
+   return EINA_FALSE;
+}
+
+static Ecore_X_Randr_Mode
+_mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output out)
+{
+   Ecore_X_Randr_Mode_Info *minfo;
+   Ecore_X_Randr_Mode mode = 0, *modes;
+   int modes_num = 0, modes_pref = 0, distance = 0x7fffffff;
+   int diff, i;
+   double refresh;
+
+   modes = ecore_x_randr_output_modes_get(root, out, &modes_num, &modes_pref);
+   if (!modes) printf("RRR: modes for '%s' FETCH FAILED!!!\n", s->info.name);
+   printf("RRR: modes for '%s' are %p [%i]\n", s->info.name, modes, modes_num);
+   if (modes)
+     {
+        for (i = 0; i < modes_num; i++)
+          {
+             minfo = ecore_x_randr_mode_info_get(root, modes[i]);
+             if (!minfo) continue;
+             refresh = (double)minfo->dotClock /
+               (double)(minfo->hTotal * minfo->vTotal);
+             diff =
+               (100 * abs(s->config.mode.w - minfo->width)) +
+               (100 * abs(s->config.mode.h - minfo->height)) +
+               abs((100 * s->config.mode.refresh) - (100 * refresh));
+             if (diff < distance)
+               {
+                  mode = modes[i];
+                  distance = diff;
+               }
+             ecore_x_randr_mode_info_free(minfo);
+          }
+        free(modes);
+     }
+   return mode;
+}
+
+EAPI void
+e_comp_x_randr_init(void)
+{
+   // add handler for randr screen change events
+   E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_SCREEN_CHANGE,
+                         _cb_screen_change, NULL);
+   E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_RANDR_CRTC_CHANGE,
+                         _cb_crtc_change, NULL);
+   E_LIST_HANDLER_APPEND(handlers, ECORE_X_EVENT_RANDR_OUTPUT_CHANGE,
+                         _cb_output_change, NULL);
+   // if it's 1.2 or better then we can select for these events
+   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
+     {
+        Ecore_X_Window root = ecore_x_window_root_first_get();
+        ecore_x_randr_events_select(root, EINA_TRUE);
+     }
+}
+
+EAPI void
+e_comp_x_randr_shutdown(void)
+{
+   // clear up event listening
+   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
+     {
+        Ecore_X_Window root = ecore_x_window_root_first_get();
+        ecore_x_randr_events_select(root, EINA_FALSE);
+     }
+   E_FREE_LIST(handlers, ecore_event_handler_del);
+}
+
+EAPI void
+e_comp_x_randr_config_apply(void)
+{
+   Eina_List *l;
+   E_Randr2_Screen *s;
+   Ecore_X_Window root = ecore_x_window_root_first_get();
+   int minw, minh, maxw, maxh, nw, nh, pw, ph, ww, hh;
+   Ecore_X_Randr_Crtc *crtcs = NULL;
+   Ecore_X_Randr_Output *outputs = NULL, out, *outconf;
+   E_Randr2_Screen **screenconf;
+   int crtcs_num = 0, outputs_num = 0, i, numout;
+   Ecore_X_Randr_Crtc_Info *info;
+   int top_priority = 0;
+
+   ecore_x_grab();
+   // set virtual resolution
+   nw = e_randr2->w;
+   nh = e_randr2->h;
+   ecore_x_randr_screen_size_range_get(root, &minw, &minh, &maxw, &maxh);
+   ecore_x_randr_screen_current_size_get(root, &pw, &ph, NULL, NULL);
+     {
+        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
+        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
+        printf("RRR: cur size: %ix%i\n", dww, dhh);
+     }
+   printf("RRR: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
+   if (nw > maxw) nw = maxw;
+   if (nh > maxh) nh = maxh;
+   if (nw < minw) nw = minw;
+   if (nh < minh) nh = minh;
+   ww = nw; if (nw < pw) ww = pw;
+   hh = nh; if (nh < ph) hh = ph;
+   ecore_x_randr_screen_current_size_set(root, ww, hh, -1, -1);
+     {
+        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
+        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
+        printf("RRR: cur size: %ix%i\n", dww, dhh);
+     }
+   printf("RRR: set vsize: %ix%i\n", nw, nh);
+
+   crtcs = ecore_x_randr_crtcs_get(root, &crtcs_num);
+   outputs = ecore_x_randr_outputs_get(root, &outputs_num);
+
+   if ((crtcs) && (outputs))
+     {
+        outconf = alloca(crtcs_num * sizeof(Ecore_X_Randr_Output));
+        screenconf = alloca(crtcs_num * sizeof(E_Randr2_Screen *));
+        memset(outconf, 0, crtcs_num * sizeof(Ecore_X_Randr_Output));
+        memset(screenconf, 0, crtcs_num * sizeof(E_Randr2_Screen *));
+
+        // decide which outputs get which crtcs
+        EINA_LIST_FOREACH(e_randr2->screens, l, s)
+          {
+             printf("RRR: find output for '%s'\n", s->info.name);
+             // XXX: find clones and set them as outputs in an array
+             if ((s->config.configured) &&
+                 (_output_name_find(root, s->info.name, outputs,
+                                    outputs_num, &out)))
+               {
+                  printf("RRR:   enabled: %i\n", s->config.enabled);
+                  if (s->config.enabled)
+                    {
+                       if (s->config.priority > top_priority)
+                         top_priority = s->config.priority;
+                       for (i = 0; i < crtcs_num; i++)
+                         {
+                            if (!outconf[i])
+                              {
+                                 printf("RRR:     crtc slot empty: %i\n", i);
+                                 info = ecore_x_randr_crtc_info_get(root,
+                                                                    crtcs[i]);
+                                 if (info)
+                                   {
+                                      if (_output_exists(out, info) &&
+                                          _rotation_exists(s->config.rotation,
+                                                           info))
+                                        {
+                                           printf("RRR:       assign slot out: %x\n", out);
+                                           outconf[i] = out;
+                                           screenconf[i] = s;
+                                           ecore_x_randr_crtc_info_free(info);
+                                           break;
+                                        }
+                                   }
+                              }
+                         }
+                    }
+               }
+          }
+        numout = 0;
+        for (i = 0; i < crtcs_num; i++)
+          {
+             if (outconf[i]) numout++;
+          }
+        if (numout)
+          {
+        // set up a crtc to drive each output (or not)
+        for (i = 0; i < crtcs_num; i++)
+          {
+             // XXX: find clones and set them as outputs in an array
+             if (outconf[i])
+               {
+                  Ecore_X_Randr_Orientation orient =
+                    ECORE_X_RANDR_ORIENTATION_ROT_0;
+                  Ecore_X_Randr_Mode mode;
+
+                  mode = _mode_screen_find(root, screenconf[i], outconf[i]);
+                  if (screenconf[i]->config.rotation == 0)
+                    orient = ECORE_X_RANDR_ORIENTATION_ROT_0;
+                  else if (screenconf[i]->config.rotation == 90)
+                    orient = ECORE_X_RANDR_ORIENTATION_ROT_90;
+                  else if (screenconf[i]->config.rotation == 180)
+                    orient = ECORE_X_RANDR_ORIENTATION_ROT_180;
+                  else if (screenconf[i]->config.rotation == 270)
+                    orient = ECORE_X_RANDR_ORIENTATION_ROT_270;
+                  printf("RRR: crtc on: %i = '%s'     @ %i %i    - %ix%i orient %i mode %x out %x\n",
+                         i, screenconf[i]->info.name,
+                         screenconf[i]->config.geom.x,
+                         screenconf[i]->config.geom.y,
+                         screenconf[i]->config.geom.w,
+                         screenconf[i]->config.geom.h,
+                         orient, mode, outconf[i]);
+                  if (!ecore_x_randr_crtc_settings_set
+                      (root, crtcs[i], &(outconf[i]), 1,
+                       screenconf[i]->config.geom.x,
+                       screenconf[i]->config.geom.y,
+                       mode, orient))
+                    printf("RRR:   failed to set crtc!!!!!!\n");
+                  ecore_x_randr_crtc_panning_area_set
+                    (root, crtcs[i],
+                     screenconf[i]->config.geom.x,
+                     screenconf[i]->config.geom.y,
+                     screenconf[i]->config.geom.w,
+                     screenconf[i]->config.geom.h);
+                  if (screenconf[i]->config.priority == top_priority)
+                    {
+                       ecore_x_randr_primary_output_set(root, outconf[i]);
+                       top_priority = -1;
+                    }
+               }
+             else
+               {
+                  printf("RRR: crtc off: %i\n", i);
+                  ecore_x_randr_crtc_settings_set
+                    (root, crtcs[i], NULL, 0, 0, 0, 0,
+                     ECORE_X_RANDR_ORIENTATION_ROT_0);
+               }
+          }
+          }
+        else
+          {
+             printf("RRR: EERRRRRROOOORRRRRRR no outputs to configure!\n");
+          }
+     }
+   free(outputs);
+   free(crtcs);
+
+   printf("RRR: set vsize: %ix%i\n", nw, nh);
+   ecore_x_randr_screen_current_size_set(root, nw, nh, -1, -1);
+     {
+        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
+        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
+        printf("RRR: cur size: %ix%i\n", dww, dhh);
+//        ecore_x_randr_screen_reset(root);
+//        ecore_x_randr_screen_current_size_set(root, nw, nh, -1, -1);
+//        ecore_x_sync();
+//        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
+//        printf("RRR: cur size: %ix%i\n", dww,d hh);
+     }
+   ecore_x_randr_screen_size_range_get(root, NULL, NULL, NULL, NULL);
+   ecore_x_ungrab();
+   ecore_x_sync();
+
+   // ignore the next batch of randr events - we caused them ourselves
+   // XXX: a problem. thew first time we configure the screen we may not
+   // get any events back to clear the ignore flag below, so only apply
+   // here if the randr config now doesnt match what we want to set up.
+//   event_ignore = EINA_TRUE;
+}
+
+EAPI Eina_Bool
+e_comp_x_randr_available(void)
+{
+   // is randr extn there?
+   return ecore_x_randr_query();
+}
+
+EAPI E_Randr2 *
+e_comp_x_randr_create(void)
+{
+   Ecore_X_Randr_Crtc *crtcs = NULL;
+   Ecore_X_Randr_Output *outputs = NULL;
+   int crtcs_num = 0, outputs_num = 0, i, j, k;
+   Ecore_X_Window root = ecore_x_window_root_first_get();
+   E_Randr2 *r = calloc(1, sizeof(E_Randr2));
+   if (!r) return NULL;
+
+   printf("RRR: ................. info get!\n");
+   // do this to force xrandr to update its content
+   ecore_x_randr_config_timestamp_get(root);
+   ecore_x_randr_screen_size_range_get(root, NULL, NULL, NULL, NULL);
+   ecore_x_sync();
+
+   crtcs = ecore_x_randr_crtcs_get(root, &crtcs_num);
+   outputs = ecore_x_randr_outputs_get(root, &outputs_num);
+
+   for (i = 0; i < outputs_num; i++)
+     {
+        Ecore_X_Randr_Mode *modes;
+        Ecore_X_Randr_Edid_Display_Interface_Type conn;
+        int modes_num = 0, modes_pref = 0, priority;
+        E_Config_Randr2_Screen *cs;
+        E_Randr2_Screen *s = calloc(1, sizeof(E_Randr2_Screen));
+        if (!s) continue;
+
+        s->info.name = _output_name_get(root, outputs[i]);
+        printf("RRR: .... out %s\n", s->info.name);
+        if (!s->info.name)
+          {
+             free(s);
+             continue;
+          }
+        s->info.screen = _output_screen_get(root, outputs[i]);
+        s->info.edid = _edid_string_get(root, outputs[i]);
+        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;
+          }
+        strcpy(s->id, s->info.name);
+        strcat(s->id, "/");
+        if (s->info.edid) strcat(s->id, s->info.edid);
+        conn = _output_conn_type_get(root, outputs[i]);
+        if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_UNDEFINED)
+          s->info.connector = E_RANDR2_CONNECTOR_UNDEFINED;
+        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_DVI)
+          s->info.connector = E_RANDR2_CONNECTOR_DVI;
+        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_HDMI_A)
+          s->info.connector = E_RANDR2_CONNECTOR_HDMI_A;
+        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_HDMI_B)
+          s->info.connector = E_RANDR2_CONNECTOR_HDMI_B;
+        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_MDDI)
+          s->info.connector = E_RANDR2_CONNECTOR_MDDI;
+        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_DISPLAY_PORT)
+          s->info.connector = E_RANDR2_CONNECTOR_DISPLAY_PORT;
+        s->info.is_lid = _is_lid_name(s->info.name);
+        s->info.lid_closed = s->info.is_lid && e_acpi_lid_is_closed();
+        printf("RRR: ...... lid_closed = %i (%i && %i)\n", s->info.lid_closed, s->info.is_lid, e_acpi_lid_is_closed());
+        if (ecore_x_randr_output_connection_status_get(root, outputs[i]) ==
+            ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
+          s->info.connected = EINA_TRUE;
+        printf("RRR: ...... connected %i\n", s->info.connected);
+        if (ecore_x_randr_output_backlight_level_get(root, outputs[i]) >= 0.0)
+          s->info.backlight = EINA_TRUE;
+        ecore_x_randr_output_size_mm_get(root, outputs[i],
+                                         &(s->info.size.w), &(s->info.size.h));
+        modes = ecore_x_randr_output_modes_get(root, outputs[i],
+                                               &modes_num, &modes_pref);
+        printf("RRR: ...... modes %p\n", modes);
+        if (modes)
+          {
+             for (j = 0; j < modes_num; j++)
+               {
+                  Ecore_X_Randr_Mode_Info *minfo =
+                    ecore_x_randr_mode_info_get(root, modes[j]);
+                  if (minfo)
+                    {
+                       E_Randr2_Mode *m = calloc(1, sizeof(E_Randr2_Mode));
+                       if (m)
+                         {
+                            m->w = minfo->width;
+                            m->h = minfo->height;
+                            m->refresh =
+                            (double)minfo->dotClock /
+                            (double)(minfo->hTotal * minfo->vTotal);
+                            if (j == (modes_pref - 1))
+                              m->preferred = EINA_TRUE;
+                            s->info.modes = eina_list_append(s->info.modes, m);
+                         }
+                       ecore_x_randr_mode_info_free(minfo);
+                    }
+               }
+             free(modes);
+          }
+        cs = NULL;
+        priority = 0;
+        if (e_randr2_cfg) cs = e_randr2_config_screen_find(s, e_randr2_cfg);
+        if (cs)
+          priority = cs->priority;
+        else if (ecore_x_randr_primary_output_get(root) == outputs[i])
+          priority = 100;
+        s->config.priority = priority;
+        for (j = 0; j < crtcs_num; j++)
+          {
+             Eina_Bool ok, possible;
+             Ecore_X_Randr_Crtc_Info *info =
+               ecore_x_randr_crtc_info_get(root, crtcs[j]);
+             if (info)
+               {
+                  ok = EINA_FALSE;
+                  possible = EINA_FALSE;
+                  for (k = 0; k < info->noutput; k++)
+                    {
+                       if (info->outputs[k] == outputs[i])
+                         {
+                            ok = EINA_TRUE;
+                            break;
+                         }
+                    }
+                  if (!ok)
+                    {
+                       for (k = 0; k < info->npossible; k++)
+                         {
+                            if (info->possible[k] == outputs[i])
+                              {
+                                 ok = EINA_TRUE;
+                                 possible = EINA_TRUE;
+                                 break;
+                              }
+                         }
+                    }
+                  if (ok)
+                    {
+                       if (!possible)
+                         {
+                            Ecore_X_Randr_Mode_Info *minfo;
+
+                            s->config.geom.x = info->x;
+                            s->config.geom.y = info->y;
+                            s->config.geom.w = info->width;
+                            s->config.geom.h = info->height;
+                            if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_0)
+                              s->config.rotation = 0;
+                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_90)
+                              s->config.rotation = 90;
+                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_180)
+                              s->config.rotation = 180;
+                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_270)
+                              s->config.rotation = 270;
+                            minfo = ecore_x_randr_mode_info_get(root,
+                                                                info->mode);
+                            if (minfo)
+                              {
+                                 s->config.enabled = EINA_TRUE;
+                                 s->config.mode.w = minfo->width;
+                                 s->config.mode.h = minfo->height;
+                                 s->config.mode.refresh =
+                                   (double)minfo->dotClock /
+                                   (double)(minfo->hTotal * minfo->vTotal);
+                                 ecore_x_randr_mode_info_free(minfo);
+                              }
+                            printf("RRR: '%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);
+                         }
+                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_0)
+                         s->info.can_rot_0 = EINA_TRUE;
+                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_90)
+                         s->info.can_rot_90 = EINA_TRUE;
+                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_180)
+                         s->info.can_rot_180 = EINA_TRUE;
+                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_270)
+                         s->info.can_rot_270 = EINA_TRUE;
+                    }
+                  ecore_x_randr_crtc_info_free(info);
+               }
+          }
+        r->screens = eina_list_append(r->screens, s);
+     }
+
+   free(outputs);
+   free(crtcs);
+
+   _info_relative_fixup(r);
+   return r;
+}
diff --git a/src/bin/e_comp_x_randr.h b/src/bin/e_comp_x_randr.h
new file mode 100644 (file)
index 0000000..ffd0986
--- /dev/null
@@ -0,0 +1,9 @@
+#ifndef E_COMP_X_RANDR_H
+# define E_COMP_X_RANDR_H
+
+EAPI void e_comp_x_randr_init(void);
+EAPI void e_comp_x_randr_shutdown(void);
+EAPI void e_comp_x_randr_config_apply(void);
+EAPI Eina_Bool e_comp_x_randr_available(void);
+EAPI E_Randr2 *e_comp_x_randr_create(void);
+#endif
index 6218768..0e68417 100644 (file)
@@ -10,6 +10,7 @@
 #ifdef NEED_X
 # include "e_comp_x.h"
 # include "e_randr2.h"
+# include "e_comp_x_randr.h"
 #endif
 #include "e_pixmap.h"
 #include "e_comp_object.h"
index c2d2f78..4b16194 100644 (file)
@@ -41,30 +41,10 @@ EAPI E_Randr2        *e_randr2 = NULL;
 EAPI int              E_EVENT_RANDR_CHANGE = 0;
 
 /////////////////////////////////////////////////////////////////////////
-// X11 backend
-static Eina_Bool _output_init(void);
-static void _output_shutdown(void);
-static void _output_events_listen(void);
-static void _output_events_unlisten(void);
-static char *_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
-static Ecore_X_Randr_Edid_Display_Interface_Type _output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
-static char *_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o);
-static Eina_Bool _is_lid_name(const char *name);
-static E_Randr2 *_info_get(void);
-static Eina_Bool _cb_screen_change(void *data, int type, void *event);
-static Eina_Bool _cb_crtc_change(void *data, int type, void *event);
-static Eina_Bool _cb_output_change(void *data, int type, void *event);
-static Eina_Bool _output_name_find(Ecore_X_Window root, const char *name, Ecore_X_Randr_Output *outputs, int outputs_num, Ecore_X_Randr_Output *out_ret);
-static Eina_Bool _output_exists(Ecore_X_Randr_Output out, Ecore_X_Randr_Crtc_Info *info);
-static Eina_Bool _rotation_exists(int rot, Ecore_X_Randr_Crtc_Info *info);
-static Ecore_X_Randr_Mode _mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output out);
-static void _screen_config_apply(void);
-
-/////////////////////////////////////////////////////////////////////////
 EINTERN Eina_Bool
 e_randr2_init(void)
 {
-   if (!_output_init()) return EINA_FALSE;
+   if (!e_comp_x_randr_available()) return EINA_FALSE;
    // create data descriptors for config storage
    _e_randr2_cfg_screen_edd =
      E_CONFIG_DD_NEW("E_Config_Randr2_Screen", E_Config_Randr2_Screen);
@@ -96,9 +76,9 @@ e_randr2_init(void)
 
    if (!E_EVENT_RANDR_CHANGE) E_EVENT_RANDR_CHANGE = ecore_event_type_new();
    // set up events from the driver
-   _output_events_listen();
+   e_comp_x_randr_init();
    // get current screen info
-   e_randr2 = _info_get();
+   e_randr2 = e_comp_x_randr_create();
    // from screen info calculate screen max dimensions
    _screen_config_maxsize();
    // load config and apply it
@@ -126,7 +106,7 @@ e_randr2_shutdown(void)
    if (_screen_delay_timer) ecore_timer_del(_screen_delay_timer);
    _screen_delay_timer = NULL;
    // stop listening to driver info
-   _output_events_unlisten();
+   e_comp_x_randr_shutdown();
    // clear up all event handlers
    E_FREE_LIST(_ev_handlers, ecore_event_handler_del);
    // free up screen info
@@ -137,7 +117,6 @@ e_randr2_shutdown(void)
    // free up data descriptors
    E_CONFIG_DD_FREE(_e_randr2_cfg_edd);
    E_CONFIG_DD_FREE(_e_randr2_cfg_screen_edd)
-   _output_shutdown();
    return 1;
 }
 
@@ -159,7 +138,7 @@ e_randr2_screeninfo_update(void)
 {
    // re-fetch/update current screen info
    _info_free(e_randr2);
-   e_randr2 = _info_get();
+   e_randr2 = e_comp_x_randr_create();
    _screen_config_maxsize();
 }
 
@@ -265,7 +244,7 @@ _do_apply(void)
    // take current screen config and apply it to the driver
    printf("RRR: re-get info before applying..\n");
    _info_free(e_randr2);
-   e_randr2 = _info_get();
+   e_randr2 = e_comp_x_randr_create();
    _screen_config_maxsize();
    printf("RRR: apply config...\n");
    _config_apply(e_randr2, e_randr2_cfg);
@@ -274,7 +253,7 @@ _do_apply(void)
    printf("RRR: eval config...\n");
    _screen_config_eval();
    printf("RRR: really apply config...\n");
-   _screen_config_apply();
+   e_comp_x_randr_config_apply();
    printf("RRR: done config...\n");
 }
 
@@ -546,7 +525,7 @@ _cb_screen_change_delay(void *data EINA_UNUSED)
         Eina_Bool change = EINA_FALSE;
 
         printf("RRR: reconfigure screens due to event...\n");
-        rtemp = _info_get();
+        rtemp = e_comp_x_randr_create();
         if (rtemp)
           {
              if (_screens_differ(e_randr2, rtemp)) change = EINA_TRUE;
@@ -862,793 +841,6 @@ _screen_config_maxsize(void)
    e_randr2->h = maxy;
 }
 
-/////////////////////////////////////////////////////////////////////////
-// X11 backend
-static Eina_Bool
-_output_init(void)
-{
-   // is randr extn there?
-   return ecore_x_randr_query();
-}
-
-static void
-_output_shutdown(void)
-{
-}
-
-static void
-_output_events_listen(void)
-{
-   // add handler for randr screen change events
-   E_LIST_HANDLER_APPEND(_ev_handlers, ECORE_X_EVENT_SCREEN_CHANGE,
-                         _cb_screen_change, NULL);
-   E_LIST_HANDLER_APPEND(_ev_handlers, ECORE_X_EVENT_RANDR_CRTC_CHANGE,
-                         _cb_crtc_change, NULL);
-   E_LIST_HANDLER_APPEND(_ev_handlers, ECORE_X_EVENT_RANDR_OUTPUT_CHANGE,
-                         _cb_output_change, NULL);
-   // if it's 1.2 or better then we can select for these events
-   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
-     {
-        Ecore_X_Window root = ecore_x_window_root_first_get();
-        ecore_x_randr_events_select(root, EINA_TRUE);
-     }
-}
-
-static void
-_output_events_unlisten(void)
-{
-   // clear up event listening
-   if (ecore_x_randr_version_get() >= E_RANDR_VERSION_1_2)
-     {
-        Ecore_X_Window root = ecore_x_window_root_first_get();
-        ecore_x_randr_events_select(root, EINA_FALSE);
-     }
-}
-
-static char *
-_output_screen_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
-{
-   // get the name of the screen - likely a model name or manufacturer name
-   char *name;
-   unsigned long len = 0;
-   unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len);
-   if (!edid) return NULL;
-   name = ecore_x_randr_edid_display_name_get(edid, len);
-   free(edid);
-   return name;
-}
-
-static Ecore_X_Randr_Edid_Display_Interface_Type
-_output_conn_type_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
-{
-   // get what kind of connector (hdmi, dvi, displayport etc.) - vga is 
-   Ecore_X_Randr_Edid_Display_Interface_Type type;
-   unsigned long len = 0;
-   unsigned char *edid = ecore_x_randr_output_edid_get(root, o, &len);
-   if (!edid) return ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_UNDEFINED;
-   type = ecore_x_randr_edid_display_interface_type_get(edid, len);
-   free(edid);
-   return type;
-}
-
-static char *
-_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
-{
-   // get the output name - like connector (hdmi-0, dp1, dvi-0-1 etc.)
-   char *name = ecore_x_randr_output_name_get(root, o, NULL);
-   if (name) return name;
-   return _output_screen_get(root, o);
-}
-
-static Eina_Bool
-_is_lid_name(const char *name)
-{
-   // a fixed list of possible built in connector names - likely a laptop
-   // or device internal display
-   if (!name) return EINA_FALSE;
-   if      (strstr(name, "LVDS")) return EINA_TRUE;
-   else if (strstr(name, "lvds")) return EINA_TRUE;
-   else if (strstr(name, "Lvds")) return EINA_TRUE;
-   else if (strstr(name, "LCD"))  return EINA_TRUE;
-   else if (strstr(name, "eDP"))  return EINA_TRUE;
-   else if (strstr(name, "edp"))  return EINA_TRUE;
-   else if (strstr(name, "EDP"))  return EINA_TRUE;
-   return EINA_FALSE;
-}
-
-static char *
-_edid_string_get(Ecore_X_Window root, Ecore_X_Randr_Output o)
-{
-   // convert the edid binary data into a hex string so we can use it as
-   // part of a name
-   unsigned char *edid = NULL;
-   unsigned long len = 0;
-   char *edid_str = NULL;
-
-   edid = ecore_x_randr_output_edid_get(root, o, &len);
-   if (edid)
-     {
-        unsigned int k, kk;
-
-        edid_str = malloc((len * 2) + 1);
-        if (edid_str)
-          {
-             const char *hexch = "0123456789abcdef";
-
-             for (kk = 0, k = 0; k < len; k++)
-               {
-                  edid_str[kk    ] = hexch[(edid[k] >> 4) & 0xf];
-                  edid_str[kk + 1] = hexch[ edid[k]       & 0xf];
-                  kk += 2;
-               }
-             edid_str[kk] = 0;
-          }
-        free(edid);
-     }
-   return edid_str;
-}
-
-static E_Randr2_Screen *
-_info_unconf_primary_find(E_Randr2 *r)
-{
-   Eina_List *l;
-   E_Randr2_Screen *s, *s_primary = NULL;
-   int priority = 0;
-
-   EINA_LIST_FOREACH(r->screens, l, s)
-     {
-        if (!((s->config.enabled) &&
-              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
-              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
-          continue;
-        if (s->config.priority > priority)
-          {
-             s_primary = s;
-             priority = s->config.priority;
-          }
-     }
-   return s_primary;
-}
-
-static E_Randr2_Screen *
-_info_unconf_left_find(E_Randr2 *r)
-{
-   Eina_List *l;
-   E_Randr2_Screen *s, *s_left = NULL;
-   int left_x = 0x7fffffff;
-   int left_size = 0;
-
-   EINA_LIST_FOREACH(r->screens, l, s)
-     {
-        if (!((s->config.enabled) &&
-              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
-              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
-          continue;
-        if ((s->config.geom.x <= left_x) &&
-            ((s->config.geom.w * s->config.geom.h) > left_size))
-          {
-             left_size = s->config.geom.w * s->config.geom.h;
-             left_x = s->config.geom.x;
-             s_left = s;
-          }
-     }
-   return s_left;
-}
-
-static E_Randr2_Screen *
-_info_unconf_closest_find(E_Randr2 *r, E_Randr2_Screen *s2, Eina_Bool configured)
-{
-   Eina_List *l;
-   E_Randr2_Screen *s, *s_sel = NULL;
-   int dist = 0x7fffffff;
-   int dx, dy;
-
-   EINA_LIST_FOREACH(r->screens, l, s)
-     {
-        if (s == s2) continue;
-        if (!((s->config.enabled) &&
-              (s->config.mode.w > 0) && (s->config.mode.h > 0) &&
-              (s->config.geom.w > 0) && (s->config.geom.h > 0)))
-          continue;
-        if ((!configured) &&
-            (s->config.relative.mode != E_RANDR2_RELATIVE_UNKNOWN))
-          continue;
-        else if ((configured) &&
-                 (s->config.relative.mode == E_RANDR2_RELATIVE_UNKNOWN))
-          continue;
-        dx = (s->config.geom.x + (s->config.geom.w / 2)) -
-          (s2->config.geom.x + (s2->config.geom.w / 2));
-        dy = (s->config.geom.y + (s->config.geom.h / 2)) -
-          (s2->config.geom.y + (s2->config.geom.h / 2));
-        dx = sqrt((dx * dx) + (dy * dy));
-        if (dx < dist)
-          {
-             s_sel = s;
-             dist = dx;
-          }
-     }
-   return s_sel;
-}
-
-static void
-_info_relative_fixup(E_Randr2 *r)
-{
-   E_Randr2_Screen *s, *s2;
-   int d, dx, dy;
-
-   s = _info_unconf_primary_find(r);
-   if (s) s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
-   else
-     {
-        s = _info_unconf_left_find(r);
-        if (!s) return;
-        s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
-     }
-   for (;;)
-     {
-        // find the next screen that is closest to the last one we configured
-        /// that is still not configured yet
-        s = _info_unconf_closest_find(r, s, EINA_FALSE);
-        if (!s) break;
-        s2 = _info_unconf_closest_find(r, s, EINA_TRUE);
-        // fix up s->config.relative.mode, s->config.relative.to and
-        // s->config.relative.align to match (as closely as possible)
-        // the geometry given - config s relative to s2
-        if (!s2) s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
-        else
-          {
-             s->config.relative.to = strdup(s2->id);
-             s->config.relative.align = 0.0;
-             s->config.relative.mode = E_RANDR2_RELATIVE_NONE;
-             if ((s->config.geom.x + s->config.geom.w) <=
-                 s2->config.geom.x)
-               {
-                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_LEFT;
-                  d = s->config.geom.h - s2->config.geom.h;
-                  dy = s2->config.geom.y - s->config.geom.y;
-                  if (d != 0)
-                    s->config.relative.align = ((double)dy) / ((double)d);
-               }
-             else if (s->config.geom.x >=
-                      (s2->config.geom.x + s2->config.geom.w))
-               {
-                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_RIGHT;
-                  d = s->config.geom.h - s2->config.geom.h;
-                  dy = s2->config.geom.y - s->config.geom.y;
-                  if (d != 0)
-                    s->config.relative.align = ((double)dy) / ((double)d);
-               }
-             else if ((s->config.geom.y + s->config.geom.h) <=
-                      s2->config.geom.y)
-               {
-                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_ABOVE;
-                  d = s->config.geom.w - s2->config.geom.w;
-                  dx = s2->config.geom.x - s->config.geom.x;
-                  if (d != 0)
-                    s->config.relative.align = ((double)dx) / ((double)d);
-               }
-             else if (s->config.geom.y >=
-                      (s2->config.geom.y + s2->config.geom.h))
-               {
-                  s->config.relative.mode = E_RANDR2_RELATIVE_TO_BELOW;
-                  d = s->config.geom.w - s2->config.geom.w;
-                  dx = s2->config.geom.x - s->config.geom.x;
-                  if (d != 0)
-                    s->config.relative.align = ((double)dx) / ((double)d);
-               }
-             else if ((s->config.geom.x == s2->config.geom.x) &&
-                      (s->config.geom.y == s2->config.geom.y) &&
-                      (s->config.geom.w == s2->config.geom.w) &&
-                      (s->config.geom.h == s2->config.geom.h))
-               {
-                  s->config.relative.mode = E_RANDR2_RELATIVE_CLONE;
-               }
-             if (s->config.relative.align < 0.0)
-               s->config.relative.align = 0.0;
-             else if (s->config.relative.align > 1.0)
-               s->config.relative.align = 1.0;
-          }
-     }
-}
-
-static E_Randr2 *
-_info_get(void)
-{
-   Ecore_X_Randr_Crtc *crtcs = NULL;
-   Ecore_X_Randr_Output *outputs = NULL;
-   int crtcs_num = 0, outputs_num = 0, i, j, k;
-   Ecore_X_Window root = ecore_x_window_root_first_get();
-   E_Randr2 *r = calloc(1, sizeof(E_Randr2));
-   if (!r) return NULL;
-
-   printf("RRR: ................. info get!\n");
-   // do this to force xrandr to update its content
-   ecore_x_randr_config_timestamp_get(root);
-   ecore_x_randr_screen_size_range_get(root, NULL, NULL, NULL, NULL);
-   ecore_x_sync();
-
-   crtcs = ecore_x_randr_crtcs_get(root, &crtcs_num);
-   outputs = ecore_x_randr_outputs_get(root, &outputs_num);
-
-   for (i = 0; i < outputs_num; i++)
-     {
-        Ecore_X_Randr_Mode *modes;
-        Ecore_X_Randr_Edid_Display_Interface_Type conn;
-        int modes_num = 0, modes_pref = 0, priority;
-        E_Config_Randr2_Screen *cs;
-        E_Randr2_Screen *s = calloc(1, sizeof(E_Randr2_Screen));
-        if (!s) continue;
-
-        s->info.name = _output_name_get(root, outputs[i]);
-        printf("RRR: .... out %s\n", s->info.name);
-        if (!s->info.name)
-          {
-             free(s);
-             continue;
-          }
-        s->info.screen = _output_screen_get(root, outputs[i]);
-        s->info.edid = _edid_string_get(root, outputs[i]);
-        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;
-          }
-        strcpy(s->id, s->info.name);
-        strcat(s->id, "/");
-        if (s->info.edid) strcat(s->id, s->info.edid);
-        conn = _output_conn_type_get(root, outputs[i]);
-        if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_UNDEFINED)
-          s->info.connector = E_RANDR2_CONNECTOR_UNDEFINED;
-        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_DVI)
-          s->info.connector = E_RANDR2_CONNECTOR_DVI;
-        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_HDMI_A)
-          s->info.connector = E_RANDR2_CONNECTOR_HDMI_A;
-        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_HDMI_B)
-          s->info.connector = E_RANDR2_CONNECTOR_HDMI_B;
-        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_MDDI)
-          s->info.connector = E_RANDR2_CONNECTOR_MDDI;
-        else if (conn == ECORE_X_RANDR_EDID_DISPLAY_INTERFACE_DISPLAY_PORT)
-          s->info.connector = E_RANDR2_CONNECTOR_DISPLAY_PORT;
-        s->info.is_lid = _is_lid_name(s->info.name);
-        s->info.lid_closed = s->info.is_lid && e_acpi_lid_is_closed();
-        printf("RRR: ...... lid_closed = %i (%i && %i)\n", s->info.lid_closed, s->info.is_lid, e_acpi_lid_is_closed());
-        if (ecore_x_randr_output_connection_status_get(root, outputs[i]) ==
-            ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
-          s->info.connected = EINA_TRUE;
-        printf("RRR: ...... connected %i\n", s->info.connected);
-        if (ecore_x_randr_output_backlight_level_get(root, outputs[i]) >= 0.0)
-          s->info.backlight = EINA_TRUE;
-        ecore_x_randr_output_size_mm_get(root, outputs[i],
-                                         &(s->info.size.w), &(s->info.size.h));
-        modes = ecore_x_randr_output_modes_get(root, outputs[i],
-                                               &modes_num, &modes_pref);
-        printf("RRR: ...... modes %p\n", modes);
-        if (modes)
-          {
-             for (j = 0; j < modes_num; j++)
-               {
-                  Ecore_X_Randr_Mode_Info *minfo =
-                    ecore_x_randr_mode_info_get(root, modes[j]);
-                  if (minfo)
-                    {
-                       E_Randr2_Mode *m = calloc(1, sizeof(E_Randr2_Mode));
-                       if (m)
-                         {
-                            m->w = minfo->width;
-                            m->h = minfo->height;
-                            m->refresh =
-                            (double)minfo->dotClock /
-                            (double)(minfo->hTotal * minfo->vTotal);
-                            if (j == (modes_pref - 1))
-                              m->preferred = EINA_TRUE;
-                            s->info.modes = eina_list_append(s->info.modes, m);
-                         }
-                       ecore_x_randr_mode_info_free(minfo);
-                    }
-               }
-             free(modes);
-          }
-        cs = NULL;
-        priority = 0;
-        if (e_randr2_cfg) cs = e_randr2_config_screen_find(s, e_randr2_cfg);
-        if (cs)
-          priority = cs->priority;
-        else if (ecore_x_randr_primary_output_get(root) == outputs[i])
-          priority = 100;
-        s->config.priority = priority;
-        for (j = 0; j < crtcs_num; j++)
-          {
-             Eina_Bool ok, possible;
-             Ecore_X_Randr_Crtc_Info *info =
-               ecore_x_randr_crtc_info_get(root, crtcs[j]);
-             if (info)
-               {
-                  ok = EINA_FALSE;
-                  possible = EINA_FALSE;
-                  for (k = 0; k < info->noutput; k++)
-                    {
-                       if (info->outputs[k] == outputs[i])
-                         {
-                            ok = EINA_TRUE;
-                            break;
-                         }
-                    }
-                  if (!ok)
-                    {
-                       for (k = 0; k < info->npossible; k++)
-                         {
-                            if (info->possible[k] == outputs[i])
-                              {
-                                 ok = EINA_TRUE;
-                                 possible = EINA_TRUE;
-                                 break;
-                              }
-                         }
-                    }
-                  if (ok)
-                    {
-                       if (!possible)
-                         {
-                            Ecore_X_Randr_Mode_Info *minfo;
-
-                            s->config.geom.x = info->x;
-                            s->config.geom.y = info->y;
-                            s->config.geom.w = info->width;
-                            s->config.geom.h = info->height;
-                            if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_0)
-                              s->config.rotation = 0;
-                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_90)
-                              s->config.rotation = 90;
-                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_180)
-                              s->config.rotation = 180;
-                            else if (info->rotation & ECORE_X_RANDR_ORIENTATION_ROT_270)
-                              s->config.rotation = 270;
-                            minfo = ecore_x_randr_mode_info_get(root,
-                                                                info->mode);
-                            if (minfo)
-                              {
-                                 s->config.enabled = EINA_TRUE;
-                                 s->config.mode.w = minfo->width;
-                                 s->config.mode.h = minfo->height;
-                                 s->config.mode.refresh =
-                                   (double)minfo->dotClock /
-                                   (double)(minfo->hTotal * minfo->vTotal);
-                                 ecore_x_randr_mode_info_free(minfo);
-                              }
-                            printf("RRR: '%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);
-                         }
-                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_0)
-                         s->info.can_rot_0 = EINA_TRUE;
-                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_90)
-                         s->info.can_rot_90 = EINA_TRUE;
-                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_180)
-                         s->info.can_rot_180 = EINA_TRUE;
-                       if (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_270)
-                         s->info.can_rot_270 = EINA_TRUE;
-                    }
-                  ecore_x_randr_crtc_info_free(info);
-               }
-          }
-        r->screens = eina_list_append(r->screens, s);
-     }
-
-   free(outputs);
-   free(crtcs);
-
-   _info_relative_fixup(r);
-   return r;
-}
-
-static Eina_Bool
-_cb_screen_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
-   Ecore_X_Event_Screen_Change *ev = event;
-   printf("RRR: CB screen change...\n");
-   ecore_x_randr_config_timestamp_get(ev->root);
-   ecore_x_randr_screen_current_size_get(ev->root, NULL, NULL, NULL, NULL);
-   ecore_x_sync();
-   if (!e_randr2_cfg->ignore_hotplug_events)
-     e_randr2_screen_refresh_queue(EINA_TRUE);
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_cb_crtc_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
-   Ecore_X_Event_Randr_Crtc_Change *ev = event;
-   printf("RRR: CB crtc change...\n");
-   ecore_x_randr_config_timestamp_get(ev->win);
-   ecore_x_randr_screen_current_size_get(ev->win, NULL, NULL, NULL, NULL);
-   ecore_x_sync();
-   if (!e_randr2_cfg->ignore_hotplug_events)
-     e_randr2_screen_refresh_queue(EINA_FALSE);
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, void *event)
-{
-   Ecore_X_Event_Randr_Output_Change *ev = event;
-   printf("RRR: CB output change...\n");
-   ecore_x_randr_config_timestamp_get(ev->win);
-   ecore_x_randr_screen_current_size_get(ev->win, NULL, NULL, NULL, NULL);
-   ecore_x_sync();
-   if (!e_randr2_cfg->ignore_hotplug_events)
-     e_randr2_screen_refresh_queue(EINA_TRUE);
-   return EINA_TRUE;
-}
-
-static Eina_Bool
-_output_name_find(Ecore_X_Window root, const char *name, Ecore_X_Randr_Output *outputs, int outputs_num, Ecore_X_Randr_Output *out_ret)
-{
-   int i;
-   char *n;
-
-   for (i = 0; i < outputs_num; i++)
-     {
-        n = _output_name_get(root, outputs[i]);
-        if ((n) && (!strcmp(n, name)))
-          {
-             free(n);
-             *out_ret = outputs[i];
-             return EINA_TRUE;
-          }
-        free(n);
-     }
-   return EINA_FALSE;
-}
-
-static Eina_Bool
-_output_exists(Ecore_X_Randr_Output out, Ecore_X_Randr_Crtc_Info *info)
-{
-   int i;
-
-   for (i = 0; i < info->npossible; i++)
-     {
-        if (out == info->possible[i]) return EINA_TRUE;
-     }
-   return EINA_FALSE;
-}
-
-static Eina_Bool
-_rotation_exists(int rot, Ecore_X_Randr_Crtc_Info *info)
-{
-   if ((rot == 0) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_0))
-     return EINA_TRUE;
-   if ((rot == 90) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_90))
-     return EINA_TRUE;
-   if ((rot == 180) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_180))
-     return EINA_TRUE;
-   if ((rot == 270) && (info->rotations & ECORE_X_RANDR_ORIENTATION_ROT_270))
-     return EINA_TRUE;
-   return EINA_FALSE;
-}
-
-static Ecore_X_Randr_Mode
-_mode_screen_find(Ecore_X_Window root, E_Randr2_Screen *s, Ecore_X_Randr_Output out)
-{
-   Ecore_X_Randr_Mode_Info *minfo;
-   Ecore_X_Randr_Mode mode = 0, *modes;
-   int modes_num = 0, modes_pref = 0, distance = 0x7fffffff;
-   int diff, i;
-   double refresh;
-
-   modes = ecore_x_randr_output_modes_get(root, out, &modes_num, &modes_pref);
-   if (!modes) printf("RRR: modes for '%s' FETCH FAILED!!!\n", s->info.name);
-   printf("RRR: modes for '%s' are %p [%i]\n", s->info.name, modes, modes_num);
-   if (modes)
-     {
-        for (i = 0; i < modes_num; i++)
-          {
-             minfo = ecore_x_randr_mode_info_get(root, modes[i]);
-             if (!minfo) continue;
-             refresh = (double)minfo->dotClock /
-               (double)(minfo->hTotal * minfo->vTotal);
-             diff =
-               (100 * abs(s->config.mode.w - minfo->width)) +
-               (100 * abs(s->config.mode.h - minfo->height)) +
-               abs((100 * s->config.mode.refresh) - (100 * refresh));
-             if (diff < distance)
-               {
-                  mode = modes[i];
-                  distance = diff;
-               }
-             ecore_x_randr_mode_info_free(minfo);
-          }
-        free(modes);
-     }
-   return mode;
-}
-
-static void
-_screen_config_apply(void)
-{
-   Eina_List *l;
-   E_Randr2_Screen *s;
-   Ecore_X_Window root = ecore_x_window_root_first_get();
-   int minw, minh, maxw, maxh, nw, nh, pw, ph, ww, hh;
-   Ecore_X_Randr_Crtc *crtcs = NULL;
-   Ecore_X_Randr_Output *outputs = NULL, out, *outconf;
-   E_Randr2_Screen **screenconf;
-   int crtcs_num = 0, outputs_num = 0, i, numout;
-   Ecore_X_Randr_Crtc_Info *info;
-   int top_priority = 0;
-
-   ecore_x_grab();
-   // set virtual resolution
-   nw = e_randr2->w;
-   nh = e_randr2->h;
-   ecore_x_randr_screen_size_range_get(root, &minw, &minh, &maxw, &maxh);
-   ecore_x_randr_screen_current_size_get(root, &pw, &ph, NULL, NULL);
-     {
-        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
-        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
-        printf("RRR: cur size: %ix%i\n", dww, dhh);
-     }
-   printf("RRR: size range: %ix%i -> %ix%i\n", minw, minh, maxw, maxh);
-   if (nw > maxw) nw = maxw;
-   if (nh > maxh) nh = maxh;
-   if (nw < minw) nw = minw;
-   if (nh < minh) nh = minh;
-   ww = nw; if (nw < pw) ww = pw;
-   hh = nh; if (nh < ph) hh = ph;
-   ecore_x_randr_screen_current_size_set(root, ww, hh, -1, -1);
-     {
-        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
-        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
-        printf("RRR: cur size: %ix%i\n", dww, dhh);
-     }
-   printf("RRR: set vsize: %ix%i\n", nw, nh);
-
-   crtcs = ecore_x_randr_crtcs_get(root, &crtcs_num);
-   outputs = ecore_x_randr_outputs_get(root, &outputs_num);
-
-   if ((crtcs) && (outputs))
-     {
-        outconf = alloca(crtcs_num * sizeof(Ecore_X_Randr_Output));
-        screenconf = alloca(crtcs_num * sizeof(E_Randr2_Screen *));
-        memset(outconf, 0, crtcs_num * sizeof(Ecore_X_Randr_Output));
-        memset(screenconf, 0, crtcs_num * sizeof(E_Randr2_Screen *));
-
-        // decide which outputs get which crtcs
-        EINA_LIST_FOREACH(e_randr2->screens, l, s)
-          {
-             printf("RRR: find output for '%s'\n", s->info.name);
-             // XXX: find clones and set them as outputs in an array
-             if ((s->config.configured) &&
-                 (_output_name_find(root, s->info.name, outputs,
-                                    outputs_num, &out)))
-               {
-                  printf("RRR:   enabled: %i\n", s->config.enabled);
-                  if (s->config.enabled)
-                    {
-                       if (s->config.priority > top_priority)
-                         top_priority = s->config.priority;
-                       for (i = 0; i < crtcs_num; i++)
-                         {
-                            if (!outconf[i])
-                              {
-                                 printf("RRR:     crtc slot empty: %i\n", i);
-                                 info = ecore_x_randr_crtc_info_get(root,
-                                                                    crtcs[i]);
-                                 if (info)
-                                   {
-                                      if (_output_exists(out, info) &&
-                                          _rotation_exists(s->config.rotation,
-                                                           info))
-                                        {
-                                           printf("RRR:       assign slot out: %x\n", out);
-                                           outconf[i] = out;
-                                           screenconf[i] = s;
-                                           ecore_x_randr_crtc_info_free(info);
-                                           break;
-                                        }
-                                   }
-                              }
-                         }
-                    }
-               }
-          }
-        numout = 0;
-        for (i = 0; i < crtcs_num; i++)
-          {
-             if (outconf[i]) numout++;
-          }
-        if (numout)
-          {
-        // set up a crtc to drive each output (or not)
-        for (i = 0; i < crtcs_num; i++)
-          {
-             // XXX: find clones and set them as outputs in an array
-             if (outconf[i])
-               {
-                  Ecore_X_Randr_Orientation orient =
-                    ECORE_X_RANDR_ORIENTATION_ROT_0;
-                  Ecore_X_Randr_Mode mode;
-
-                  mode = _mode_screen_find(root, screenconf[i], outconf[i]);
-                  if (screenconf[i]->config.rotation == 0)
-                    orient = ECORE_X_RANDR_ORIENTATION_ROT_0;
-                  else if (screenconf[i]->config.rotation == 90)
-                    orient = ECORE_X_RANDR_ORIENTATION_ROT_90;
-                  else if (screenconf[i]->config.rotation == 180)
-                    orient = ECORE_X_RANDR_ORIENTATION_ROT_180;
-                  else if (screenconf[i]->config.rotation == 270)
-                    orient = ECORE_X_RANDR_ORIENTATION_ROT_270;
-                  printf("RRR: crtc on: %i = '%s'     @ %i %i    - %ix%i orient %i mode %x out %x\n",
-                         i, screenconf[i]->info.name,
-                         screenconf[i]->config.geom.x,
-                         screenconf[i]->config.geom.y,
-                         screenconf[i]->config.geom.w,
-                         screenconf[i]->config.geom.h,
-                         orient, mode, outconf[i]);
-                  if (!ecore_x_randr_crtc_settings_set
-                      (root, crtcs[i], &(outconf[i]), 1,
-                       screenconf[i]->config.geom.x,
-                       screenconf[i]->config.geom.y,
-                       mode, orient))
-                    printf("RRR:   failed to set crtc!!!!!!\n");
-                  ecore_x_randr_crtc_panning_area_set
-                    (root, crtcs[i],
-                     screenconf[i]->config.geom.x,
-                     screenconf[i]->config.geom.y,
-                     screenconf[i]->config.geom.w,
-                     screenconf[i]->config.geom.h);
-                  if (screenconf[i]->config.priority == top_priority)
-                    {
-                       ecore_x_randr_primary_output_set(root, outconf[i]);
-                       top_priority = -1;
-                    }
-               }
-             else
-               {
-                  printf("RRR: crtc off: %i\n", i);
-                  ecore_x_randr_crtc_settings_set
-                    (root, crtcs[i], NULL, 0, 0, 0, 0,
-                     ECORE_X_RANDR_ORIENTATION_ROT_0);
-               }
-          }
-          }
-        else
-          {
-             printf("RRR: EERRRRRROOOORRRRRRR no outputs to configure!\n");
-          }
-     }
-   free(outputs);
-   free(crtcs);
-
-   printf("RRR: set vsize: %ix%i\n", nw, nh);
-   ecore_x_randr_screen_current_size_set(root, nw, nh, -1, -1);
-     {
-        int dww = 0, dhh = 0, dww2 = 0, dhh2 = 0;
-        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
-        printf("RRR: cur size: %ix%i\n", dww, dhh);
-//        ecore_x_randr_screen_reset(root);
-//        ecore_x_randr_screen_current_size_set(root, nw, nh, -1, -1);
-//        ecore_x_sync();
-//        ecore_x_randr_screen_current_size_get(root, &dww, &dhh, &dww2, &dhh2);
-//        printf("RRR: cur size: %ix%i\n", dww,d hh);
-     }
-   ecore_x_randr_screen_size_range_get(root, NULL, NULL, NULL, NULL);
-   ecore_x_ungrab();
-   ecore_x_sync();
-
-   // ignore the next batch of randr events - we caused them ourselves
-   // XXX: a problem. thew first time we configure the screen we may not
-   // get any events back to clear the ignore flag below, so only apply
-   // here if the randr config now doesnt match what we want to set up.
-//   event_ignore = EINA_TRUE;
-}
-
 EAPI void
 e_randr2_screen_refresh_queue(Eina_Bool lid_event)
 {