Mercurial > vim
view src/xpm_w32.c @ 34686:83875247fbc0 v9.1.0224
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Commit: https://github.com/vim/vim/commit/515f734e687f28f7199b2a8042197624d9f3ec15
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 12:01:14 2024 +0100
patch 9.1.0224: cursor may move too many lines over "right" & "below" virt text
Problem: If a line has "right" & "below" virtual text properties,
where the "below" property may be stored first due to lack of
ordering between them, then the line height is calculated to
be 1 more and causes the cursor to far over the line.
Solution: Remove some unnecessary setting of a
`next_right_goes_below = TRUE` flag for "below" and "above"
text properties. (Dylan Thacker-Smith)
I modified a regression test I recently added to cover this case,
leveraging the fact that "after", "right" & "below" text properties are
being stored in the reverse of the order they are added in. The
previous version of this regression test was crafted to workaround this
issue so it can be addressed by this separate patch.
closes: #14317
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 28 Mar 2024 12:15:03 +0100 |
parents | 15539899a112 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * Load XPM image. * * This function is placed in separate file because Xpm headers conflict with * Vim ones :( * * Written by Sergey Khorev. * http://iamphet.nm.ru/vim/index.html */ #ifndef WIN32_LEAN_AND_MEAN # define WIN32_LEAN_AND_MEAN #endif #include <windows.h> #include "xpm_w32.h" // Engage Windows support in libXpm #define FOR_MSW #include "xpm.h" /* * Tries to load an Xpm image from the file "filename". * Returns -1 on failure. * Returns 0 on success and stores image and mask BITMAPS in "hImage" and * "hShape". */ int LoadXpmImage( char *filename, HBITMAP *hImage, HBITMAP *hShape) { XImage *img; // loaded image XImage *shp; // shapeimage XpmAttributes attr; int res; HDC hdc = CreateCompatibleDC(NULL); attr.valuemask = 0; res = XpmReadFileToImage(&hdc, filename, &img, &shp, &attr); DeleteDC(hdc); if (res < 0) return -1; if (shp == NULL) { if (img) XDestroyImage(img); return -1; } *hImage = img->bitmap; *hShape = shp->bitmap; return 0; }