Merge pull request #11 from trunkmaster/master

Mouse cursor images handling fix and cleanup
This commit is contained in:
Fred Kiefer 2019-05-01 14:15:14 +02:00 committed by GitHub
commit d2d0e6650a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 28 additions and 7 deletions

View file

@ -1,3 +1,24 @@
2019-04-20 Sergii Stoian <stoyan255@ukr.net>
* Source/x11/XGServerWindow.m (standardcursor::): Getting of
XC_fleur as GSCloseHandCursor was removed because it loads in
NSCursor as image.
2019-04-18 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerWindow.m (standardcursor::): revert resizing
cursor names to the old values upon request of project owner.
2019-04-17 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerWindow.m (getStandardBitmap): send `bitmapFormat`
to _convertToFormatBitsPerSample::::::::. Fixes display of colored
mouse cursor images.
(standardcursor::): cleanup in Xlib cursors handling. Additional
cursor types were added: GSClosedHandCursor, GSOpenHandCursor.
Removed GSDisappearingItemCursor type handling - it loads in NSCursor
from image.
2019-04-12 Sergii Stoian <stoyan255@gmail.com>
* Source/x11/XGServerEvent.m (mouseOptionsChanged:): change double-click

View file

@ -142,7 +142,7 @@ static NSBitmapImageRep *getStandardBitmap(NSImage *image)
hasAlpha: [rep hasAlpha]
isPlanar: NO
colorSpaceName: NSCalibratedRGBColorSpace
bitmapFormat: 0
bitmapFormat: [rep bitmapFormat]
bytesPerRow: 0
bitsPerPixel: 0];
}
@ -4177,14 +4177,14 @@ xgps_cursor_image(Display *xdpy, Drawable draw, const unsigned char *data,
case GSIBeamCursor:
cursor = XCreateFontCursor(dpy, XC_xterm);
break;
case GSCrosshairCursor:
cursor = XCreateFontCursor(dpy, XC_crosshair);
break;
case GSDisappearingItemCursor:
cursor = XCreateFontCursor(dpy, XC_shuttle);
case GSOpenHandCursor:
cursor = XCreateFontCursor(dpy, XC_hand1);
break;
case GSPointingHandCursor:
cursor = XCreateFontCursor(dpy, XC_hand1);
cursor = XCreateFontCursor(dpy, XC_hand2);
break;
case GSCrosshairCursor:
cursor = XCreateFontCursor(dpy, XC_crosshair);
break;
case GSResizeDownCursor:
cursor = XCreateFontCursor(dpy, XC_bottom_side);