w32_common: add display-names/friendly property

The `friendly` subkey return the same set of displays as `display-names`
but it attempts to convert the names to the human-friendly name that
DisplayConfig obtains from the EDID.

Author: BreadFish64

DOCS/interface-changes/display-name-friendly.txt

@@ -0,0 +1 @@
+add `display-name/friendly` property on Windows to obtain display names from EDID

DOCS/man/input.rst

@@ -2930,6 +2930,11 @@ Property list
     version >= 4 is used (LVDS-1, HDMI-A-1, X11-1, etc.), or the wl_output model
     reported by the geometry event if protocol version < 4 is used.
 
+    ``display-names/friendly``
+        These are the human-friendly names obtained from the monitor EDID
+        (Dell AW3223DW, LC34G55T, etc.). These follow the same order as
+        ``display-names`` (Windows only)
+
 ``display-fps``
     The refresh rate of the current display. Currently, this is the lowest FPS
     of any display covered by the video, as retrieved by the underlying system

player/command.c

@@ -2823,21 +2823,16 @@ static int mp_property_focused(void *ctx, struct m_property *prop,
     return m_property_bool_ro(action, arg, focused);
 }
 
-static int mp_property_display_names(void *ctx, struct m_property *prop,
-                                     int action, void *arg)
+static int get_display_names_subkey(struct vo *vo, int action,
+                                    void *arg, enum mp_voctrl voctrl)
 {
-    MPContext *mpctx = ctx;
-    struct vo *vo = mpctx->video_out;
-    if (!vo)
-        return M_PROPERTY_UNAVAILABLE;
-
     switch (action) {
     case M_PROPERTY_GET_TYPE:
         *(struct m_option *)arg = (struct m_option){.type = CONF_TYPE_STRING_LIST};
         return M_PROPERTY_OK;
     case M_PROPERTY_GET: {
-        char** display_names;
-        if (vo_control(vo, VOCTRL_GET_DISPLAY_NAMES, &display_names) < 1)
+        char **display_names;
+        if (vo_control(vo, voctrl, &display_names) < 1)
             return M_PROPERTY_UNAVAILABLE;
 
         *(char ***)arg = display_names;
@@ -2847,6 +2842,25 @@ static int mp_property_display_names(void *ctx, struct m_property *prop,
     return M_PROPERTY_NOT_IMPLEMENTED;
 }
 
+static int mp_property_display_names(void *ctx, struct m_property *prop,
+                                     int action, void *arg)
+{
+    MPContext *mpctx = ctx;
+    struct vo *vo = mpctx->video_out;
+    if (!vo)
+        return M_PROPERTY_UNAVAILABLE;
+
+    if (action == M_PROPERTY_KEY_ACTION) {
+        struct m_property_action_arg *const ka = arg;
+        if (strcmp(ka->key, "friendly"))
+            return M_PROPERTY_UNKNOWN;
+
+        return get_display_names_subkey(vo, ka->action, ka->arg,
+                                        VOCTRL_GET_DISPLAY_NAMES_FRIENDLY);
+    }
+    return get_display_names_subkey(vo, action, arg, VOCTRL_GET_DISPLAY_NAMES);
+}
+
 static int mp_property_vo_configured(void *ctx, struct m_property *prop,
                                      int action, void *arg)
 {
@@ -4511,8 +4525,8 @@ static const char *const *const mp_event_property_change[] = {
       "demuxer-cache-state"),
     E(MP_EVENT_WIN_RESIZE, "current-window-scale", "osd-width", "osd-height",
       "osd-par", "osd-dimensions"),
-    E(MP_EVENT_WIN_STATE, "display-names", "display-fps", "display-width",
-      "display-height"),
+    E(MP_EVENT_WIN_STATE, "display-names", "display-names/friendly", "display-fps",
+      "display-width", "display-height"),
     E(MP_EVENT_WIN_STATE2, "display-hidpi-scale"),
     E(MP_EVENT_FOCUS, "focused"),
     E(MP_EVENT_AMBIENT_LIGHTING_CHANGED, "ambient-light"),

video/out/vo.h

@@ -106,6 +106,10 @@ enum mp_voctrl {
     // names for displays the window is on
     VOCTRL_GET_DISPLAY_NAMES,
 
+    // char *** (NULL terminated array compatible with CONF_TYPE_STRING_LIST)
+    // human-friendly names for displays the window is on
+    VOCTRL_GET_DISPLAY_NAMES_FRIENDLY,
+
     // Retrieve window contents. (Normal screenshots use vo_get_current_frame().)
     // Deprecated for VOCTRL_SCREENSHOT with corresponding flags.
     VOCTRL_SCREENSHOT_WIN,              // struct mp_image**

video/out/w32_common.c

@@ -2243,8 +2243,23 @@ struct disp_names_data {
     HMONITOR assoc;
     int count;
     char **names;
+    bool friendly;
 };
 
+static void disp_names_append(HMONITOR mon, struct disp_names_data *data)
+{
+    MONITORINFOEXW mi = { .cbSize = sizeof mi };
+    if (GetMonitorInfoW(mon, (MONITORINFO*)&mi)) {
+        wchar_t *friendly_name = NULL;
+        if (data->friendly) {
+            friendly_name = mp_w32_displayconfig_get_friendly_name_from_device(mi.szDevice);
+        }
+        wchar_t *name = friendly_name ? friendly_name : mi.szDevice;
+        MP_TARRAY_APPEND(NULL, data->names, data->count, mp_to_utf8(NULL, name));
+        talloc_free(friendly_name);
+    }
+}
+
 static BOOL CALLBACK disp_names_proc(HMONITOR mon, HDC dc, LPRECT r, LPARAM p)
 {
     struct disp_names_data *data = (struct disp_names_data*)p;
@@ -2253,30 +2268,25 @@ static BOOL CALLBACK disp_names_proc(HMONITOR mon, HDC dc, LPRECT r, LPARAM p)
     if (mon == data->assoc)
         return TRUE;
 
-    MONITORINFOEXW mi = { .cbSize = sizeof mi };
-    if (GetMonitorInfoW(mon, (MONITORINFO*)&mi)) {
-        MP_TARRAY_APPEND(NULL, data->names, data->count,
-                         mp_to_utf8(NULL, mi.szDevice));
-    }
+    disp_names_append(mon, data);
     return TRUE;
 }
 
-static char **get_disp_names(struct vo_w32_state *w32)
+static char **get_disp_names(struct vo_w32_state *w32, bool friendly)
 {
     // Get the client area of the window in screen space
     RECT rect = { 0 };
     GetClientRect(w32->window, &rect);
     MapWindowPoints(w32->window, NULL, (POINT*)&rect, 2);
 
-    struct disp_names_data data = { .assoc = w32->monitor };
+    struct disp_names_data data = {
+        .assoc = w32->monitor,
+        .friendly = friendly,
+    };
 
     // Make sure the monitor that Windows considers to be associated with the
     // window is first in the list
-    MONITORINFOEXW mi = { .cbSize = sizeof mi };
-    if (GetMonitorInfoW(data.assoc, (MONITORINFO*)&mi)) {
-        MP_TARRAY_APPEND(NULL, data.names, data.count,
-                         mp_to_utf8(NULL, mi.szDevice));
-    }
+    disp_names_append(data.assoc, &data);
 
     // Get the names of the other monitors that intersect the client rect
     EnumDisplayMonitors(NULL, &rect, disp_names_proc, (LPARAM)&data);
@@ -2300,6 +2310,7 @@ static bool gui_thread_control_supports(int request)
     case VOCTRL_GET_DISPLAY_FPS:
     case VOCTRL_GET_DISPLAY_RES:
     case VOCTRL_GET_DISPLAY_NAMES:
+    case VOCTRL_GET_DISPLAY_NAMES_FRIENDLY:
     case VOCTRL_GET_ICC_PROFILE:
     case VOCTRL_GET_FOCUSED:
     case VOCTRL_BEGIN_DRAGGING:
@@ -2447,7 +2458,10 @@ static int gui_thread_control(struct vo_w32_state *w32, int request, void *arg)
         ((int *)arg)[1] = monrc.bottom - monrc.top;
         return VO_TRUE;
     case VOCTRL_GET_DISPLAY_NAMES:
-        *(char ***)arg = get_disp_names(w32);
+        *(char ***)arg = get_disp_names(w32, false);
+        return VO_TRUE;
+    case VOCTRL_GET_DISPLAY_NAMES_FRIENDLY:
+        *(char ***)arg = get_disp_names(w32, true);
         return VO_TRUE;
     case VOCTRL_GET_ICC_PROFILE:
         update_display_info(w32);

video/out/win32/displayconfig.c

@@ -207,3 +207,46 @@ wchar_t *mp_w32_displayconfig_get_device_from_friendly_name(
     talloc_free(ctx);
     return gdi_device_name;
 }
+
+wchar_t *mp_w32_displayconfig_get_friendly_name_from_device(
+    const wchar_t *device)
+{
+    void *ctx = talloc_new(NULL);
+    wchar_t *monitor_friendly_device_name = NULL;
+
+    // Get the current display configuration
+    UINT32 num_paths;
+    DISPLAYCONFIG_PATH_INFO *paths;
+    UINT32 num_modes;
+    DISPLAYCONFIG_MODE_INFO *modes;
+    if (get_config(ctx, &num_paths, &paths, &num_modes, &modes))
+        goto end;
+
+    // Get the path for the specified monitor
+    DISPLAYCONFIG_PATH_INFO *path;
+    if (!(path = get_path(num_paths, paths, device)))
+        goto end;
+
+    // Get the friendly name from the path
+    DISPLAYCONFIG_TARGET_DEVICE_NAME target = {
+        .header = {
+            .size = sizeof target,
+            .type = DISPLAYCONFIG_DEVICE_INFO_GET_TARGET_NAME,
+            .adapterId = path->targetInfo.adapterId,
+            .id = path->targetInfo.id,
+        }
+    };
+    if (DisplayConfigGetDeviceInfo(&target.header) != ERROR_SUCCESS)
+        goto end;
+
+    if (!target.flags.friendlyNameFromEdid)
+        goto end;
+
+    monitor_friendly_device_name = talloc_memdup(NULL,
+                                                 target.monitorFriendlyDeviceName,
+                                                 sizeof(target.monitorFriendlyDeviceName));
+
+end:
+    talloc_free(ctx);
+    return monitor_friendly_device_name;
+}

video/out/win32/displayconfig.h

@@ -30,4 +30,10 @@ double mp_w32_displayconfig_get_refresh_rate(const wchar_t *device);
 wchar_t *mp_w32_displayconfig_get_device_from_friendly_name(
     const wchar_t *monitor_friendly_device_name);
 
+// Given a GDI monitor device name, get a friendly monitor device name
+// using the DisplayConfig API. Returns NULL on failure.
+// The caller is responsible for releasing the result with talloc_free.
+wchar_t *mp_w32_displayconfig_get_friendly_name_from_device(
+    const wchar_t *device);
+
 #endif