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

randr: always call _e_randr_output_active_set 

_e_randr_output_active_set should handle if we set active on an active
output
This commit is contained in:
Sebastian Dransfeld 2014-12-17 10:29:27 +01:00
parent 7ddc9d73ff
commit 7f14d81e6a
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/e_randr.c
View File

@ -809,7 +809,7 @@ _e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, vo
/* remove from old crtc */ /* remove from old crtc */
_e_randr_output_active_set(output, EINA_FALSE); _e_randr_output_active_set(output, EINA_FALSE);
} }
if ((!output->active) && (output->cfg->connect)) if (output->cfg->connect)
{ {
_e_randr_output_active_set(output, EINA_TRUE); _e_randr_output_active_set(output, EINA_TRUE);
@ -841,11 +841,8 @@ _e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, vo
else if (ev->connection == ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED) else if (ev->connection == ECORE_X_RANDR_CONNECTION_STATUS_DISCONNECTED)
{ {
/* disconnected */ /* disconnected */
if (output->active) _e_randr_output_active_set(output, EINA_FALSE);
{ changed = EINA_TRUE;
_e_randr_output_active_set(output, EINA_FALSE);
changed = EINA_TRUE;
}
} }
/* save the config if anything changed or we added a new one */ /* save the config if anything changed or we added a new one */
@ -1258,7 +1255,12 @@ _e_randr_crtc_from_outputs_set(E_Randr_Crtc *crtc)
{ {
if (!output->active) continue; if (!output->active) continue;
/* TODO: If status != connected, active should not be set */ /* TODO: If status != connected, active should not be set */
if (output->status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED) continue; if (output->status != ECORE_X_RANDR_CONNECTION_STATUS_CONNECTED)
{
printf("RRR: Error, unconnected output which is active.");
printf(" output: '%s' lid: %i active: %i status: %i\n", output->name, output->is_lid, output->active, output->status);
continue;
}
printf("RRR: output: '%s' lid: %i active: %i status: %i\n", output->name, output->is_lid, output->active, output->status); printf("RRR: output: '%s' lid: %i active: %i status: %i\n", output->name, output->is_lid, output->active, output->status);
/* TODO: Match all connected outputs, not only the first */ /* TODO: Match all connected outputs, not only the first */
crtc->mode = output->mode; crtc->mode = output->mode;
@ -1281,12 +1283,12 @@ _e_randr_lid_update(void)
{ {
if (!output->is_lid) continue; if (!output->is_lid) continue;
/* only disable lid if we got more than 1 connected output */ /* only disable lid if we got more than 1 connected output */
if ((_e_randr_lid_is_closed) && (output->active) && (e_randr->active > 1)) if ((_e_randr_lid_is_closed) && (e_randr->active > 1))
{ {
_e_randr_output_active_set(output, EINA_FALSE); _e_randr_output_active_set(output, EINA_FALSE);
changed = EINA_TRUE; changed = EINA_TRUE;
} }
else if (!output->active) else
{ {
_e_randr_output_active_set(output, EINA_TRUE); _e_randr_output_active_set(output, EINA_TRUE);
changed = EINA_TRUE; changed = EINA_TRUE;