From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: "Elijah G." Newsgroups: gmane.emacs.bugs Subject: bug#71159: [PATCH] Stipple support for MS Windows Date: Sat, 01 Jun 2024 23:27:58 -0600 Message-ID: <86jzj7rk0x.fsf@gmail.com> References: <86cypcuhhk.fsf@gmail.com> <86jzjcgq00.fsf@gmail.com> <86sexydekl.fsf@gmail.com> <87ed9gkber.fsf@yahoo.com> <86r0dg4hpd.fsf@gmail.com> <867cf8ndv9.fsf@gnu.org> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="16570"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/30.0.50 (windows-nt) Cc: luangruo@yahoo.com, 71159@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Jun 02 07:30:07 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1sDdnC-00046r-Jd for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 02 Jun 2024 07:30:06 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sDdmx-0003Fb-V4; Sun, 02 Jun 2024 01:29:51 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sDdmw-0003FF-Db for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 01:29:50 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sDdmw-00014c-5h for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 01:29:50 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sDdn8-0004iz-3F for bug-gnu-emacs@gnu.org; Sun, 02 Jun 2024 01:30:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: "Elijah G." Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 02 Jun 2024 05:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71159 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 71159-submit@debbugs.gnu.org id=B71159.171730616018045 (code B ref 71159); Sun, 02 Jun 2024 05:30:02 +0000 Original-Received: (at 71159) by debbugs.gnu.org; 2 Jun 2024 05:29:20 +0000 Original-Received: from localhost ([127.0.0.1]:57675 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDdmR-0004gx-4T for submit@debbugs.gnu.org; Sun, 02 Jun 2024 01:29:19 -0400 Original-Received: from mail-oo1-f65.google.com ([209.85.161.65]:54694) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sDdmO-0004gc-Ba for 71159@debbugs.gnu.org; Sun, 02 Jun 2024 01:29:17 -0400 Original-Received: by mail-oo1-f65.google.com with SMTP id 006d021491bc7-5b96a781b63so1611148eaf.1 for <71159@debbugs.gnu.org>; Sat, 01 Jun 2024 22:29:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1717306078; x=1717910878; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=sA4C2zvr3BzFEqPflJ4lVEw0CnK8FivPlQW18TvvP4s=; b=bJzDhyF9Lc4CF/lk16eeWX7hhnTk5+b4vELFkgRg6140GUw3X//vPaNT+ty+lwIVTk qx7H58pd6CVbKSC+STKP0F4TWVZU6Mn0R59BAjrsOP7wdpD1X+1y7FXlHre8x2fcEIFj VtMul+/sQ7XlfTU282Xmmq+BjN5UPzrcjT4B3+748Z5SZUfGuhxDtDBvsYAXWrUrut4E XHxGYusmJKlL7PBrKXU4RRmSa1R6sO71jWE8Tndtc9f8jMLLFAPq5wGi/jeWTGltJhZg 3C9p29+mbo6gRk947o/2iiWl5EldZQ0hJypx2qHiLxM53wi1UlQVwWRQb8wNwf6HOCZs /w0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1717306078; x=1717910878; h=mime-version:user-agent:message-id:date:references:in-reply-to :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=sA4C2zvr3BzFEqPflJ4lVEw0CnK8FivPlQW18TvvP4s=; b=soEr3qhjVaMjDbuIx7aHvbp9Fa2EjWIUC3YiYBDszjcZy1KSY5DEOCJcuiz1muGMW5 qPenw0kik2/Cy8Ec9Q0PBrMKCEp3B+atzWTfWnBwcdz8evs9imk9K750UnzPs7SfAGJE Lt9ACJEMOG+9V7rgSzEK7cCWLadI0mCLABjQUoyxZcCnBkKf4EeEdyvKEEP3IfSRb5di 9g/Y83gRPU5T+WQ3yOuicNAs11P2O98NVSpiQ0dXj2uThrNiIET/zoTwTsT5jUsrmRNQ 589031MfY0vbFDG2LiyS/qg+A3fVApNdpFxxTuNxr/dk0DZtYR5s5dKyzwEbkz3ou+R3 5b0w== X-Forwarded-Encrypted: i=1; AJvYcCV3/QKDjs1YsWals3NWf78bKif1FjUocipjVb9KaMgtC0LpeV5O6i6oEm7z6glRRnxJWB0UTvutzeA/Qqvu7YpqAOfJ6RI= X-Gm-Message-State: AOJu0YzraGZvFrWYV+6fjeu3Ru8Jc3Z7cI5L8vxKGl2E8JYzIrJ8J39O lCRr7pQiflF+3iuCRsv2bIx8iNSS4vud9sMGPvRCgWMOVbKpEKDGHuWrzScD X-Google-Smtp-Source: AGHT+IEis7/dlU4oUw2LIPWR46ekortfrnCrG7WHnx+GrK6lmHjhGsuGglZs9cTcTmGFtpW906MWXA== X-Received: by 2002:a05:6820:511:b0:5b9:88d1:fd1d with SMTP id 006d021491bc7-5ba05d33c60mr6292479eaf.6.1717306078082; Sat, 01 Jun 2024 22:27:58 -0700 (PDT) Original-Received: from LIBERO ([187.184.27.187]) by smtp.gmail.com with ESMTPSA id 006d021491bc7-5ba004b3eb6sm1000924eaf.34.2024.06.01.22.27.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 01 Jun 2024 22:27:57 -0700 (PDT) In-Reply-To: <867cf8ndv9.fsf@gnu.org> (Eli Zaretskii's message of "Sun, 02 Jun 2024 07:54:34 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:286360 Archived-At: --=-=-= Content-Type: text/plain Thank you, i've fixed now the patch. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-Stipple-support-for-MS-Windows.patch >From 5b92c1e284bacd4661336228395c751bfe730666 Mon Sep 17 00:00:00 2001 From: "Elias G. Perez" Date: Fri, 10 May 2024 20:36:42 -0600 Subject: [PATCH] Stipple support for MS Windows * etc/NEWS: Announce support for stipples in MS-Windows. * src/w32term.h (w32_bitmap_record): Add stipple value. * src/w32term.c (w32_fill_stipple_pattern): New function. (w32_draw_glyph_string_background) (w32_draw_glyph_string_bg_rect w32_draw_stretch_glyph_string): Use new stipple function. * src/image.c (image_create_bitmap_from_data): Create stipple bitmap. (image_create_bitmap_from_file): Add suuport for pixmap and create stipple bitmap. (free_bitmap_record): Release stipple. --- etc/NEWS | 3 ++ src/image.c | 102 +++++++++++++++++++++++++++++++++++++++++--------- src/w32term.c | 55 +++++++++++++++++---------- src/w32term.h | 1 + 4 files changed, 124 insertions(+), 37 deletions(-) diff --git a/etc/NEWS b/etc/NEWS index 3c672ffed8f..7106089d6c7 100644 --- a/etc/NEWS +++ b/etc/NEWS @@ -2827,6 +2827,9 @@ thumbnail images and show them in the thumbnail buffer. Unlike with using 'convert', this fallback method is synchronous, so Emacs will wait until all the thumbnails are created and displayed, before showing them. +--- +*** Emacs on MS-Windows now supports the ':stipple' face attribute. + ---------------------------------------------------------------------- This file is part of GNU Emacs. diff --git a/src/image.c b/src/image.c index 3138ef25a63..321073a4fd9 100644 --- a/src/image.c +++ b/src/image.c @@ -130,6 +130,12 @@ #define NO_PIXMAP 0 #define PIX_MASK_RETAIN 0 #define PIX_MASK_DRAW 1 +#define XBM_BIT_SHUFFLE(b) (~(b)) + +#else + +#define XBM_BIT_SHUFFLE(b) (b) + #endif /* HAVE_NTGUI */ #ifdef HAVE_NS @@ -214,6 +220,11 @@ #define n_planes n_image_planes static unsigned long *colors_in_color_table (int *n); #endif +#ifdef HAVE_NTGUI +static HBITMAP w32_create_pixmap_from_bitmap_data (int, int, char *); + +#endif + #if defined (HAVE_WEBP) || defined (HAVE_GIF) static void anim_prune_animation_cache (Lisp_Object); #endif @@ -596,13 +607,31 @@ image_create_bitmap_from_data (struct frame *f, char *bits, #endif /* HAVE_ANDROID && !defined ANDROID_STUBIFY */ #ifdef HAVE_NTGUI - Lisp_Object frame UNINIT; /* The value is not used. */ - Emacs_Pixmap bitmap; - bitmap = CreateBitmap (width, height, - FRAME_DISPLAY_INFO (XFRAME (frame))->n_planes, - FRAME_DISPLAY_INFO (XFRAME (frame))->n_cbits, - bits); - if (! bitmap) + Emacs_Pixmap stipple; + Emacs_Pixmap bitmap = CreateBitmap (width, height, dpyinfo->n_planes, + dpyinfo->n_cbits, bits); + + /* Convert X bitmap to W32 bitmap. */ + /* Windows mono bitmaps are reversed compared with X. */ + USE_SAFE_ALLOCA; + + { + char *invertedBits; + int nbytes = (width + CHAR_BIT - 1) / CHAR_BIT * height, i; + + invertedBits = bits; + + SAFE_NALLOCA (bits, 1, nbytes); + + for (i = 0; i < nbytes; i++) + bits[i] = XBM_BIT_SHUFFLE (invertedBits[i]); + } + + stipple = w32_create_pixmap_from_bitmap_data (width, height, bits); + + SAFE_FREE (); + + if (!bitmap || !stipple) return -1; #endif /* HAVE_NTGUI */ @@ -681,6 +710,7 @@ image_create_bitmap_from_data (struct frame *f, char *bits, #ifdef HAVE_NTGUI dpyinfo->bitmaps[id - 1].pixmap = bitmap; + dpyinfo->bitmaps[id - 1].stipple = stipple; dpyinfo->bitmaps[id - 1].hinst = NULL; dpyinfo->bitmaps[id - 1].depth = 1; #endif /* HAVE_NTGUI */ @@ -699,7 +729,7 @@ image_create_bitmap_from_data (struct frame *f, char *bits, #endif /* defined HAVE_ANDROID && !defined ANDROID_STUBIFY */ #if defined HAVE_HAIKU || defined HAVE_NS || defined HAVE_PGTK \ - || defined HAVE_ANDROID + || defined HAVE_ANDROID || defined HAVE_NTGUI static char *slurp_file (image_fd, ptrdiff_t *); static Lisp_Object image_find_image_fd (Lisp_Object, image_fd *); static bool xbm_read_bitmap_data (struct frame *, char *, char *, @@ -711,10 +741,53 @@ image_create_bitmap_from_data (struct frame *f, char *bits, ptrdiff_t image_create_bitmap_from_file (struct frame *f, Lisp_Object file) { -#if defined (HAVE_NTGUI) - return -1; /* W32_TODO : bitmap support */ -#else Display_Info *dpyinfo = FRAME_DISPLAY_INFO (f); + +#ifdef HAVE_NTGUI + ptrdiff_t id, size; + int width, height, rc; + image_fd fd; + char *contents, *data; + Emacs_Pixmap bitmap; + + if (!STRINGP (image_find_image_fd (file, &fd))) + return -1; + + contents = slurp_file (fd, &size); + + if (!contents) + return -1; + + rc = xbm_read_bitmap_data (f, contents, contents + size, + &width, &height, &data, 0); + + if (!rc) + { + xfree (contents); + return -1; + } + + { + /* Windows mono bitmaps are reversed compared with X. */ + + int nbytes, i; + nbytes = (width + CHAR_BIT - 1) / CHAR_BIT * height; + + for (i = 0; i < nbytes; i++) + data[i] = XBM_BIT_SHUFFLE (data[i]); + } + + id = image_allocate_bitmap_record (f); + bitmap = w32_create_pixmap_from_bitmap_data (width, height, data); + + dpyinfo->bitmaps[id - 1].height = width; + dpyinfo->bitmaps[id - 1].width = height; + dpyinfo->bitmaps[id - 1].stipple = bitmap; + dpyinfo->bitmaps[id - 1].file = xlispstrdup (file); + + xfree (contents); + xfree (data); + return id; #endif #ifdef HAVE_NS @@ -1037,6 +1110,7 @@ free_bitmap_record (Display_Info *dpyinfo, Bitmap_Record *bm) #ifdef HAVE_NTGUI DeleteObject (bm->pixmap); + DeleteObject (bm->stipple); #endif /* HAVE_NTGUI */ #ifdef HAVE_NS @@ -4800,12 +4874,6 @@ convert_mono_to_color_image (struct frame *f, struct image *img, img->pixmap = new_pixmap; } -#define XBM_BIT_SHUFFLE(b) (~(b)) - -#else - -#define XBM_BIT_SHUFFLE(b) (b) - #endif /* HAVE_NTGUI */ diff --git a/src/w32term.c b/src/w32term.c index 2bcd5d86a38..3ef6d0f11f1 100644 --- a/src/w32term.c +++ b/src/w32term.c @@ -1248,6 +1248,34 @@ w32_clear_glyph_string_rect (struct glyph_string *s, real_w, real_h); } +/* Fill background with bitmap pattern from S at specified position + given by X and Y. WIDTH and HEIGHT specifies bitmap size, GC is + used to get foreground and background color context and HDC where + fill it. */ + +static void +w32_fill_stipple_pattern (HDC hdc, struct glyph_string *s, Emacs_GC *gc, + int x, int y, unsigned int width, unsigned int height) +{ + SetTextColor (hdc, gc->foreground); + SetBkColor (hdc, gc->background); + + RECT r; + Emacs_Pixmap bm; + HBRUSH hb; + + r.left = x; + r.top = y; + r.right = x + width; + r.bottom = y + height; + + bm = FRAME_DISPLAY_INFO (s->f)->bitmaps[s->face->stipple - 1].stipple; + + hb = CreatePatternBrush (bm); + FillRect (hdc, &r, hb); + + DeleteObject (hb); +} /* Draw the background of glyph_string S. If S->background_filled_p is non-zero don't draw it. FORCE_P non-zero means draw the @@ -1264,21 +1292,16 @@ w32_draw_glyph_string_background (struct glyph_string *s, bool force_p) { int box_line_width = max (s->face->box_horizontal_line_width, 0); -#if 0 /* TODO: stipple */ if (s->stippled_p) { /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, s->gc, FillOpaqueStippled); - XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), s->gc, s->x, - s->y + box_line_width, - s->background_width, - s->height - 2 * box_line_width); - XSetFillStyle (s->display, s->gc, FillSolid); + w32_fill_stipple_pattern (s->hdc, s, s->gc, s->x, + s->y + box_line_width, + s->background_width, + s->height - 2 * box_line_width); s->background_filled_p = true; } - else -#endif - if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width + else if (FONT_HEIGHT (s->font) < s->height - 2 * box_line_width /* When xdisp.c ignores FONT_HEIGHT, we cannot trust font dimensions, since the actual glyphs might be much smaller. So in that case we always clear the @@ -2286,16 +2309,12 @@ w32_draw_image_foreground_1 (struct glyph_string *s, HBITMAP pixmap) static void w32_draw_glyph_string_bg_rect (struct glyph_string *s, int x, int y, int w, int h) { -#if 0 /* TODO: stipple */ if (s->stippled_p) { /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, s->gc, FillOpaqueStippled); - XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), s->gc, x, y, w, h); - XSetFillStyle (s->display, s->gc, FillSolid); + w32_fill_stipple_pattern (s->hdc, s, s->gc, x, y, w, h); } else -#endif w32_clear_glyph_string_rect (s, x, y, w, h); } @@ -2500,16 +2519,12 @@ w32_draw_stretch_glyph_string (struct glyph_string *s) get_glyph_string_clip_rect (s, &r); w32_set_clip_rectangle (hdc, &r); -#if 0 /* TODO: stipple */ if (s->face->stipple) { /* Fill background with a stipple pattern. */ - XSetFillStyle (s->display, gc, FillOpaqueStippled); - XFillRectangle (s->display, FRAME_W32_WINDOW (s->f), gc, x, y, w, h); - XSetFillStyle (s->display, gc, FillSolid); + w32_fill_stipple_pattern (s->hdc, s, gc, x, y, w, h); } else -#endif { w32_fill_area (s->f, s->hdc, gc->background, x, y, w, h); } diff --git a/src/w32term.h b/src/w32term.h index a19be1a9e6a..38eac4230dd 100644 --- a/src/w32term.h +++ b/src/w32term.h @@ -58,6 +58,7 @@ #define CP_DEFAULT 1004 { Emacs_Pixmap pixmap; char *file; + Emacs_Pixmap stipple; HINSTANCE hinst; /* Used to load the file */ int refcount; /* Record some info about this pixmap. */ -- 2.44.0.windows.1 --=-=-=--