From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Ari Roponen Newsgroups: gmane.emacs.bugs Subject: bug#33442: 26.1.90; Cairo side-by-side windows scrolling fix should be cherry-picked Date: Thu, 29 Nov 2018 14:15:41 +0200 Message-ID: <87mupst6z6.fsf@gmail.com> References: <87h8gc412q.fsf@gmail.com> <83wop7ivw2.fsf@gnu.org> <83in0riscq.fsf@gnu.org> <87va4qaorj.fsf@gmail.com> <1bf2b358-3ac2-46bb-f298-5c115149dea0@yandex.ru> <875zwpligs.fsf@gmail.com> <6976af8a-8fbf-da98-d770-55224a7736af@yandex.ru> <871s7dl2xg.fsf@gmail.com> <08133af3-3f70-1634-e162-ae6cfe26767f@yandex.ru> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: blaine.gmane.org 1543494089 2683 195.159.176.226 (29 Nov 2018 12:21:29 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Thu, 29 Nov 2018 12:21:29 +0000 (UTC) User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 33442@debbugs.gnu.org To: Dmitry Gutov Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Nov 29 13:21:25 2018 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gSLJs-0000Xm-2R for geb-bug-gnu-emacs@m.gmane.org; Thu, 29 Nov 2018 13:21:24 +0100 Original-Received: from localhost ([::1]:53760 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSLLy-00075s-4A for geb-bug-gnu-emacs@m.gmane.org; Thu, 29 Nov 2018 07:23:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:60139) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gSLEl-0008Kp-Q3 for bug-gnu-emacs@gnu.org; Thu, 29 Nov 2018 07:16:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gSLEg-0004jU-R6 for bug-gnu-emacs@gnu.org; Thu, 29 Nov 2018 07:16:07 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:49905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gSLEg-0004jI-M1 for bug-gnu-emacs@gnu.org; Thu, 29 Nov 2018 07:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gSLEg-0005K9-CZ for bug-gnu-emacs@gnu.org; Thu, 29 Nov 2018 07:16:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Ari Roponen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 29 Nov 2018 12:16:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 33442 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 33442-submit@debbugs.gnu.org id=B33442.154349375220447 (code B ref 33442); Thu, 29 Nov 2018 12:16:02 +0000 Original-Received: (at 33442) by debbugs.gnu.org; 29 Nov 2018 12:15:52 +0000 Original-Received: from localhost ([127.0.0.1]:54163 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gSLEW-0005Jj-7S for submit@debbugs.gnu.org; Thu, 29 Nov 2018 07:15:52 -0500 Original-Received: from mail-lf1-f45.google.com ([209.85.167.45]:35628) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1gSLET-0005JW-Ty for 33442@debbugs.gnu.org; Thu, 29 Nov 2018 07:15:50 -0500 Original-Received: by mail-lf1-f45.google.com with SMTP id e26so1286665lfc.2 for <33442@debbugs.gnu.org>; Thu, 29 Nov 2018 04:15:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version; bh=ON1qdGLH3tV9fSIqBZ47iNr3XshY3Ik/1uaixXfyGWM=; b=o428Uqp8ZqKZF/xlcj6CfBw6k1SyWOC8dVxm6vPisIblsoKruQIOQXnTldCcZRZ/qd wEv19Lfnc6pRyw16J96vuExgAdUXNlN2b6/t/tiaVazVkK72Byk9kUivMg1Kt/7TjnVr NvVq3ck82OAqMA4d4XM3IpFauAx5sAVs+bPziYdbgwwcqbJ01GD08BUDkOv/0eK0iH31 Mbhf8xxs5IxNcYkBFOh+Uh/C9+oYoUZG3T7w1YX79xVq6NpMwql69kQHOLld0w9hbwNC 2evQkLlNAGKkkkjPynec9RtVr4/Q92yKLDKX5qRldFud5AjapZVl+f8pwgycIXJmY8Wq 8TaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:references:date:in-reply-to :message-id:user-agent:mime-version; bh=ON1qdGLH3tV9fSIqBZ47iNr3XshY3Ik/1uaixXfyGWM=; b=feCaU0niKZ4U+WTuSiNOg0eV2eW4egOHUoVIbVVH9AEu7rywnmQHN06y27PioYgcLy UuUiqfYkpM+vtN2eW49iuF6HVpnbBjMOy5Y2KZQ0qQT/bbFgbpPWNqoDy8iQukymHleU EKrhaxmt7zNQheA7kpfdoeskLlHqwk1t/JKwg5xXr0SN7gtR7xPJ/I/HKs+bCPz5x8Yx RH3H02CrKttGgR8kiBo2+oHssQVBb0Na0D3j3a54XgkQXR+ant2Y4xGxcKoYE6JmSKWA nGRIHgQIkZnsW6Q25Isy4WvPO6Yj30Nv3gMPYejIGUFkgYr08AxdBUxXzHcMo5pP8HsX Yoew== X-Gm-Message-State: AA+aEWYzzDAs0dNn9NoARrVf7OJy86NgE+1ubO/yqgUXQF1kTJHiO+d+ NK2TMvGG+t2NX4rug99RxkwvR/6uvw== X-Google-Smtp-Source: AFSGD/Vd9si8eOE8gsx/pY+OeiMB9eMYVqyiBakkFimwB/jQa7fT3BLkRKhfQiB/iSW1Ewp24aMixg== X-Received: by 2002:a19:c396:: with SMTP id t144mr871674lff.110.1543493743364; Thu, 29 Nov 2018 04:15:43 -0800 (PST) Original-Received: from arirop ([2001:2003:f7ce:f380:dfd:5410:8d1c:6824]) by smtp.gmail.com with ESMTPSA id e19-v6sm263893ljf.67.2018.11.29.04.15.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 29 Nov 2018 04:15:42 -0800 (PST) In-Reply-To: <08133af3-3f70-1634-e162-ae6cfe26767f@yandex.ru> (Dmitry Gutov's message of "Thu, 22 Nov 2018 16:05:18 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:152890 Archived-At: Dmitry Gutov writes: > On 22.11.2018 14:19, Ari Roponen wrote: > >> That seems to be it: Starting Emacs with >> GDK_SCALE=2 emacs -Q >> shows the problem here, too. > > Thanks for that. I've just tried a --with-cairo build with > > GDK_SCALE=1 emacs > > and it seems to work well, (even) without your extra patch. Aside from > the expected problems with toolbar icons and scrollbar (too small), > which I don't use anyway. With the following patch, GDK_SCALE=2 seems to work for me. diff --git a/src/xterm.c b/src/xterm.c index 3a7e31e712..42ddc4f5b1 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -360,10 +360,15 @@ x_begin_cr_clip (struct frame *f, GC gc) if (! FRAME_CR_SURFACE (f)) { + int scale = 1; +#ifdef USE_GTK + scale = xg_get_scale (f); +#endif + FRAME_CR_SURFACE (f) = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, - FRAME_PIXEL_WIDTH (f), - FRAME_PIXEL_HEIGHT (f)); + scale * FRAME_PIXEL_WIDTH (f), + scale * FRAME_PIXEL_HEIGHT (f)); } cr = cairo_create (FRAME_CR_SURFACE (f)); FRAME_CR_CONTEXT (f) = cr; @@ -999,8 +1004,9 @@ x_update_begin (struct frame *f) if (FRAME_GTK_WIDGET (f)) { GdkWindow *w = gtk_widget_get_window (FRAME_GTK_WIDGET (f)); - width = gdk_window_get_width (w); - height = gdk_window_get_height (w); + int scale = xg_get_scale (f); + width = scale * gdk_window_get_width (w); + height = scale * gdk_window_get_height (w); } else #endif