Mercurial > vim
view src/gui_xmebw.h @ 34094:0b25a862bf0c v9.1.0014
patch 9.1.0014: incorrect use of W_WINROW in edit.c
Commit: https://github.com/vim/vim/commit/b1ed7ec9f7d1a0142d4f1c8c83bab9172bc92c7c
Author: zeertzjq <zeertzjq@outlook.com>
Date: Fri Jan 5 18:11:43 2024 +0100
patch 9.1.0014: incorrect use of W_WINROW in edit.c
Problem: incorrect use of W_WINROW in edit.c
Solution: compare against curwin->w_height instead
Remove incorrect use of W_WINROW
In structs.h it is mentioned that w_wrow is relative to w_winrow, so
using W_WINROW doesn't make sense when comparing with window height.
This change won't lead to any observable behavior change:
The condition intends to check if there are 'scrolloff' lines between
the current cursor when the bottom of the window. When W_WINROW(curwin)
is added to curwin->w_height - 1 - get_scrolloff_value(), the condition
is instead satisfied when the cursor is on some screen line below that
position. However,
- If 'scrolloff' is smaller than half the window height, this condition
can only be satisfied when W_WINROW(curwin) == 0. And if it is not
satisfied, update_topline() does the actual scrolling.
- If 'scrolloff' is larger than half the window height, update_topline()
will put the cursor at the center of the window soon afterwards
anyway, because set_topline() now unsets VALID_TOPLINE flag starting
from https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f.
To put it in another way, https://github.com/vim/vim-history/commit/7db7bb45b0f919ff0615d463ebd4fde881c69d1f
makes the update_topline() just below correct the mistakes made in this
block, so this incorrect use of W_WINROW() no longer affects observable
behavior.
closes: #12331
Signed-off-by: zeertzjq <zeertzjq@outlook.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Fri, 05 Jan 2024 18:30:03 +0100 |
parents | 4aead6a9b7a9 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * * (C) 2002,2005 by Marcin Dalecki <martin@dalecki.de> * * MARCIN DALECKI ASSUMES NO RESPONSIBILITY FOR THE USE OR INABILITY TO USE ANY * OF THIS SOFTWARE . THIS SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY * KIND, AND MARCIN DALECKI EXPRESSLY DISCLAIMS ALL IMPLIED WARRANTIES, * INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY AND * FITNESS FOR A PARTICULAR PURPOSE. */ #ifndef EnhancedB_H #define EnhancedB_H /* * New resources for the Extended Pushbutton widget */ #ifndef XmNshift # define XmNshift "shift" #endif #ifndef XmCShift # define XmCShift "Shift" #endif #ifndef XmNlabelLocation # define XmNlabelLocation "labelLocation" #endif #ifndef XmCLocation # define XmCLocation "Location" #endif #ifndef XmNpixmapData # define XmNpixmapData "pixmapData" #endif #ifndef XmNpixmapFile # define XmNpixmapFile "pixmapFile" #endif /* * Constants for labelLocation. */ #ifdef HAVE_XM_JOINSIDET_H # include <Xm/JoinSideT.h> #else # define XmLEFT 1 # define XmRIGHT 2 # define XmTOP 3 # define XmBOTTOM 4 #endif #define XmIsEnhancedButton(w) XtIsSubclass(w, xmEnhancedButtonWidgetClass) /* * Convenience creation function. */ extern Widget XgCreateEPushButtonWidget(Widget, char *, ArgList, Cardinal); extern WidgetClass xmEnhancedButtonWidgetClass; typedef struct _XmEnhancedButtonClassRec *XmEnhancedButtonWidgetClass; typedef struct _XmEnhancedButtonRec *XmEnhancedButtonWidget; #endif