From 4e1f92feb3a861f93b7a285715d03be930b41b91 Mon Sep 17 00:00:00 2001
From: Alan Third <alan@idiocy.org>
Date: Wed, 24 Mar 2021 22:50:03 +0000
Subject: Implement frame-scale-factor

* src/frame.c (Fframe_scale_factor): New function.
(syms_of_frame): Add frame-scale-factor.
* src/frame.h: Add FRAME_SCALE_FACTOR.
* src/image.c: Move FRAME_SCALE_FACTOR to frame.h.
---
 src/frame.h | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/frame.h')

diff --git a/src/frame.h b/src/frame.h
index 9ddcb4c6810..9963112036f 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -907,6 +907,13 @@ default_pixels_per_inch_y (void)
   (WINDOWP (f->minibuffer_window)				\
    && XFRAME (XWINDOW (f->minibuffer_window)->frame) == f)
 
+/* Scale factor of frame F.  */
+#if defined HAVE_NS
+# define FRAME_SCALE_FACTOR(f) (FRAME_NS_P (f) ? ns_frame_scale_factor (f) : 1)
+#else
+# define FRAME_SCALE_FACTOR(f) 1;
+#endif
+
 /* Pixel width of frame F.  */
 #define FRAME_PIXEL_WIDTH(f) ((f)->pixel_width)
 
-- 
cgit v1.2.3


From 55c768f3ea7da76328641c2db9aa922564b0a1f3 Mon Sep 17 00:00:00 2001
From: "İ. Göktuğ Kayaalp" <self@gkayaalp.com>
Date: Sun, 4 Apr 2021 04:14:29 +0200
Subject: Fix build error in frame.h on non-NS

* src/frame.h (FRAME_SCALE_FACTOR): Fix syntax of macro in
previous change.
---
 src/frame.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/frame.h')

diff --git a/src/frame.h b/src/frame.h
index 9963112036f..0fd95e4dd3c 100644
--- a/src/frame.h
+++ b/src/frame.h
@@ -911,7 +911,7 @@ default_pixels_per_inch_y (void)
 #if defined HAVE_NS
 # define FRAME_SCALE_FACTOR(f) (FRAME_NS_P (f) ? ns_frame_scale_factor (f) : 1)
 #else
-# define FRAME_SCALE_FACTOR(f) 1;
+# define FRAME_SCALE_FACTOR(f) 1
 #endif
 
 /* Pixel width of frame F.  */
-- 
cgit v1.2.3