[gtk/win32.hidpi.cleanup: 2/2] GDK-Win32: Clean up HiDPI support
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/win32.hidpi.cleanup: 2/2] GDK-Win32: Clean up HiDPI support
- Date: Mon, 19 Jul 2021 10:29:54 +0000 (UTC)
commit cafca0db218f748f56d331ad31cb1abd594bc8f9
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Mon Jul 19 18:20:09 2021 +0800
GDK-Win32: Clean up HiDPI support
Make _gdk_win32_display_get_monitor_scale_factor() less complex, by:
* Drop the preceding underscore.
* Dropping an unused parameter.
* Using a GdkSurface instead of a HWND, as the HWND that we pass into
this function might have been taken from a GdkSurface, which are now
always created with CS_OWNDC. This means if a GdkSurface was passed
in, we ensure that we only acquire the DC from the HWND once, and do
not attempt to call ReleaseDC() on it.
* Store the HDC that we acquire from the GdkSurface's HWND into the
surface, and use that as the HDC we need for our GdkGLContext.
* Drop the gl_hwnd from GdkWin32Display, as that is really should be
stored in the GdkSurface.
* For functions that were updated, name GdkWin32Display variables as
display_win32 and GdkSurface variables as surface, to unify things.
gdk/win32/gdkdisplay-win32.c | 105 +++++++++++++++++++----------------------
gdk/win32/gdkdisplay-win32.h | 8 ++--
gdk/win32/gdkdrag-win32.c | 8 ++--
gdk/win32/gdkdrop-win32.c | 8 ++--
gdk/win32/gdkglcontext-win32.c | 32 +++----------
gdk/win32/gdkmonitor-win32.c | 4 +-
gdk/win32/gdkscreen-win32.c | 3 +-
gdk/win32/gdksurface-win32.c | 22 +++++----
8 files changed, 82 insertions(+), 108 deletions(-)
---
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 5c8078b696..42577b2c2f 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -982,31 +982,32 @@ _gdk_win32_check_on_arm64 (GdkWin32Display *display)
}
static void
-gdk_win32_display_init (GdkWin32Display *display)
+gdk_win32_display_init (GdkWin32Display *display_win32)
{
const char *scale_str = g_getenv ("GDK_SCALE");
- display->monitors = G_LIST_MODEL (g_list_store_new (GDK_TYPE_MONITOR));
+ display_win32->monitors = G_LIST_MODEL (g_list_store_new (GDK_TYPE_MONITOR));
- _gdk_win32_enable_hidpi (display);
- _gdk_win32_check_on_arm64 (display);
+ _gdk_win32_enable_hidpi (display_win32);
+ _gdk_win32_check_on_arm64 (display_win32);
/* if we have DPI awareness, set up fixed scale if set */
- if (display->dpi_aware_type != PROCESS_DPI_UNAWARE &&
+ if (display_win32->dpi_aware_type != PROCESS_DPI_UNAWARE &&
scale_str != NULL)
{
- display->surface_scale = atol (scale_str);
+ display_win32->surface_scale = atol (scale_str);
- if (display->surface_scale <= 0)
- display->surface_scale = 1;
+ if (display_win32->surface_scale <= 0)
+ display_win32->surface_scale = 1;
- display->has_fixed_scale = TRUE;
+ display_win32->has_fixed_scale = TRUE;
}
else
- display->surface_scale = _gdk_win32_display_get_monitor_scale_factor (display, NULL, NULL, NULL);
+ display_win32->surface_scale =
+ gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
- _gdk_win32_display_init_cursors (display);
- gdk_win32_display_check_composited (display);
+ _gdk_win32_display_init_cursors (display_win32);
+ gdk_win32_display_check_composited (display_win32);
}
void
@@ -1057,64 +1058,64 @@ gdk_win32_display_get_monitors (GdkDisplay *display)
}
guint
-_gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
- HMONITOR hmonitor,
- HWND hwnd,
- int *dpi)
+gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *display_win32,
+ GdkSurface *surface,
+ HMONITOR hmonitor)
{
gboolean is_scale_acquired = FALSE;
gboolean use_dpi_for_monitor = FALSE;
guint dpix, dpiy;
- if (win32_display->have_at_least_win81)
+ if (display_win32->have_at_least_win81)
{
- if (hmonitor != NULL)
+ if (surface != NULL && hmonitor == NULL)
+ hmonitor = MonitorFromWindow (GDK_SURFACE_HWND (surface),
+ MONITOR_DEFAULTTONEAREST);
+ if (hmonitor != NULL &&
+ display_win32->shcore_funcs.hshcore != NULL &&
+ display_win32->shcore_funcs.getDpiForMonitorFunc != NULL)
use_dpi_for_monitor = TRUE;
-
- else
- {
- if (hwnd != NULL)
- {
- hmonitor = MonitorFromWindow (hwnd, MONITOR_DEFAULTTONEAREST);
- use_dpi_for_monitor = TRUE;
- }
- }
}
if (use_dpi_for_monitor)
{
/* Use GetDpiForMonitor() for Windows 8.1+, when we have a HMONITOR */
- if (win32_display->shcore_funcs.hshcore != NULL &&
- win32_display->shcore_funcs.getDpiForMonitorFunc != NULL)
- {
- if (win32_display->shcore_funcs.getDpiForMonitorFunc (hmonitor,
- MDT_EFFECTIVE_DPI,
- &dpix,
- &dpiy) == S_OK)
- {
- is_scale_acquired = TRUE;
- }
- }
+ if (display_win32->shcore_funcs.getDpiForMonitorFunc (hmonitor,
+ MDT_EFFECTIVE_DPI,
+ &dpix,
+ &dpiy) == S_OK)
+ is_scale_acquired = TRUE;
}
else
{
/* Go back to GetDeviceCaps() for Windows 8 and earlier, or when we don't
* have a HMONITOR nor a HWND
*/
- HDC hdc = GetDC (hwnd);
+ HDC hdc;
- /* in case we can't get the DC for the window, return 1 for the scale */
- if (hdc == NULL)
+ if (surface != NULL)
{
- if (dpi != NULL)
- *dpi = USER_DEFAULT_SCREEN_DPI;
+ if (GDK_WIN32_SURFACE (surface)->hdc == NULL)
+ GDK_WIN32_SURFACE (surface)->hdc = GetDC (GDK_SURFACE_HWND (surface));
- return 1;
+ hdc = GDK_WIN32_SURFACE (surface)->hdc;
}
+ else
+ hdc = GetDC (NULL);
+
+ /* in case we can't get the DC for the window, return 1 for the scale */
+ if (hdc == NULL)
+ return 1;
dpix = GetDeviceCaps (hdc, LOGPIXELSX);
dpiy = GetDeviceCaps (hdc, LOGPIXELSY);
- ReleaseDC (hwnd, hdc);
+
+ /*
+ * If surface is not NULL, the HDC should not be released, since surfaces have
+ * Win32 windows created with CS_OWNDC
+ */
+ if (surface == NULL)
+ ReleaseDC (NULL, hdc);
is_scale_acquired = TRUE;
}
@@ -1122,21 +1123,13 @@ _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
if (is_scale_acquired)
/* USER_DEFAULT_SCREEN_DPI = 96, in winuser.h */
{
- if (dpi != NULL)
- *dpi = dpix;
-
- if (win32_display->has_fixed_scale)
- return win32_display->surface_scale;
+ if (display_win32->has_fixed_scale)
+ return display_win32->surface_scale;
else
return dpix / USER_DEFAULT_SCREEN_DPI > 1 ? dpix / USER_DEFAULT_SCREEN_DPI : 1;
}
else
- {
- if (dpi != NULL)
- *dpi = USER_DEFAULT_SCREEN_DPI;
-
- return 1;
- }
+ return 1;
}
static gboolean
diff --git a/gdk/win32/gdkdisplay-win32.h b/gdk/win32/gdkdisplay-win32.h
index 46a80def2e..cdef6c8cee 100644
--- a/gdk/win32/gdkdisplay-win32.h
+++ b/gdk/win32/gdkdisplay-win32.h
@@ -121,7 +121,6 @@ struct _GdkWin32Display
/* WGL/OpenGL Items */
guint have_wgl : 1;
guint gl_version;
- HWND gl_hwnd;
#ifdef GDK_WIN32_ENABLE_EGL
/* EGL (Angle) Items */
@@ -185,10 +184,9 @@ GPtrArray *_gdk_win32_display_get_monitor_list (GdkWin32Display *display);
void gdk_win32_display_check_composited (GdkWin32Display *display);
-guint _gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *win32_display,
- HMONITOR hmonitor,
- HWND hwnd,
- int *dpi);
+guint gdk_win32_display_get_monitor_scale_factor (GdkWin32Display *display_win32,
+ GdkSurface *surface,
+ HMONITOR hmonitor);
typedef struct _GdkWin32MessageFilter GdkWin32MessageFilter;
diff --git a/gdk/win32/gdkdrag-win32.c b/gdk/win32/gdkdrag-win32.c
index 419889ebe1..1b92e85efa 100644
--- a/gdk/win32/gdkdrag-win32.c
+++ b/gdk/win32/gdkdrag-win32.c
@@ -793,7 +793,7 @@ gdk_drag_new (GdkDisplay *display,
GdkDragProtocol protocol)
{
GdkWin32Drag *drag_win32;
- GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
+ GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
GdkDrag *drag;
drag_win32 = g_object_new (GDK_TYPE_WIN32_DRAG,
@@ -805,10 +805,10 @@ gdk_drag_new (GdkDisplay *display,
drag = GDK_DRAG (drag_win32);
- if (win32_display->has_fixed_scale)
- drag_win32->scale = win32_display->surface_scale;
+ if (display_win32->has_fixed_scale)
+ drag_win32->scale = display_win32->surface_scale;
else
- drag_win32->scale = _gdk_win32_display_get_monitor_scale_factor (win32_display, NULL, NULL, NULL);
+ drag_win32->scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
drag_win32->protocol = protocol;
diff --git a/gdk/win32/gdkdrop-win32.c b/gdk/win32/gdkdrop-win32.c
index bd41e82ef7..8e09b181ca 100644
--- a/gdk/win32/gdkdrop-win32.c
+++ b/gdk/win32/gdkdrop-win32.c
@@ -177,7 +177,7 @@ gdk_drop_new (GdkDisplay *display,
GdkDragProtocol protocol)
{
GdkWin32Drop *drop_win32;
- GdkWin32Display *win32_display = GDK_WIN32_DISPLAY (display);
+ GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
drop_win32 = g_object_new (GDK_TYPE_WIN32_DROP,
"device", device,
@@ -186,10 +186,10 @@ gdk_drop_new (GdkDisplay *display,
"surface", surface,
NULL);
- if (win32_display->has_fixed_scale)
- drop_win32->scale = win32_display->surface_scale;
+ if (display_win32->has_fixed_scale)
+ drop_win32->scale = display_win32->surface_scale;
else
- drop_win32->scale = _gdk_win32_display_get_monitor_scale_factor (win32_display, NULL, NULL, NULL);
+ drop_win32->scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
drop_win32->protocol = protocol;
diff --git a/gdk/win32/gdkglcontext-win32.c b/gdk/win32/gdkglcontext-win32.c
index b3c0d8ad2b..08c573b630 100644
--- a/gdk/win32/gdkglcontext-win32.c
+++ b/gdk/win32/gdkglcontext-win32.c
@@ -66,8 +66,6 @@ _gdk_win32_gl_context_dispose (GObject *gobject)
wglDeleteContext (context_win32->hglrc);
context_win32->hglrc = NULL;
-
- ReleaseDC (display_win32->gl_hwnd, context_win32->gl_hdc);
}
#ifdef GDK_WIN32_ENABLE_EGL
@@ -82,8 +80,6 @@ _gdk_win32_gl_context_dispose (GObject *gobject)
eglDestroyContext (display_win32->egl_disp,
context_win32->egl_context);
context_win32->egl_context = EGL_NO_CONTEXT;
-
- ReleaseDC (display_win32->gl_hwnd, context_win32->gl_hdc);
}
#endif
}
@@ -1076,29 +1072,25 @@ gdk_win32_gl_context_init (GdkWin32GLContext *self)
GdkGLContext *
_gdk_win32_surface_create_gl_context (GdkSurface *surface,
- gboolean attached,
- GdkGLContext *share,
- GError **error)
+ gboolean attached,
+ GdkGLContext *share,
+ GError **error)
{
GdkDisplay *display = gdk_surface_get_display (surface);
GdkWin32Display *display_win32 = GDK_WIN32_DISPLAY (display);
GdkWin32GLContext *context = NULL;
-
- /* Acquire and store up the Windows-specific HWND and HDC */
-/* HWND hwnd;*/
- HDC hdc;
+ GdkWin32Surface *impl = GDK_WIN32_SURFACE (surface);
#ifdef GDK_WIN32_ENABLE_EGL
EGLContext egl_context;
EGLConfig config;
#endif
- display_win32->gl_hwnd = GDK_SURFACE_HWND (surface);
- hdc = GetDC (display_win32->gl_hwnd);
+ impl->hdc = GetDC (GDK_SURFACE_HWND (surface));
#ifdef GDK_WIN32_ENABLE_EGL
/* display_win32->hdc_egl_temp should *not* be destroyed here! It is destroyed at dispose()! */
- display_win32->hdc_egl_temp = hdc;
+ display_win32->hdc_egl_temp = impl->hdc;
#endif
if (!_gdk_win32_display_init_gl (display))
@@ -1109,16 +1101,6 @@ _gdk_win32_surface_create_gl_context (GdkSurface *surface,
return NULL;
}
-#if 0
- if (display_win32->have_wgl)
- {
- hwnd = GDK_SURFACE_HWND (surface);
- hdc = GetDC (hwnd);
-
- display_win32->gl_hwnd = hwnd;
- }
-#endif
-
#ifdef GDK_WIN32_ENABLE_EGL
if (display_win32->have_egl && !find_eglconfig_for_window (display_win32, &config,
&display_win32->egl_min_swap_interval, error))
@@ -1130,7 +1112,7 @@ _gdk_win32_surface_create_gl_context (GdkSurface *surface,
"shared-context", share,
NULL);
- context->gl_hdc = hdc;
+ context->gl_hdc = impl->hdc;
context->is_attached = attached;
#ifdef GDK_WIN32_ENABLE_EGL
diff --git a/gdk/win32/gdkmonitor-win32.c b/gdk/win32/gdkmonitor-win32.c
index 19289fb6a0..0dad478345 100644
--- a/gdk/win32/gdkmonitor-win32.c
+++ b/gdk/win32/gdkmonitor-win32.c
@@ -681,7 +681,7 @@ enum_monitor (HMONITOR hmonitor,
else
{
/* First acquire the scale using the current screen */
- scale = _gdk_win32_display_get_monitor_scale_factor (data->display, NULL, NULL, NULL);
+ scale = gdk_win32_display_get_monitor_scale_factor (data->display, NULL, NULL);
/* acquire the scale using the monitor which the window is nearest on Windows 8.1+ */
if (data->display->have_at_least_win81)
@@ -695,7 +695,7 @@ enum_monitor (HMONITOR hmonitor,
pt.x = w32mon->work_rect.x + w32mon->work_rect.width / 2;
pt.y = w32mon->work_rect.y + w32mon->work_rect.height / 2;
hmonitor = MonitorFromPoint (pt, MONITOR_DEFAULTTONEAREST);
- scale = _gdk_win32_display_get_monitor_scale_factor (data->display, hmonitor, NULL, NULL);
+ scale = gdk_win32_display_get_monitor_scale_factor (data->display, NULL, hmonitor);
}
}
diff --git a/gdk/win32/gdkscreen-win32.c b/gdk/win32/gdkscreen-win32.c
index 4eb87eabfd..b1e4694876 100644
--- a/gdk/win32/gdkscreen-win32.c
+++ b/gdk/win32/gdkscreen-win32.c
@@ -78,8 +78,7 @@ init_root_window (GdkWin32Screen *screen_win32)
win32_display = GDK_WIN32_DISPLAY (_gdk_display);
if (win32_display->dpi_aware_type != PROCESS_DPI_UNAWARE)
- screen_win32->surface_scale = _gdk_win32_display_get_monitor_scale_factor (win32_display,
- NULL,
+ screen_win32->surface_scale = gdk_win32_display_get_monitor_scale_factor (win32_display,
NULL,
NULL);
else
diff --git a/gdk/win32/gdksurface-win32.c b/gdk/win32/gdksurface-win32.c
index 63c542a14a..bb96b6f6e3 100644
--- a/gdk/win32/gdksurface-win32.c
+++ b/gdk/win32/gdksurface-win32.c
@@ -522,7 +522,7 @@ _gdk_win32_display_create_surface (GdkDisplay *display,
surface->width = width;
surface->height = height;
- impl->surface_scale = _gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL, NULL);
+ impl->surface_scale = gdk_win32_display_get_monitor_scale_factor (display_win32, NULL, NULL);
dwExStyle = 0;
owner = NULL;
@@ -4427,19 +4427,19 @@ gdk_win32_surface_set_shadow_width (GdkSurface *window,
int
-_gdk_win32_surface_get_scale_factor (GdkSurface *window)
+_gdk_win32_surface_get_scale_factor (GdkSurface *surface)
{
GdkDisplay *display;
GdkWin32Surface *impl;
GdkWin32Display *win32_display;
- if (GDK_SURFACE_DESTROYED (window))
+ if (GDK_SURFACE_DESTROYED (surface))
return 1;
- g_return_val_if_fail (window != NULL, 1);
+ g_return_val_if_fail (surface != NULL, 1);
- display = gdk_surface_get_display (window);
- impl = GDK_WIN32_SURFACE (window);
+ display = gdk_surface_get_display (surface);
+ impl = GDK_WIN32_SURFACE (surface);
win32_display = GDK_WIN32_DISPLAY (display);
@@ -4448,9 +4448,8 @@ _gdk_win32_surface_get_scale_factor (GdkSurface *window)
if (win32_display->has_fixed_scale)
impl->surface_scale = win32_display->surface_scale;
else
- impl->surface_scale = _gdk_win32_display_get_monitor_scale_factor (win32_display,
- NULL,
- GDK_SURFACE_HWND (window),
+ impl->surface_scale = gdk_win32_display_get_monitor_scale_factor (win32_display,
+ surface,
NULL);
return impl->surface_scale;
@@ -5067,7 +5066,10 @@ _gdk_win32_surface_get_egl_surface (GdkSurface *surface,
else
{
if (impl->egl_surface == EGL_NO_SURFACE)
- impl->egl_surface = eglCreateWindowSurface (display->egl_disp, config, display->gl_hwnd, NULL);
+ impl->egl_surface = eglCreateWindowSurface (display->egl_disp,
+ config,
+ GDK_SURFACE_HWND (surface),
+ NULL);
return impl->egl_surface;
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
