diff options
| author | Burt P <pburt0@gmail.com> | 2019-12-27 18:55:45 -0600 |
|---|---|---|
| committer | Leandro A. F. Pereira <leandro@hardinfo.org> | 2019-12-27 22:16:36 -0800 |
| commit | 685302bac452cf34d569cdd8ec6f21ebf2415f4e (patch) | |
| tree | b11823c8b9ebe2f8a8ea6977a62e54df5e92618c /modules | |
| parent | e7dd39f9d227c5507e3789b18c7385bd3ea3cb8c (diff) | |
monitors: use vendor flag for vendor fields
Signed-off-by: Burt P <pburt0@gmail.com>
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/devices/monitors.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/modules/devices/monitors.c b/modules/devices/monitors.c index a70fa3c7..7c64c10a 100644 --- a/modules/devices/monitors.c +++ b/modules/devices/monitors.c @@ -164,8 +164,10 @@ gchar *monitor_name(monitor *m, gboolean include_vendor) { if (include_vendor) { if (e->ven.type != VEN_TYPE_INVALID) { gchar *vstr = monitor_vendor_str(m, FALSE, FALSE); - desc = appfsp(desc, "%s", vendor_get_shortest_name(vstr)); + gchar *vtag = vendor_match_tag(vstr, params.fmt_opts); + desc = appfsp(desc, "%s", vtag ? vtag : vstr); g_free(vstr); + g_free(vtag); } else desc = appfsp(desc, "%s", "Unknown"); } @@ -221,7 +223,7 @@ static gchar *make_edid_section(monitor *m) { int i; edid *e = m->e; if (e->len) { - gchar *vstr = monitor_vendor_str(m, TRUE, TRUE); + gchar *vstr = monitor_vendor_str(m, TRUE, FALSE); gchar *dom = NULL; if (!e->dom.is_model_year && e->dom.week && e->dom.year) @@ -364,7 +366,7 @@ static gchar *make_edid_section(monitor *m) { "%s=%s\n" /* base out */ "%s=%s\n" /* ext out */ "[%s]\n" - "%s=%s\n" /* vendor */ + "$^$%s=%s\n" /* vendor */ "%s=%s\n" /* name */ "%s=[%04x-%08x] %u-%u\n" /* model, n_serial */ "%s=%s\n" /* serial */ |