mirror of
https://github.com/gwm17/glfw.git
synced 2024-11-27 04:28:52 -05:00
Removed clipboard format index macros.
This commit is contained in:
parent
3ec2925da4
commit
7012d97958
|
@ -546,13 +546,10 @@ static GLboolean initDisplay(void)
|
||||||
_glfw.x11.TARGETS = XInternAtom(_glfw.x11.display, "TARGETS", False);
|
_glfw.x11.TARGETS = XInternAtom(_glfw.x11.display, "TARGETS", False);
|
||||||
_glfw.x11.CLIPBOARD = XInternAtom(_glfw.x11.display, "CLIPBOARD", False);
|
_glfw.x11.CLIPBOARD = XInternAtom(_glfw.x11.display, "CLIPBOARD", False);
|
||||||
|
|
||||||
// Find or create selection target atoms
|
// Store clipboard format atoms in order of preference
|
||||||
_glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_UTF8] =
|
_glfw.x11.selection.formats[0] = _glfw.x11.UTF8_STRING;
|
||||||
_glfw.x11.UTF8_STRING;
|
_glfw.x11.selection.formats[1] = _glfw.x11.COMPOUND_STRING;
|
||||||
_glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_COMPOUND] =
|
_glfw.x11.selection.formats[2] = XA_STRING;
|
||||||
_glfw.x11.COMPOUND_STRING;
|
|
||||||
_glfw.x11.selection.formats[_GLFW_CLIPBOARD_FORMAT_STRING] =
|
|
||||||
XA_STRING;
|
|
||||||
|
|
||||||
return GL_TRUE;
|
return GL_TRUE;
|
||||||
}
|
}
|
||||||
|
|
|
@ -66,11 +66,7 @@
|
||||||
#define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryX11 x11
|
#define _GLFW_PLATFORM_LIBRARY_WINDOW_STATE _GLFWlibraryX11 x11
|
||||||
#define _GLFW_PLATFORM_MONITOR_STATE _GLFWmonitorX11 x11
|
#define _GLFW_PLATFORM_MONITOR_STATE _GLFWmonitorX11 x11
|
||||||
|
|
||||||
// Clipboard format atom indices (in order of preference)
|
#define _GLFW_CLIPBOARD_FORMAT_COUNT 3
|
||||||
#define _GLFW_CLIPBOARD_FORMAT_UTF8 0
|
|
||||||
#define _GLFW_CLIPBOARD_FORMAT_COMPOUND 1
|
|
||||||
#define _GLFW_CLIPBOARD_FORMAT_STRING 2
|
|
||||||
#define _GLFW_CLIPBOARD_FORMAT_COUNT 3
|
|
||||||
|
|
||||||
|
|
||||||
//========================================================================
|
//========================================================================
|
||||||
|
|
Loading…
Reference in New Issue
Block a user