DisplayConfig: Add display-name monitor property

This is the same property as the one associated with an output in
GetResources.

https://bugzilla.gnome.org/show_bug.cgi?id=777732
This commit is contained in:
Jonas Ådahl 2017-04-06 13:13:20 +08:00
parent 9755cd469c
commit 04d7fcf60d
2 changed files with 9 additions and 0 deletions

View File

@ -1419,6 +1419,8 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
GVariantBuilder monitor_properties_builder; GVariantBuilder monitor_properties_builder;
GList *k; GList *k;
gboolean is_builtin; gboolean is_builtin;
MetaOutput *main_output;
char *display_name;
current_mode = meta_monitor_get_current_mode (monitor); current_mode = meta_monitor_get_current_mode (monitor);
preferred_mode = meta_monitor_get_preferred_mode (monitor); preferred_mode = meta_monitor_get_preferred_mode (monitor);
@ -1465,6 +1467,12 @@ meta_monitor_manager_handle_get_current_state (MetaDBusDisplayConfig *skeleton,
"is-builtin", "is-builtin",
g_variant_new_boolean (is_builtin)); g_variant_new_boolean (is_builtin));
main_output = meta_monitor_get_main_output (monitor);
display_name = make_display_name (manager, main_output);
g_variant_builder_add (&monitor_properties_builder, "{sv}",
"display-name",
g_variant_new_take_string (display_name));
g_variant_builder_add (&monitors_builder, MONITOR_FORMAT, g_variant_builder_add (&monitors_builder, MONITOR_FORMAT,
monitor_spec->connector, monitor_spec->connector,
monitor_spec->vendor, monitor_spec->vendor,

View File

@ -334,6 +334,7 @@
- "is-builtin" (b): whether the monitor is built in, e.g. a - "is-builtin" (b): whether the monitor is built in, e.g. a
laptop panel (absence of this means it is laptop panel (absence of this means it is
not built in) not built in)
- "display-name" (s): a human readable display name of the monitor
Possible mode flags: Possible mode flags:
1 : preferred mode 1 : preferred mode