From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Manuel Giraud via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#62707: 30.0.50; [PATCH] Non toolkit scroll bar handle Date: Fri, 07 Apr 2023 08:46:14 +0200 Message-ID: <87h6tsfavd.fsf@ledu-giraud.fr> Reply-To: Manuel Giraud 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="37966"; mail-complaints-to="usenet@ciao.gmane.io" To: 62707@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Fri Apr 07 08:47:19 2023 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 1pkfsV-0009cX-7R for geb-bug-gnu-emacs@m.gmane-mx.org; Fri, 07 Apr 2023 08:47:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pkfsG-0004VW-Ml; Fri, 07 Apr 2023 02:47:04 -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 1pkfsE-0004V5-Pk for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2023 02:47:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pkfsE-0005pl-Fi for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2023 02:47:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1pkfsE-0007AY-39 for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2023 02:47:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Manuel Giraud Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Fri, 07 Apr 2023 06:47:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62707 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.168084999627519 (code B ref -1); Fri, 07 Apr 2023 06:47:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 7 Apr 2023 06:46:36 +0000 Original-Received: from localhost ([127.0.0.1]:55604 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkfrn-00079n-4j for submit@debbugs.gnu.org; Fri, 07 Apr 2023 02:46:35 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:43208) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pkfri-00079a-SV for submit@debbugs.gnu.org; Fri, 07 Apr 2023 02:46:33 -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 1pkfre-0004O2-U4 for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2023 02:46:27 -0400 Original-Received: from ledu-giraud.fr ([51.159.28.247]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pkfra-0004hx-3O for bug-gnu-emacs@gnu.org; Fri, 07 Apr 2023 02:46:26 -0400 DKIM-Signature: v=1; a=ed25519-sha256; c=simple/simple; s=ed25519; bh=hHuxEi5y 23fp7SpIFassN7WPZcOgaZRZQRqdE13m0Sc=; h=date:subject:to:from; d=ledu-giraud.fr; b=6to0okVjPdrcDJHnpZk9kK4UMQU3EQJ1xMQP/MRqUFTcoMe3Ld WOVHL0SN/l+h7hCT+DlA4DtaxxJpxuYOSeAA== DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; s=rsa; bh=hHuxEi5y23fp7SpI FassN7WPZcOgaZRZQRqdE13m0Sc=; h=date:subject:to:from; d=ledu-giraud.fr; b=0ZZIU//SUJlmiJ4btWh4rjMEospW2TvjkIYhnV/D46TutqyIC6 jUcLNSqOUhR4it5QqjBgVUxT3/NVFkViFp0M62LWT0VJJuAfFwkPTLYLBeQ5wYHBLwByv+ Gteg6U8YdmorNBU95edbMvqCPdnnaGBs263JUS0kft85MGGdM0sdUpS2jaP7o5m23m8HJ1 6UOLJSgzDVYQS3bS/rjCno3QO/GzgORyWS9eSXPUlqGUvdoOW7MIBjcPFt0uOScdLZD1ZZ 9d1SQ1t3x6RKwwC3OFWNfnGejk9ZZAsIRYpxMVdQT/SEfomw/BGXvCJD802sJ3/5V8hV0n Tb5brJdrLmDg== Original-Received: from computer ( [10.1.1.1]) by ledu-giraud.fr (OpenSMTPD) with ESMTPSA id c362d73b (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 7 Apr 2023 08:46:17 +0200 (CEST) Received-SPF: pass client-ip=51.159.28.247; envelope-from=manuel@ledu-giraud.fr; helo=ledu-giraud.fr X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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:259365 Archived-At: --=-=-= Content-Type: text/plain Hi, I'd like to fix how the handle of scroll bars in non-toolkit build keeps changing size when scrolling a file. This first patch does not do this but it just simplify how those scroll bar are drawn. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-src-xterm.c-x_scroll_bar_set_handle-Simplify-scroll-.patch >From 6ea80fa7c47acd7eb47d5d3453e5cd114882adca Mon Sep 17 00:00:00 2001 From: Manuel Giraud Date: Fri, 7 Apr 2023 08:37:30 +0200 Subject: [PATCH] * src/xterm.c (x_scroll_bar_set_handle): Simplify scroll bar drawing. --- src/xterm.c | 29 ++++------------------------- 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/src/xterm.c b/src/xterm.c index 70bcb67d80d..f9837b3464e 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -16583,9 +16583,9 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, that many pixels tall. */ end += VERTICAL_SCROLL_BAR_MIN_HANDLE; - /* Draw the empty space above the handle. Note that we can't clear - zero-height areas; that means "clear to end of window." */ - if ((inside_width > 0) && (start > 0)) + /* Clear all scroll bar area. Note that we can't clear zero-height + areas; that means "clear to end of window." */ + if ((inside_width > 0) && (inside_height > 0)) { if (f->output_data.x->scroll_bar_background_pixel != -1) XSetForeground (FRAME_X_DISPLAY (f), gc, @@ -16597,7 +16597,7 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, XFillRectangle (FRAME_X_DISPLAY (f), w, gc, bar->left + VERTICAL_SCROLL_BAR_LEFT_BORDER, bar->top + VERTICAL_SCROLL_BAR_TOP_BORDER, - inside_width, start); + inside_width, inside_height); XSetForeground (FRAME_X_DISPLAY (f), gc, FRAME_FOREGROUND_PIXEL (f)); @@ -16615,27 +16615,6 @@ x_scroll_bar_set_handle (struct scroll_bar *bar, int start, int end, bar->top + VERTICAL_SCROLL_BAR_TOP_BORDER + start, inside_width, end - start); - - /* Draw the empty space below the handle. Note that we can't - clear zero-height areas; that means "clear to end of window." */ - if ((inside_width > 0) && (end < inside_height)) - { - if (f->output_data.x->scroll_bar_background_pixel != -1) - XSetForeground (FRAME_X_DISPLAY (f), gc, - f->output_data.x->scroll_bar_background_pixel); - else - XSetForeground (FRAME_X_DISPLAY (f), gc, - FRAME_BACKGROUND_PIXEL (f)); - - XFillRectangle (FRAME_X_DISPLAY (f), w, gc, - bar->left + VERTICAL_SCROLL_BAR_LEFT_BORDER, - bar->top + VERTICAL_SCROLL_BAR_TOP_BORDER + end, - inside_width, inside_height - end); - - XSetForeground (FRAME_X_DISPLAY (f), gc, - FRAME_FOREGROUND_PIXEL (f)); - } - /* Restore the foreground color of the GC if we changed it above. */ if (f->output_data.x->scroll_bar_foreground_pixel != -1) XSetForeground (FRAME_X_DISPLAY (f), gc, -- 2.39.2 --=-=-= Content-Type: text/plain In GNU Emacs 30.0.50 (build 1, x86_64-unknown-openbsd7.3, cairo version 1.17.8) of 2023-04-05 built on computer Repository revision: 8678708ad10b17a4609c950a02cf39ab9ff86317 Repository branch: master Windowing system distributor 'The X.Org Foundation', version 11.0.12101006 System Description: OpenBSD computer 7.3 GENERIC.MP#1105 amd64 Configured using: 'configure --prefix=/home/manuel/emacs --bindir=/home/manuel/bin --with-x-toolkit=no --without-sound --without-compress-install CPPFLAGS=-I/usr/local/include LDFLAGS=-L/usr/local/lib' Configured features: CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBXML2 MODULES NOTIFY KQUEUE OLDXMENU PDUMPER PNG RSVG SQLITE3 THREADS TIFF TREE_SITTER WEBP X11 XDBE XIM XINPUT2 XPM ZLIB Important settings: value of $LC_ALL: en_US.UTF-8 locale-coding-system: utf-8-unix Major mode: Dired by name Minor modes in effect: global-git-commit-mode: t magit-auto-revert-mode: t gnus-dired-mode: t electric-pair-mode: t display-time-mode: t display-battery-mode: t server-mode: t shell-dirtrack-mode: t override-global-mode: t repeat-mode: t desktop-save-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t buffer-read-only: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: /home/manuel/.emacs.d/elpa/ef-themes-0.11.0/theme-loaddefs hides /home/manuel/emacs/share/emacs/30.0.50/lisp/theme-loaddefs /home/manuel/.emacs.d/elpa/transient-0.3.7/transient hides /home/manuel/emacs/share/emacs/30.0.50/lisp/transient Features: (shadow sort mail-extr emacsbug whitespace magit-patch magit-extras face-remap magit-submodule magit-obsolete magit-blame magit-stash magit-reflog magit-bisect magit-push magit-pull magit-fetch magit-clone magit-remote magit-commit magit-sequence magit-notes magit-worktree magit-tag magit-merge magit-branch magit-reset magit-files magit-refs magit-status magit magit-repos magit-apply magit-wip magit-log which-func magit-diff git-commit log-edit add-log magit-core magit-autorevert magit-margin magit-transient magit-process with-editor magit-mode transient magit-git magit-section magit-utils dash misearch multi-isearch pulse idlwave idlwave-help idlw-help org-indent org-agenda warnings rng-xsd xsd-regexp rng-cmpct rng-nxml rng-valid rng-loc rng-uri rng-parse nxml-parse rng-match rng-dt rng-util rng-pttrn nxml-ns nxml-mode nxml-outln nxml-rap nxml-util nxml-enc xmltok conf-mode smerge-mode diff css-mode sgml-mode facemenu imenu org-element org-persist org-id org-refile avl-tree oc-basic ol-eww eww xdg url-queue mm-url ol-rmail ol-mhe ol-irc ol-info ol-gnus nnselect ol-docview doc-view jka-compr image-mode exif ol-bibtex bibtex ol-bbdb ol-w3m ol-doi org-link-doi org ob ob-tangle ob-ref ob-lob ob-table ob-exp org-macro org-src ob-comint org-pcomplete org-list org-footnote org-faces org-entities ob-emacs-lisp ob-core ob-eval org-cycle org-table ol org-fold org-fold-core org-keys oc org-loaddefs org-version org-compat org-macs sh-script smie treesit executable vc-hg vc-bzr vc-src vc-sccs vc-cvs vc-rcs log-view pcvs-util view pascal gnus-dired autorevert filenotify vc-git diff-mode vc-svn vc vc-dispatcher bug-reference paredit elec-pair time battery cus-load exwm-randr xcb-randr exwm-config ido exwm exwm-input xcb-keysyms xcb-xkb exwm-manage exwm-floating xcb-cursor xcb-render exwm-layout exwm-workspace exwm-core xcb-ewmh xcb-icccm xcb xcb-xproto xcb-types xcb-debug server modus-operandi-theme modus-themes ytdious mingus libmpdee reporter edebug debug backtrace transmission color calc-bin calc-ext calc calc-loaddefs rect calc-macs supercite regi ebdb-message ebdb-gnus gnus-msg gnus-art mm-uu mml2015 mm-view mml-smime smime gnutls dig gnus-sum shr pixel-fill kinsoku url-file svg dom gnus-group gnus-undo gnus-start gnus-dbus gnus-cloud nnimap nnmail mail-source utf7 nnoo gnus-spec gnus-int gnus-range message sendmail yank-media puny rfc822 mml mml-sec epa epg rfc6068 epg-config mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047 rfc2045 ietf-drums gmm-utils mailheader gnus-win gnus nnheader gnus-util mail-utils range mm-util mail-prsvr wid-edit ebdb-mua ebdb-com crm ebdb-format ebdb mailabbrev eieio-opt speedbar ezimage dframe find-func eieio-base pcase timezone visual-basic-mode cl web-mode derived disp-table erlang-start smart-tabs-mode skeleton cc-mode cc-fonts cc-guess cc-menus cc-cmds cc-styles cc-align cc-engine cc-vars cc-defs slime-asdf grep slime-tramp tramp rx tramp-loaddefs trampver tramp-integration files-x tramp-compat shell pcomplete parse-time iso8601 time-date ls-lisp format-spec slime-fancy slime-indentation slime-cl-indent cl-indent slime-trace-dialog slime-fontifying-fu slime-package-fu slime-references slime-compiler-notes-tree advice slime-scratch slime-presentations bridge slime-macrostep macrostep slime-mdot-fu slime-enclosing-context slime-fuzzy slime-fancy-trace slime-fancy-inspector slime-c-p-c slime-editing-commands slime-autodoc slime-repl slime-parse slime apropos compile text-property-search etags fileloop generator xref project arc-mode archive-mode noutline outline icons pp comint ansi-osc ansi-color ring hyperspec thingatpt slime-autoloads edmacro kmacro use-package-bind-key bind-key appt diary-lib diary-loaddefs cal-menu calendar cal-loaddefs dired-aux dired-x dired dired-loaddefs notifications dbus xml cl-extra help-mode use-package-core repeat easy-mmode desktop frameset osm-autoloads rust-mode-autoloads ebdb-autoloads compat-autoloads magit-autoloads debbugs-autoloads git-commit-autoloads magit-section-autoloads ef-themes-autoloads with-editor-autoloads paredit-autoloads dash-autoloads ytdious-autoloads transmission-autoloads transient-autoloads exwm-autoloads hyperbole-autoloads detached-autoloads info package browse-url url url-proxy url-privacy url-expand url-methods url-history url-cookie generate-lisp-file url-domsuf url-util mailcap url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs password-cache json subr-x map byte-opt gv bytecomp byte-compile url-vars cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind kqueue lcms2 dynamic-setting system-font-setting font-render-setting cairo xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 755758 139705) (symbols 48 60128 3) (strings 32 192388 10042) (string-byteps 1 6128844) (vectors 16 116531) (vector-slots 8 2340942 153787) (floats 8 549 1053) (intervals 56 26188 754) (buffers 984 124)) -- Manuel Giraud --=-=-=--