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

Add some debugging (will be removed after testing). 

Add function to handle packing a monitor into the layout.

Signed-off-by: Christopher Michael <cp.michael@samsung.com>

SVN revision: 81078
This commit is contained in:
Christopher Michael 2012-12-17 09:19:22 +00:00 committed by Christopher Michael
parent 13eb1a0321
commit 467da0c1a5
1 changed files with 46 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/modules/conf_randr/e_smart_randr.c
View File

@ -98,7 +98,9 @@ e_smart_randr_monitors_create(Evas_Object *obj)
/* loop the outputs on this crtc */ /* loop the outputs on this crtc */
EINA_LIST_FOREACH(crtc->outputs, ll, output) EINA_LIST_FOREACH(crtc->outputs, ll, output)
{ {
printf("\tChecking Output: %d\n", output->xid); printf("\tChecking Output: %d %s\n", output->xid, output->name);
printf("\tOutput Policy: %d\n", output->policy);
if (output->wired_clones) if (output->wired_clones)
printf("\tHAS WIRED CLONES !!\n"); printf("\tHAS WIRED CLONES !!\n");
@ -106,27 +108,24 @@ e_smart_randr_monitors_create(Evas_Object *obj)
if (output->connection_status == if (output->connection_status ==
ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
{ {
Evas_Object *m; Evas_Object *mon;
printf("\t\tConnected\n"); printf("\t\tConnected\n");
if ((m = e_smart_monitor_add(evas))) if ((mon = e_smart_monitor_add(evas)))
{ {
/* tell the monitor what layout it belongs to /* add this monitor to the layout */
* NB: This is needed so we can calculate best e_smart_randr_monitor_add(obj, mon);
* thumbnail size (among other things) */
e_smart_monitor_layout_set(m, sd->o_layout);
/* tell the monitor which output it references */ /* tell the monitor which output it references */
e_smart_monitor_output_set(m, output); e_smart_monitor_output_set(mon, output);
/* add monitor to layout */ /* move this monitor to it's current location */
e_layout_pack(sd->o_layout, m); e_smart_monitor_move(mon, crtc->geometry.x,
e_layout_child_move(m, crtc->geometry.x, crtc->geometry.y);
crtc->geometry.y);
e_layout_child_resize(m, crtc->geometry.w,
crtc->geometry.h);
sd->monitors = eina_list_append(sd->monitors, m); /* resize this monitor to it's current size */
e_smart_monitor_resize(mon, crtc->geometry.w,
crtc->geometry.h);
} }
} }
@ -149,10 +148,42 @@ e_smart_randr_monitors_create(Evas_Object *obj)
printf("\t\tDisconnected\n"); printf("\t\tDisconnected\n");
else else
printf("\t\tUnknown\n"); printf("\t\tUnknown\n");
if (output->monitor)
printf("\tHas Monitor\n");
} }
} }
} }
void
e_smart_randr_monitor_add(Evas_Object *obj, Evas_Object *mon)
{
E_Smart_Data *sd;
/* try to get the objects smart data */
if (!(sd = evas_object_smart_data_get(obj))) return;
/* tell the monitor what layout it belongs to
*
* NB: This is needed so we can calculate best thumbnail size */
e_smart_monitor_layout_set(mon, sd->o_layout);
/* TODO: Add evas callbacks for monitor resize, rotate, move */
/* TODO: Add listener for delete event */
/* add monitor to layout */
e_layout_pack(sd->o_layout, mon);
/* show the monitor
*
* NB: Needed. Do Not Remove */
evas_object_show(mon);
/* add this monitor to our list */
sd->monitors = eina_list_append(sd->monitors, mon);
}
/* local functions */ /* local functions */
static void static void
_e_smart_add(Evas_Object *obj) _e_smart_add(Evas_Object *obj)