procyberian/gimp
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gimp.git synced 2025-07-05 02:09:37 +00:00
Code Issues 1 Projects 1 Releases Packages Wiki Activity Actions

Use unicode-aware color management API

Browse source 
* GetMonitorInfoW
* EnumDisplayDevicesW
* GetStandardColorSpaceProfileW
* GetColorDirectoryW
This commit is contained in:
Luca Bacci 2023-01-02 21:56:57 +01:00 • committed by Jehan
parent cfaaec6347
commit 48c27770b6
1 changed files with 41 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

61
libgimpwidgets/gimpwidgetsutils.c
View file

@ -631,11 +631,11 @@ gimp_monitor_get_color_profile (GdkMonitor *monitor)
gint offsetx = GetSystemMetrics (SM_XVIRTUALSCREEN); gint offsetx = GetSystemMetrics (SM_XVIRTUALSCREEN);
gint offsety = GetSystemMetrics (SM_YVIRTUALSCREEN); gint offsety = GetSystemMetrics (SM_YVIRTUALSCREEN);
HMONITOR monitor_handle; HMONITOR monitor_handle;
MONITORINFOEX info; MONITORINFOEXW info;
DISPLAY_DEVICE display_device; DISPLAY_DEVICEW display_device;
info.cbSize = sizeof (MONITORINFOEX); info.cbSize = sizeof (info);
display_device.cb = sizeof (DISPLAY_DEVICE); display_device.cb = sizeof (display_device);
/* If the first monitor is not set as the main monitor, /* If the first monitor is not set as the main monitor,
* monitor_number(monitor) may not match the index used in * monitor_number(monitor) may not match the index used in
@ -647,56 +647,61 @@ gimp_monitor_get_color_profile (GdkMonitor *monitor)
point.y = monitor_geometry.y * scale_factor + offsety; point.y = monitor_geometry.y * scale_factor + offsety;
monitor_handle = MonitorFromPoint (point, MONITOR_DEFAULTTONEAREST); monitor_handle = MonitorFromPoint (point, MONITOR_DEFAULTTONEAREST);
if (GetMonitorInfo (monitor_handle, (LPMONITORINFO)&info)) if (GetMonitorInfoW (monitor_handle, (LPMONITORINFO)&info))
{ {
if (EnumDisplayDevices (info.szDevice, 0, &display_device, 0)) if (EnumDisplayDevicesW (info.szDevice, 0, &display_device, 0))
{ {
gchar *device_key = g_convert (display_device.DeviceKey, -1, "UTF-16LE", "WINDOWS-1252", NULL, NULL, NULL); wchar_t *device_key = display_device.DeviceKey;
gchar *filename = NULL; wchar_t *filename_utf16 = NULL;
gchar *dir = NULL; char *filename = NULL;
gchar *fullpath = NULL; wchar_t *dir_utf16 = NULL;
GFile *file; char *dir = NULL;
char *fullpath = NULL;
GFile *file = NULL;
DWORD len = 0; DWORD len = 0;
gboolean per_user; gboolean per_user;
WCS_PROFILE_MANAGEMENT_SCOPE scope; WCS_PROFILE_MANAGEMENT_SCOPE scope;
WcsGetUsePerUserProfiles ((LPWSTR)device_key, CLASS_MONITOR, &per_user); WcsGetUsePerUserProfiles (device_key, CLASS_MONITOR, &per_user);
scope = per_user ? WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER : WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE; scope = per_user ? WCS_PROFILE_MANAGEMENT_SCOPE_CURRENT_USER :
WCS_PROFILE_MANAGEMENT_SCOPE_SYSTEM_WIDE;
if (WcsGetDefaultColorProfileSize (scope, if (WcsGetDefaultColorProfileSize (scope,
(LPWSTR)device_key, device_key,
CPT_ICC, CPT_ICC,
CPST_NONE, CPST_NONE,
0, 0,
&len)) &len))
{ {
gchar *filename_utf16 = g_new (gchar, len); filename_utf16 = (wchar_t*) g_malloc0 (len);
WcsGetDefaultColorProfile (scope, WcsGetDefaultColorProfile (scope,
(LPWSTR)device_key, device_key,
CPT_ICC, CPT_ICC,
CPST_NONE, CPST_NONE,
0, 0,
len, len,
(LPWSTR)filename_utf16); filename_utf16);
/* filename_utf16 must be native endian */
filename = g_utf16_to_utf8 ((gunichar2 *)filename_utf16, -1, NULL, NULL, NULL);
g_free (filename_utf16);
} }
else else
{ {
/* Due to a bug in Windows, the meanings of LCS_sRGB and /* Due to a bug in Windows, the meanings of LCS_sRGB and
* LCS_WINDOWS_COLOR_SPACE are swapped. * LCS_WINDOWS_COLOR_SPACE are swapped.
*/ */
GetStandardColorSpaceProfile (NULL, LCS_sRGB, NULL, &len); if (GetStandardColorSpaceProfileW (NULL, LCS_sRGB, NULL, &len) != 0 && len > 0)
filename = g_new (gchar, len); {
GetStandardColorSpaceProfile (NULL, LCS_sRGB, filename, &len); filename_utf16 = (wchar_t*) g_malloc0 (len);
GetStandardColorSpaceProfileW (NULL, LCS_sRGB, filename_utf16, &len);
}
} }
GetColorDirectory (NULL, NULL, &len); filename = g_utf16_to_utf8 (filename_utf16, -1, NULL, NULL, NULL);
dir = g_new (gchar, len);
GetColorDirectory (NULL, dir, &len); GetColorDirectoryW (NULL, NULL, &len);
dir_utf16 = g_malloc0 (len);
GetColorDirectoryW (NULL, dir_utf16, &len);
dir = g_utf16_to_utf8 (dir_utf16, -1, NULL, NULL, NULL);
fullpath = g_build_filename (dir, filename, NULL); fullpath = g_build_filename (dir, filename, NULL);
file = g_file_new_for_path (fullpath); file = g_file_new_for_path (fullpath);
@ -706,7 +711,9 @@ gimp_monitor_get_color_profile (GdkMonitor *monitor)
g_free (fullpath); g_free (fullpath);
g_free (dir); g_free (dir);
g_free (dir_utf16);
g_free (filename); g_free (filename);
g_free (filename_utf16);
g_free (device_key); g_free (device_key);
} }
} }