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.bugs Subject: bug#54623: No scroll bars on macOS builds Date: Fri, 1 Apr 2022 21:59:55 +0100 Message-ID: References: <542747779.525811.1648554603075@mail1.libero.it> <875ynxapxv.fsf@gnus.org> <232238068.1610928.1648723538459@mail1.libero.it> <1573705019.892210.1648765645434@mail1.libero.it> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="lXzSqaM7yJitLI9P" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36851"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 54623@debbugs.gnu.org, Lars Ingebrigtsen To: Angelo Graziosi Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Apr 01 23:01:28 2022 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 1naOOe-0009PH-7S for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 01 Apr 2022 23:01:28 +0200 Original-Received: from localhost ([::1]:52120 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naOOc-0005OI-Ln for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 01 Apr 2022 17:01:26 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:54456) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naOOE-0005O9-U6 for bug-gnu-emacs@gnu.org; Fri, 01 Apr 2022 17:01:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:49826) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naOOE-0008T8-2I for bug-gnu-emacs@gnu.org; Fri, 01 Apr 2022 17:01:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naOOE-0008Qh-1m for bug-gnu-emacs@gnu.org; Fri, 01 Apr 2022 17:01:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Alan Third Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 01 Apr 2022 21:01:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 54623 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 54623-submit@debbugs.gnu.org id=B54623.164884681032307 (code B ref 54623); Fri, 01 Apr 2022 21:01:02 +0000 Original-Received: (at 54623) by debbugs.gnu.org; 1 Apr 2022 21:00:10 +0000 Original-Received: from localhost ([127.0.0.1]:43720 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naONN-0008Oz-Ge for submit@debbugs.gnu.org; Fri, 01 Apr 2022 17:00:10 -0400 Original-Received: from outbound.soverin.net ([116.202.126.228]:46639) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naONK-0008Mj-7P for 54623@debbugs.gnu.org; Fri, 01 Apr 2022 17:00:08 -0400 Original-Received: from smtp.soverin.net (unknown [10.10.3.11]) (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 0149F316; Fri, 1 Apr 2022 20:59:59 +0000 (UTC) Original-Received: from smtp.soverin.net (smtp.soverin.net [10.10.4.99]) by soverin.net DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=idiocy.org; s=soverin; t=1648846798; bh=BZTxnpVdxOt9QPhlKso8erdZF305T8hDOEgRKja/56w=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=MQ62wFP617xYQom9n0P0lK/FHWA4KxB9uxCHrLJBGDlp4yi5yDHD3DtgfvDiDrvK0 h4JZxGaxIfb8gk2V0cp4ycbtTsEsrrXv8GKtXFHqW/083Ac+Lhctr+mLEyx4JLqzYW +c545N8FhWSq0ilpuVhl6HTbdMBRz40XasJoaJn9374hnnlyPqnu1Go7ykINgiVFIG LVZZY2A8EQVlWoX6Su1uEZ7EdJouARsqw+Yen+COwgN+dEDSFL314UdygwbFwty7ro 2Ip+blKlppSWqBjp4q/B2r79b4BDXJ2bHU9L2ZsqT6sYquNVGFG/IAhdfTEl6yUle+ dostPDRpT0zEA== Original-Received: from alan by faroe.holly.idiocy.org with local (Exim 4.95) (envelope-from ) id 1naON9-000FxL-JT; Fri, 01 Apr 2022 21:59:55 +0100 Mail-Followup-To: Alan Third , Angelo Graziosi , Lars Ingebrigtsen , 54623@debbugs.gnu.org Content-Disposition: inline In-Reply-To: <1573705019.892210.1648765645434@mail1.libero.it> 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" Xref: news.gmane.io gmane.emacs.bugs:229241 Archived-At: --lXzSqaM7yJitLI9P Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Fri, Apr 01, 2022 at 12:27:25AM +0200, Angelo Graziosi wrote: > > > Il 31/03/2022 18:43 Alan Third ha scritto: > > > > > > Can you try the new version attached to this email, please? > > > > Now Emacs builds and does not crash but DOES NOT work and still NO scroll bars: > > - when scrolling the text moving the mouse wheel the bottom lines remain fixed and then after a while the window contains garbage. > > - trying to use C-x C-f, M-x ... does not work, no minibuffer opens: it continues to display the text "For information about..." > > - trying to select text with the mouse (mouse-1 and dragging) does not work... What about the attached? -- Alan Third --lXzSqaM7yJitLI9P Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v3-0001-Fix-scrollbars-on-macOS-10.13-and-below-bug-54623.patch" >From be1e1165c94533ac47584639b544fd24acec284a Mon Sep 17 00:00:00 2001 From: Alan Third Date: Wed, 30 Mar 2022 22:40:03 +0100 Subject: [PATCH v3] Fix scrollbars on macOS 10.13 and below (bug#54623) Make any build on macOS 10.13 and below follow the same drawing path as the GNUstep port. macOS 10.14 and above will use EmacsLayer. * src/nsterm.h (EmacsLayer): * src/nsterm.m ([EmacsView makeBackingLayer]): ([EmacsView unlockFocus]): ([EmacsView windowDidChangeBackingProperties:]): ([EmacsView copyRect:to:]): Remove any code required for macOS 10.13 and below, and fix the #if's to enforce strict separation of the drawing paths. --- src/nsterm.h | 2 +- src/nsterm.m | 124 +++++++++++++++++++-------------------------------- 2 files changed, 47 insertions(+), 79 deletions(-) diff --git a/src/nsterm.h b/src/nsterm.h index f027646123..8452f3b3fa 100644 --- a/src/nsterm.h +++ b/src/nsterm.h @@ -698,7 +698,7 @@ #define NSTRACE_UNSILENCE() + (CGFloat)scrollerWidth; @end -#ifdef NS_IMPL_COCOA +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 @interface EmacsLayer : CALayer { NSMutableArray *cache; diff --git a/src/nsterm.m b/src/nsterm.m index fd56094c28..2b98fb9489 100644 --- a/src/nsterm.m +++ b/src/nsterm.m @@ -7197,7 +7197,7 @@ - (instancetype) initFrameFromEmacs: (struct frame *)f [[EmacsWindow alloc] initWithEmacsFrame:f]; -#ifdef NS_IMPL_COCOA +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 /* These settings mean AppKit will retain the contents of the frame on resize. Unfortunately it also means the frame will not be automatically marked for display, but we can do that ourselves in @@ -7861,7 +7861,7 @@ - (instancetype)toggleToolbar: (id)sender } -#ifdef NS_IMPL_COCOA +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 10140 - (CALayer *)makeBackingLayer; { EmacsLayer *l = [[EmacsLayer alloc] @@ -7877,19 +7877,12 @@ - (void)lockFocus { NSTRACE ("[EmacsView lockFocus]"); - if ([self wantsLayer]) - { - CGContextRef context = [(EmacsLayer*)[self layer] getContext]; + CGContextRef context = [(EmacsLayer*)[self layer] getContext]; - [NSGraphicsContext + [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithCGContext:context flipped:YES]]; - } -#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 - else - [super lockFocus]; -#endif } @@ -7897,18 +7890,8 @@ - (void)unlockFocus { NSTRACE ("[EmacsView unlockFocus]"); - if ([self wantsLayer]) - { - [NSGraphicsContext setCurrentContext:nil]; - [self setNeedsDisplay:YES]; - } -#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 - else - { - [super unlockFocus]; - [super flushWindow]; - } -#endif + [NSGraphicsContext setCurrentContext:nil]; + [self setNeedsDisplay:YES]; } @@ -7917,19 +7900,16 @@ - (void)windowDidChangeBackingProperties:(NSNotification *)notification { NSTRACE ("EmacsView windowDidChangeBackingProperties:]"); - if ([self wantsLayer]) - { - NSRect frame = [self frame]; - EmacsLayer *layer = (EmacsLayer *)[self layer]; + NSRect frame = [self frame]; + EmacsLayer *layer = (EmacsLayer *)[self layer]; - [layer setContentsScale:[[notification object] backingScaleFactor]]; - [layer setColorSpace:[[[notification object] colorSpace] CGColorSpace]]; + [layer setContentsScale:[[notification object] backingScaleFactor]]; + [layer setColorSpace:[[[notification object] colorSpace] CGColorSpace]]; - ns_clear_frame (emacsframe); - expose_frame (emacsframe, 0, 0, NSWidth (frame), NSHeight (frame)); - } + ns_clear_frame (emacsframe); + expose_frame (emacsframe, 0, 0, NSWidth (frame), NSHeight (frame)); } -#endif /* NS_IMPL_COCOA */ +#endif - (void)copyRect:(NSRect)srcRect to:(NSPoint)dest @@ -7941,57 +7921,45 @@ - (void)copyRect:(NSRect)srcRect to:(NSPoint)dest NSRect dstRect = NSMakeRect (dest.x, dest.y, NSWidth (srcRect), NSHeight (srcRect)); -#ifdef NS_IMPL_COCOA - if ([self wantsLayer]) - { - double scale = [[self window] backingScaleFactor]; - CGContextRef context = [(EmacsLayer *)[self layer] getContext]; - int bpp = CGBitmapContextGetBitsPerPixel (context) / 8; - void *pixels = CGBitmapContextGetData (context); - int rowSize = CGBitmapContextGetBytesPerRow (context); - int srcRowSize = NSWidth (srcRect) * scale * bpp; - void *srcPixels = (char *) pixels - + (int) (NSMinY (srcRect) * scale * rowSize - + NSMinX (srcRect) * scale * bpp); - void *dstPixels = (char *) pixels - + (int) (dest.y * scale * rowSize - + dest.x * scale * bpp); - - if (NSIntersectsRect (srcRect, dstRect) - && NSMinY (srcRect) < NSMinY (dstRect)) - for (int y = NSHeight (srcRect) * scale - 1 ; y >= 0 ; y--) - memmove ((char *) dstPixels + y * rowSize, - (char *) srcPixels + y * rowSize, - srcRowSize); - else - for (int y = 0 ; y < NSHeight (srcRect) * scale ; y++) - memmove ((char *) dstPixels + y * rowSize, - (char *) srcPixels + y * rowSize, - srcRowSize); - - } -#if MAC_OS_X_VERSION_MIN_REQUIRED < 101400 +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 + double scale = [[self window] backingScaleFactor]; + CGContextRef context = [(EmacsLayer *)[self layer] getContext]; + int bpp = CGBitmapContextGetBitsPerPixel (context) / 8; + void *pixels = CGBitmapContextGetData (context); + int rowSize = CGBitmapContextGetBytesPerRow (context); + int srcRowSize = NSWidth (srcRect) * scale * bpp; + void *srcPixels = (char *) pixels + + (int) (NSMinY (srcRect) * scale * rowSize + + NSMinX (srcRect) * scale * bpp); + void *dstPixels = (char *) pixels + + (int) (dest.y * scale * rowSize + + dest.x * scale * bpp); + + if (NSIntersectsRect (srcRect, dstRect) + && NSMinY (srcRect) < NSMinY (dstRect)) + for (int y = NSHeight (srcRect) * scale - 1 ; y >= 0 ; y--) + memmove ((char *) dstPixels + y * rowSize, + (char *) srcPixels + y * rowSize, + srcRowSize); else - { -#endif -#endif /* NS_IMPL_COCOA */ + for (int y = 0 ; y < NSHeight (srcRect) * scale ; y++) + memmove ((char *) dstPixels + y * rowSize, + (char *) srcPixels + y * rowSize, + srcRowSize); -#if !defined (NS_IMPL_COCOA) || MAC_OS_X_VERSION_MIN_REQUIRED < 101400 - hide_bell(); // Ensure the bell image isn't scrolled. +#else + hide_bell(); // Ensure the bell image isn't scrolled. - ns_focus (emacsframe, &dstRect, 1); - [self scrollRect: srcRect - by: NSMakeSize (dstRect.origin.x - srcRect.origin.x, - dstRect.origin.y - srcRect.origin.y)]; - ns_unfocus (emacsframe); -#endif -#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED < 101400 - } + ns_focus (emacsframe, &dstRect, 1); + [self scrollRect: srcRect + by: NSMakeSize (dstRect.origin.x - srcRect.origin.x, + dstRect.origin.y - srcRect.origin.y)]; + ns_unfocus (emacsframe); #endif } -#ifdef NS_IMPL_COCOA +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 /* If the frame has been garbaged but the toolkit wants to draw, for example when resizing the frame, we end up with a blank screen. Sometimes this results in an unpleasant flicker, so try to @@ -9435,7 +9403,7 @@ - (void) scrollWheel: (NSEvent *)theEvent @end /* EmacsScroller */ -#ifdef NS_IMPL_COCOA +#if defined (NS_IMPL_COCOA) && MAC_OS_X_VERSION_MIN_REQUIRED >= 101400 /* ========================================================================== -- 2.35.1 --lXzSqaM7yJitLI9P--