From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Alan Third Newsgroups: gmane.emacs.devel Subject: Re: Using more and/or better icons in Emacs Date: Tue, 13 Apr 2021 20:50:12 +0100 Message-ID: References: Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="jtGf/E/Afbt455CX" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="808"; mail-complaints-to="usenet@ciao.gmane.io" Cc: emacs-devel@gnu.org, Dmitry Gutov To: Stefan Kangas Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Tue Apr 13 21:52:28 2021 Return-path: Envelope-to: ged-emacs-devel@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1lWP5I-00004y-Fu for ged-emacs-devel@m.gmane-mx.org; Tue, 13 Apr 2021 21:52:28 +0200 Original-Received: from localhost ([::1]:36584 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWP5H-0005Mu-Ip for ged-emacs-devel@m.gmane-mx.org; Tue, 13 Apr 2021 15:52:27 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:34922) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWP3J-00046J-IC for emacs-devel@gnu.org; Tue, 13 Apr 2021 15:50:25 -0400 Original-Received: from outbound.soverin.net ([116.202.65.218]:47123) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWP3G-0000m0-Fj for emacs-devel@gnu.org; Tue, 13 Apr 2021 15:50:24 -0400 Original-Received: from smtp.soverin.net (unknown [10.10.3.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) by outbound.soverin.net (Postfix) with ESMTPS id 53F3E6013B; Tue, 13 Apr 2021 19:50:16 +0000 (UTC) Original-Received: from smtp.soverin.net (smtp.soverin.net [159.69.232.142]) by soverin.net DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=idiocy.org; s=soverin; t=1618343415; bh=umDAkzEpH0UjJ9WTAkPKhQ6lR49pa+uxXu2OvcuLY+A=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=mrD+lVmeERRLDhVsdTNGzB3b0BiGOoy4hxCnM/6VqW1DmXiwjvpEQmPpBddhaU6W3 4/F8/+iF2nTSuRX7x4J5PSPcbk+C3O6mdGwqMElNwz052oNgVRU2yBG75TVRrAOKS5 AO+F6alKiLmfLvctzVsNmaTpM84G+r4GuzQhbIOXYnbEXZIMmuh0Ne4oobJwe+PVrx HMpO9wgDMuHziI1lvYN82/oSHgUtnAvxCMaPbWxe/k+21MqARv8Cb0j/BWxqzM6JOl fqglH/vX4gi12owuuS2xqxwOdpfNd69BJnKUlorkpI6A6MMifIU8DI/WI4x1yJuTW1 a1AXm6x5X2sTw== Original-Received: by breton.holly.idiocy.org (Postfix, from userid 501) id 0D8A6202BC772B; Tue, 13 Apr 2021 20:50:12 +0100 (BST) Mail-Followup-To: Alan Third , Stefan Kangas , Dmitry Gutov , emacs-devel@gnu.org Content-Disposition: inline In-Reply-To: Received-SPF: pass client-ip=116.202.65.218; envelope-from=alan@idiocy.org; helo=outbound.soverin.net X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane-mx.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.io gmane.emacs.devel:268011 Archived-At: --jtGf/E/Afbt455CX Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Tue, Apr 13, 2021 at 05:39:55AM -0500, Stefan Kangas wrote: > Alan Third writes: > > >> The only issue I see is that, unless the original SVG also has height > >> and width 1em, it doesn't seem to automatically resize images on > >> `text-scale-adjust'. > > > > Hmm, it works fine here... Even with XPMs... > > > > Can you show me what exactly you're doing? > > Hmm, I'm not sure anymore. It seems to work perfectly, so I must have > confused myself somehow. Sorry about the noise. > > Your patch LGTM, but I guess it would need documentation and a NEWS entry. > Thanks again for working on this! Thanks. I've attached a version with documentation. I think it's good enough but would appreciate someone else double checking it makes sense. -- Alan Third --jtGf/E/Afbt455CX Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="0001-Allow-use-of-em-in-image-spec-sizes.patch" >From 8719118481d673ef8a5269ac186aa132526830fa Mon Sep 17 00:00:00 2001 From: Alan Third Date: Mon, 12 Apr 2021 20:30:12 +0100 Subject: [PATCH] Allow use of em in image spec sizes * src/image.c (image_get_length): New function. (compute_image_size): Use image_get_length to set the sizes, and pass in the image struct instead of just the spec. (image_set_transform): (imagemagick_load_image): (svg_load_image): Use the image instead of the spec in compute_image_size. (syms_of_image): Add 'em' as a symbol. --- doc/lispref/display.texi | 7 ++++++ etc/NEWS | 7 ++++++ src/image.c | 53 +++++++++++++++++++++++++++------------- 3 files changed, 50 insertions(+), 17 deletions(-) diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 68d7e827d2..2f478471a9 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi @@ -5289,6 +5289,13 @@ Image Descriptors and values, including at least the pair @code{:type @var{type}} that specifies the image type. + Image descriptors which define image dimensions, i.e. @code{:width}, +@code{:height}, @code{:max-width} and @code{:max-height}, may take +either a number, which represents the dimension in pixels, or a pair +@code{(@var{value} . 'em)}, where @var{value} is the dimension's +length in ``ems''. One ``em'' is equivalent to the height of the +font. + The following is a list of properties that are meaningful for all image types (there are also properties which are meaningful only for certain image types, as documented in the following subsections): diff --git a/etc/NEWS b/etc/NEWS index d3a8748ded..c005b59553 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -1532,6 +1532,13 @@ will match the font size in use where it is embedded. This feature relies on librsvg 2.48 or above being available. ++++ +*** Image properties support 'em' sizes. +Size image properties, for example ':height', ':max-height', etc., can +be given a cons of the form '(SIZE . em)', where SIZE is a number +which is multiplied by the font size to calculate the image size, and +'em' is a symbol. + ** EWW +++ diff --git a/src/image.c b/src/image.c index 6fe0b23f73..575b4c7200 100644 --- a/src/image.c +++ b/src/image.c @@ -1987,46 +1987,63 @@ scale_image_size (int size, size_t divisor, size_t multiplier) return INT_MAX; } +/* Return a size in pixels either directly from the value specified by + SYMBOL, or from a CONS of the form (VALUE . UNITS). If the value + doesn't exist in the image spec, or is invalid, return -1. */ +static int +image_get_length (struct image *img, Lisp_Object symbol) +{ + Lisp_Object value = image_spec_value (img->spec, symbol, NULL); + + if (FIXNATP (value)) + return min (XFIXNAT (value), INT_MAX); + if (CONSP (value) && NUMBERP (CAR (value)) && EQ (Qem, CDR (value))) + return min (img->face_font_size * XFLOATINT (CAR (value)), INT_MAX); + + return -1; +} + /* Compute the desired size of an image with native size WIDTH x HEIGHT. Use SPEC to deduce the size. Store the desired size into *D_WIDTH x *D_HEIGHT. Store -1 x -1 if the native size is OK. */ static void compute_image_size (size_t width, size_t height, - Lisp_Object spec, + struct image *img, int *d_width, int *d_height) { Lisp_Object value; + int int_value; int desired_width = -1, desired_height = -1, max_width = -1, max_height = -1; double scale = 1; - value = image_spec_value (spec, QCscale, NULL); + value = image_spec_value (img->spec, QCscale, NULL); if (NUMBERP (value)) scale = XFLOATINT (value); - value = image_spec_value (spec, QCmax_width, NULL); - if (FIXNATP (value)) - max_width = min (XFIXNAT (value), INT_MAX); + int_value = image_get_length (img, QCmax_width); + if (int_value >= 0) + max_width = int_value; - value = image_spec_value (spec, QCmax_height, NULL); - if (FIXNATP (value)) - max_height = min (XFIXNAT (value), INT_MAX); + int_value = image_get_length (img, QCmax_height); + if (int_value >= 0) + max_height = int_value; /* If width and/or height is set in the display spec assume we want to scale to those values. If either h or w is unspecified, the unspecified should be calculated from the specified to preserve aspect ratio. */ - value = image_spec_value (spec, QCwidth, NULL); - if (FIXNATP (value)) + int_value = image_get_length (img, QCwidth); + if (int_value >= 0) { - desired_width = min (XFIXNAT (value) * scale, INT_MAX); + desired_width = int_value; /* :width overrides :max-width. */ max_width = -1; } - value = image_spec_value (spec, QCheight, NULL); - if (FIXNATP (value)) + int_value = image_get_length (img, QCheight); + if (int_value >= 0) { - desired_height = min (XFIXNAT (value) * scale, INT_MAX); + desired_height = int_value; /* :height overrides :max-height. */ max_height = -1; } @@ -2216,7 +2233,7 @@ image_set_transform (struct frame *f, struct image *img) } else #endif - compute_image_size (img->width, img->height, img->spec, &width, &height); + compute_image_size (img->width, img->height, img, &width, &height); /* Determine rotation. */ double rotation = 0.0; @@ -9210,7 +9227,7 @@ imagemagick_load_image (struct frame *f, struct image *img, compute_image_size (MagickGetImageWidth (image_wand), MagickGetImageHeight (image_wand), - img->spec, &desired_width, &desired_height); + img, &desired_width, &desired_height); if (desired_width != -1 && desired_height != -1) { @@ -10068,7 +10085,7 @@ svg_load_image (struct frame *f, struct image *img, char *contents, viewbox_height = dimension_data.height; } - compute_image_size (viewbox_width, viewbox_height, img->spec, + compute_image_size (viewbox_width, viewbox_height, img, &width, &height); width *= FRAME_SCALE_FACTOR (f); @@ -10777,6 +10794,8 @@ syms_of_image (void) DEFSYM (QCmax_width, ":max-width"); DEFSYM (QCmax_height, ":max-height"); + DEFSYM (Qem, "em"); + #ifdef HAVE_NATIVE_TRANSFORMS DEFSYM (Qscale, "scale"); DEFSYM (Qrotate, "rotate"); -- 2.29.2 --jtGf/E/Afbt455CX--