diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2016-10-12 08:32:04 +0200 |
commit | 051d521f6e20761ba6831cecd91883da960fa931 (patch) | |
tree | b28abba7818115d2fed80eb360a79a0f9183948e /nx-X11/lib/X11/Cursor.c | |
parent | 6dce607bad8711dd06a5a7b69ad1930386b4123b (diff) | |
parent | b8de7bf654929c823080b211aeac56cd213f5a32 (diff) | |
download | nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.gz nx-libs-051d521f6e20761ba6831cecd91883da960fa931.tar.bz2 nx-libs-051d521f6e20761ba6831cecd91883da960fa931.zip |
Merge branch 'uli42-pr/upgrade_libX11' into 3.6.x
Attributes GH PR #214: https://github.com/ArcticaProject/nx-libs/pull/214
Fixes ArcticaProject/nx-libs#157.
Diffstat (limited to 'nx-X11/lib/X11/Cursor.c')
-rw-r--r-- | nx-X11/lib/X11/Cursor.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/nx-X11/lib/X11/Cursor.c b/nx-X11/lib/X11/Cursor.c index 5700f707a..80b91c36d 100644 --- a/nx-X11/lib/X11/Cursor.c +++ b/nx-X11/lib/X11/Cursor.c @@ -31,11 +31,11 @@ in this Software without prior written authorization from The Open Group. static XColor _Xconst foreground = { 0, 0, 0, 0 }; /* black */ static XColor _Xconst background = { 0, 65535, 65535, 65535 }; /* white */ -Cursor XCreateFontCursor(dpy, which) - Display *dpy; - unsigned int which; +Cursor XCreateFontCursor( + Display *dpy, + unsigned int which) { - /* + /* * the cursor font contains the shape glyph followed by the mask * glyph; so character position 0 contains a shape, 1 the mask for 0, * 2 a shape, etc. <X11/cursorfont.h> contains hash define names @@ -47,7 +47,7 @@ Cursor XCreateFontCursor(dpy, which) if (dpy->cursor_font == None) return None; } - return XCreateGlyphCursor (dpy, dpy->cursor_font, dpy->cursor_font, + return XCreateGlyphCursor (dpy, dpy->cursor_font, dpy->cursor_font, which, which + 1, &foreground, &background); } |