Revert "Fix bug when hotplugging a TV where resolution does not match the"

This reverts commit a9e09bc26d.

Breaks build, and does not fix real issue. Revert
This commit is contained in:
Chris Michael 2013-10-14 11:07:24 +01:00
parent a9e09bc26d
commit 4df53f06e3
1 changed files with 3 additions and 30 deletions

View File

@ -886,21 +886,15 @@ _e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, vo
* crtc's mode for cloning * crtc's mode for cloning
* *
* NB: Hmmm, what to do if it Cannot use this mode ?? */ * NB: Hmmm, what to do if it Cannot use this mode ?? */
/* get the modes that this output supports */
modes = modes =
ecore_x_randr_output_modes_get(ev->win, ecore_x_randr_output_modes_get(ev->win,
output_cfg->xid, output_cfg->xid,
&num, &pref); &num, &pref);
if (modes) if (modes)
{ {
/* loop the outputs modes */
for (c = 0; c < num; c++) for (c = 0; c < num; c++)
{ {
if ((modes[c] == mode) && if (modes[c] == mode)
((modes[c]->width == mode->width) &&
(modes[c]->height == mode->height)))
{ {
can_clone = EINA_TRUE; can_clone = EINA_TRUE;
break; break;
@ -921,35 +915,14 @@ _e_randr_event_cb_output_change(void *data EINA_UNUSED, int type EINA_UNUSED, vo
{ {
int cw, ch; int cw, ch;
ecore_x_randr_mode_size_get(ev->win, modes[c], ecore_x_randr_mode_size_get(ev->win,
modes[c],
&cw, &ch); &cw, &ch);
if ((cw == mw) && (ch == mh)) if ((cw == mw) && (ch == mh))
{ {
mode = modes[c]; mode = modes[c];
break; break;
} }
else
{
/* Grrrr, stupid TVs with their
* non-standard resolution of
* 1360x768 ... need to account for that */
if (ch == mh)
{
if (cw <= (mw - 6))
{
mode = modes[c];
break;
}
}
else if (cw == mw)
{
if (ch <= (mh - 6))
{
mode = modes[c];
break;
}
}
}
} }
} }