[EGIT] [core/enlightenment] master 07/20: randr: common function for fetching output name

[Sebastian Dransfeld]

englebass pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=f32426878c9c73b571acc88e642937bbc9810815

commit f32426878c9c73b571acc88e642937bbc9810815
Author: Sebastian Dransfeld <s...@tango.flipp.net>
Date:   Thu Mar 6 10:09:18 2014 +0100

    randr: common function for fetching output name
    
    Add a common function to get output name, and also check edid if no name
    is set by randr.
---
 src/bin/e_randr.c | 30 ++++++++++++++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_randr.c b/src/bin/e_randr.c
index a6b81e3..a4dbcaa 100644
--- a/src/bin/e_randr.c
+++ b/src/bin/e_randr.c
@@ -35,6 +35,7 @@ static Eina_Bool _e_randr_lid_update(void);
 static Eina_Bool _e_randr_output_mode_valid(Ecore_X_Randr_Mode mode, 
Ecore_X_Randr_Mode *modes, int nmodes);
 static void      _e_randr_output_active_set(E_Randr_Output *cfg, Eina_Bool 
connected);
 static int       _e_randr_config_output_cmp(const void *a, const void *b);
+static char     *_e_randr_output_name_get(Ecore_X_Window root, 
Ecore_X_Randr_Output output);
 
 /* local variables */
 static Eina_List *_randr_event_handlers = NULL;
@@ -358,7 +359,7 @@ _e_randr_load(void)
              e_randr->outputs = eina_list_append(e_randr->outputs, output);
              output->cfg = output_cfg;
 
-             output->name = ecore_x_randr_output_name_get(root, 
output->cfg->xid, NULL);
+             output->name = _e_randr_output_name_get(root, output->cfg->xid);
              output->is_lid = _e_randr_is_lid(output);
 
              status = ecore_x_randr_output_connection_status_get(root, 
output->cfg->xid);
@@ -637,7 +638,7 @@ _e_randr_event_cb_output_change(void *data EINA_UNUSED, int 
type EINA_UNUSED, vo
         e_randr->outputs = eina_list_append(e_randr->outputs, output);
         output->cfg = output_cfg;
 
-        output->name = ecore_x_randr_output_name_get(root, output->cfg->xid, 
NULL);
+        output->name = _e_randr_output_name_get(root, output->cfg->xid);
         output->is_lid = _e_randr_is_lid(output);
         changed = EINA_TRUE;
      }
@@ -1192,3 +1193,28 @@ _e_randr_config_output_cmp(const void *a, const void *b)
    return 0;
 }
 
+static char *
+_e_randr_output_name_get(Ecore_X_Window root, Ecore_X_Randr_Output output)
+{
+   char *name;
+
+   name = ecore_x_randr_output_name_get(root, output, NULL);
+   if (!name)
+     {
+
+        unsigned char *edid = NULL;
+        unsigned long edid_length = 0;
+
+        /* get the edid for this output */
+        if ((edid =
+             ecore_x_randr_output_edid_get(root, output, &edid_length)))
+          {
+             /* get output name */
+             name = ecore_x_randr_edid_display_name_get(edid, edid_length);
+
+             /* free any memory allocated from ecore_x_randr */
+             free(edid);
+          }
+     }
+   return name;
+}

--