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

Fetch all current monitor values once (rather than a fetch for each 

change).
Add code to apply Disabled/Enabled state.

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

SVN revision: 81140
This commit is contained in:
Christopher Michael 2012-12-17 13:42:15 +00:00 committed by Christopher Michael
parent 3ba73d30d8
commit 507e6a25fb
1 changed files with 76 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,6 +386,11 @@ e_smart_randr_changes_apply(Evas_Object *obj, Ecore_X_Window root)
E_Randr_Output_Info *output;
E_Randr_Crtc_Info *crtc;
E_Smart_Monitor_Changes changes = E_SMART_MONITOR_CHANGED_NONE;
Ecore_X_Randr_Orientation orient;
Ecore_X_Randr_Mode_Info *mode = NULL;
Evas_Coord mx = 0, my = 0;
Ecore_X_Randr_Output *outputs = NULL;
int noutputs = -1;
/* get the changes for this monitor */
changes = e_smart_monitor_changes_get(mon);
@ -399,17 +404,79 @@ e_smart_randr_changes_apply(Evas_Object *obj, Ecore_X_Window root)
/* get the outputs crtc */
crtc = output->crtc;
/* setup apply outputs */
if ((crtc) && (crtc->outputs))
noutputs = eina_list_count(crtc->outputs);
if (noutputs < 1)
{
outputs = calloc(1, sizeof(Ecore_X_Randr_Output));
outputs[0] = output->xid;
noutputs = 1;
}
else
{
if ((crtc) && (crtc->outputs))
{
int i = 0;
outputs = calloc(noutputs, sizeof(Ecore_X_Randr_Output));
for (i = 0; i < noutputs; i++)
{
E_Randr_Output_Info *oinfo;
oinfo =
eina_list_data_get(eina_list_nth(crtc->outputs, i));
outputs[i] = oinfo->xid;
}
}
}
/* get current orientation */
orient = e_smart_monitor_current_orientation_get(mon);
/* get the current mode */
mode = e_smart_monitor_current_mode_get(mon);
/* get current position */
e_smart_monitor_current_geometry_get(mon, &mx, &my, NULL, NULL);
/* apply any changes to enabled */
if (changes & E_SMART_MONITOR_CHANGED_ENABLED)
{
if (e_smart_monitor_current_enabled_get(mon))
{
if (crtc)
{
/* apply enabled state */
ecore_x_randr_crtc_settings_set(root, crtc->xid,
outputs, noutputs,
mx, my,
mode->xid, orient);
/* set reset flag */
reset = EINA_TRUE;
}
}
else
{
if (crtc)
{
/* apply disabled state */
ecore_x_randr_crtc_settings_set(root, crtc->xid,
NULL, 0, 0, 0, 0,
ECORE_X_RANDR_ORIENTATION_ROT_0);
/* set reset flag */
reset = EINA_TRUE;
}
}
}
/* apply any changes to position */
if (changes & E_SMART_MONITOR_CHANGED_POSITION)
{
if (crtc)
{
Evas_Coord mx = 0, my = 0;
/* get current position */
e_smart_monitor_current_geometry_get(mon, &mx, &my,
NULL, NULL);
/* apply new position */
ecore_x_randr_crtc_pos_set(root, crtc->xid, mx, my);
@ -423,11 +490,6 @@ e_smart_randr_changes_apply(Evas_Object *obj, Ecore_X_Window root)
{
if (crtc)
{
Ecore_X_Randr_Orientation orient;
/* get the current orientation */
orient = e_smart_monitor_current_orientation_get(mon);
/* apply orientation change */
ecore_x_randr_crtc_orientation_set(root, crtc->xid, orient);
@ -442,18 +504,6 @@ e_smart_randr_changes_apply(Evas_Object *obj, Ecore_X_Window root)
{
if (crtc)
{
Ecore_X_Randr_Mode_Info *mode = NULL;
Ecore_X_Randr_Output *outputs = NULL;
int noutputs = -1;
if (output) outputs = &output->xid;
if ((crtc) && (crtc->outputs))
noutputs = eina_list_count(crtc->outputs);
/* get the current mode */
if (!(mode = e_smart_monitor_current_mode_get(mon)))
continue;
/* apply mode change */
ecore_x_randr_crtc_mode_set(root, crtc->xid,
outputs, noutputs, mode->xid);
@ -463,6 +513,9 @@ e_smart_randr_changes_apply(Evas_Object *obj, Ecore_X_Window root)
}
}
/* free allocated outputs */
if (outputs) free(outputs);
/* monitors changes have been sent. Signal this monitor so that
* we can reset the 'original' values to the 'current' values
* and reset the 'changes' variable */