gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-23 10:48:51 -05:00
Code Issues Projects Releases Wiki Activity

Various Mir fixes.

Browse Source 
Changed set_type --> set_state.
Give more info back when an error happens with a connection/surface.
Small var name change size --> mirPixelFormats.

Fixes #412.
This commit is contained in:
BrandonSchaefer 2015-01-05 14:11:11 -08:00 committed by Camilla Berglund
parent 0fcbaeb596
commit cbc18bf968
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mir_init.c
View File

@ -41,7 +41,10 @@ int _glfwPlatformInit(void)
if (!mir_connection_is_valid(_glfw.mir.connection)) if (!mir_connection_is_valid(_glfw.mir.connection))
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Mir: Unable to connect to Server"); "Mir: Unable to connect to Server %s",
mir_connection_get_error_message(_glfw.mir.connection));
mir_connection_release(_glfw.mir.connection);
return GL_FALSE; return GL_FALSE;
} }

17
src/mir_window.c
View File

@ -90,11 +90,11 @@ static EventNode* dequeueEvent(EventQueue* queue)
static MirPixelFormat findValidPixelFormat(void) static MirPixelFormat findValidPixelFormat(void)
{ {
unsigned int i, validFormats, size = 32; unsigned int i, validFormats, mirPixelFormats = 32;
MirPixelFormat formats[size]; MirPixelFormat formats[mir_pixel_formats];
mir_connection_get_available_surface_formats(_glfw.mir.connection, formats, mir_connection_get_available_surface_formats(_glfw.mir.connection, formats,
size, &validFormats); mirPixelFormats, &validFormats);
for (i = 0; i < validFormats; i++) for (i = 0; i < validFormats; i++)
{ {
@ -407,7 +407,10 @@ static int createSurface(_GLFWwindow* window)
if (!mir_surface_is_valid(window->mir.surface)) if (!mir_surface_is_valid(window->mir.surface))
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Mir: Unable to create surface"); "Mir: Unable to create surface %s",
mir_surface_get_error_message(window->mir.surface));
mir_surface_release_sync(window->mir.surface);
return GL_FALSE; return GL_FALSE;
} }
@ -463,7 +466,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
GLFWvidmode mode; GLFWvidmode mode;
_glfwPlatformGetVideoMode(wndconfig->monitor, &mode); _glfwPlatformGetVideoMode(wndconfig->monitor, &mode);
mir_surface_set_type(window->mir.surface, mir_surface_state_fullscreen); mir_surface_set_state(window->mir.surface, mir_surface_state_fullscreen);
if (wndconfig->width > mode.width || wndconfig->height > mode.height) if (wndconfig->width > mode.width || wndconfig->height > mode.height)
{ {
@ -539,12 +542,12 @@ void _glfwPlatformGetWindowSize(_GLFWwindow* window, int* width, int* height)
void _glfwPlatformIconifyWindow(_GLFWwindow* window) void _glfwPlatformIconifyWindow(_GLFWwindow* window)
{ {
mir_surface_set_type(window->mir.surface, mir_surface_state_minimized); mir_surface_set_state(window->mir.surface, mir_surface_state_minimized);
} }
void _glfwPlatformRestoreWindow(_GLFWwindow* window) void _glfwPlatformRestoreWindow(_GLFWwindow* window)
{ {
mir_surface_set_type(window->mir.surface, mir_surface_state_restored); mir_surface_set_state(window->mir.surface, mir_surface_state_restored);
} }
void _glfwPlatformHideWindow(_GLFWwindow* window) void _glfwPlatformHideWindow(_GLFWwindow* window)