monitor-config: Replace output name heuristics with connector_type

It's more difficult to replace the MetaOutputKey usage, so just
do this for now.
This commit is contained in:
Jasper St. Pierre 2014-12-29 16:45:18 -08:00
parent 9d2cd8ff87
commit c1db9d9181

View File

@ -898,6 +898,20 @@ key_is_laptop (MetaOutputKey *key)
g_str_has_prefix (key->connector, "eDP");
}
static gboolean
output_is_laptop (MetaOutput *output)
{
/* FIXME: extend with better heuristics */
switch (output->connector_type)
{
case META_CONNECTOR_TYPE_eDP:
case META_CONNECTOR_TYPE_LVDS:
return TRUE;
default:
return FALSE;
}
}
static gboolean
laptop_display_is_on (MetaConfiguration *config)
{
@ -1060,8 +1074,7 @@ find_primary_output (MetaOutput *outputs,
for (i = 0; i < n_outputs; i++)
{
if (g_str_has_prefix (outputs[i].name, "LVDS") ||
g_str_has_prefix (outputs[i].name, "eDP"))
if (output_is_laptop (output))
return &outputs[i];
}