Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-02-21 16:09:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland error reporting work.

Browse Source
This commit is contained in:
Camilla Berglund 2014-03-19 16:32:50 +01:00
parent ede7a585bf
commit 420f3f7840
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/wayland_init.c
View File

@ -102,7 +102,11 @@ int _glfwPlatformInit(void)
{ {
_glfw.wl.display = wl_display_connect(NULL); _glfw.wl.display = wl_display_connect(NULL);
if (!_glfw.wl.display) if (!_glfw.wl.display)
{
_glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Failed to connect to display");
return GL_FALSE; return GL_FALSE;
}
_glfw.wl.registry = wl_display_get_registry(_glfw.wl.display); _glfw.wl.registry = wl_display_get_registry(_glfw.wl.display);
wl_registry_add_listener(_glfw.wl.registry, &registryListener, NULL); wl_registry_add_listener(_glfw.wl.registry, &registryListener, NULL);

2
src/wayland_monitor.c
View File

@ -123,7 +123,7 @@ void _glfwAddOutput(uint32_t name, uint32_t version)
if (version < 2) if (version < 2)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Unsupported wl_output interface version"); "Wayland: Unsupported output interface version");
return; return;
} }

6
src/wayland_window.c
View File

@ -143,7 +143,7 @@ void _glfwPlatformGetWindowPos(_GLFWwindow* window, int* xpos, int* ypos)
// to (0, 0) // to (0, 0)
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland does not allow manual window positioning"); "Wayland: Window position retreival not supported");
if (xpos) if (xpos)
*xpos = 0; *xpos = 0;
@ -156,7 +156,7 @@ void _glfwPlatformSetWindowPos(_GLFWwindow* window, int xpos, int ypos)
// A Wayland client can not set its position, so just warn // A Wayland client can not set its position, so just warn
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland does not allow manual window positioning"); "Wayland: Window position setting not supported");
} }
void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height) void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
@ -253,7 +253,7 @@ void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
{ {
// A Wayland client can not set the cursor position // A Wayland client can not set the cursor position
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland does not allow cursor positioning"); "Wayland: Cursor position setting not supported");
} }
void _glfwPlatformApplyCursorMode(_GLFWwindow* window) void _glfwPlatformApplyCursorMode(_GLFWwindow* window)