gwm17/glfw
1
0
Fork 0
mirror of https://github.com/gwm17/glfw.git synced 2024-11-27 04:28:52 -05:00
Code Issues Projects Releases Wiki Activity

wayland: Handle hidden window as no shell surface

Browse Source
This commit is contained in:
Emmanuel Gil Peyrot 2016-04-09 00:51:48 +01:00 committed by Camilla Berglund
parent f0f5d9f644
commit 5034c6c65e
2 changed files with 55 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wl_platform.h
View File

@ -91,6 +91,8 @@ typedef struct _GLFWwindowWayland
_GLFWcursor* currentCursor; _GLFWcursor* currentCursor;
double cursorPosX, cursorPosY; double cursorPosX, cursorPosY;
char* title;
// We need to track the monitors the window spans on to calculate the // We need to track the monitors the window spans on to calculate the
// optimal scaling factor. // optimal scaling factor.
int scale; int scale;

69
src/wl_window.c
View File

@ -193,6 +193,15 @@ static GLFWbool createSurface(_GLFWwindow* window,
if (!window->wl.native) if (!window->wl.native)
return GLFW_FALSE; return GLFW_FALSE;
window->wl.width = wndconfig->width;
window->wl.height = wndconfig->height;
window->wl.scale = 1;
return GLFW_TRUE;
}
static GLFWbool createShellSurface(_GLFWwindow* window)
{
window->wl.shell_surface = wl_shell_get_shell_surface(_glfw.wl.shell, window->wl.shell_surface = wl_shell_get_shell_surface(_glfw.wl.shell,
window->wl.surface); window->wl.surface);
if (!window->wl.shell_surface) if (!window->wl.shell_surface)
@ -202,9 +211,21 @@ static GLFWbool createSurface(_GLFWwindow* window,
&shellSurfaceListener, &shellSurfaceListener,
window); window);
window->wl.width = wndconfig->width; if (window->wl.title)
window->wl.height = wndconfig->height; wl_shell_surface_set_title(window->wl.shell_surface, window->wl.title);
window->wl.scale = 1;
if (window->monitor)
{
wl_shell_surface_set_fullscreen(
window->wl.shell_surface,
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
0,
window->monitor->wl.output);
}
else
{
wl_shell_surface_set_toplevel(window->wl.shell_surface);
}
return GLFW_TRUE; return GLFW_TRUE;
} }
@ -354,17 +375,20 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
return GLFW_FALSE; return GLFW_FALSE;
} }
if (window->monitor) if (wndconfig->title)
window->wl.title = strdup(wndconfig->title);
if (wndconfig->visible)
{ {
wl_shell_surface_set_fullscreen( if (!createShellSurface(window))
window->wl.shell_surface, return GLFW_FALSE;
WL_SHELL_SURFACE_FULLSCREEN_METHOD_DEFAULT,
0, window->wl.visible = GLFW_TRUE;
window->monitor->wl.output);
} }
else else
{ {
wl_shell_surface_set_toplevel(window->wl.shell_surface); window->wl.shell_surface = NULL;
window->wl.visible = GLFW_FALSE;
} }
window->wl.currentCursor = NULL; window->wl.currentCursor = NULL;
@ -400,12 +424,17 @@ void _glfwPlatformDestroyWindow(_GLFWwindow* window)
if (window->wl.surface) if (window->wl.surface)
wl_surface_destroy(window->wl.surface); wl_surface_destroy(window->wl.surface);
free(window->wl.title);
free(window->wl.monitors); free(window->wl.monitors);
} }
void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title) void _glfwPlatformSetWindowTitle(_GLFWwindow* window, const char* title)
{ {
wl_shell_surface_set_title(window->wl.shell_surface, title); if (window->wl.title)
free(window->wl.title);
window->wl.title = strdup(title);
if (window->wl.shell_surface)
wl_shell_surface_set_title(window->wl.shell_surface, title);
} }
void _glfwPlatformSetWindowIcon(_GLFWwindow* window, void _glfwPlatformSetWindowIcon(_GLFWwindow* window,
@ -499,13 +528,22 @@ void _glfwPlatformMaximizeWindow(_GLFWwindow* window)
void _glfwPlatformShowWindow(_GLFWwindow* window) void _glfwPlatformShowWindow(_GLFWwindow* window)
{ {
wl_shell_surface_set_toplevel(window->wl.shell_surface); if (!window->monitor)
{
if (!window->wl.shell_surface)
createShellSurface(window);
window->wl.visible = GLFW_TRUE;
}
} }
void _glfwPlatformHideWindow(_GLFWwindow* window) void _glfwPlatformHideWindow(_GLFWwindow* window)
{ {
wl_surface_attach(window->wl.surface, NULL, 0, 0); if (!window->monitor)
wl_surface_commit(window->wl.surface); {
if (window->wl.shell_surface)
wl_shell_surface_destroy(window->wl.shell_surface);
window->wl.visible = GLFW_FALSE;
}
} }
void _glfwPlatformFocusWindow(_GLFWwindow* window) void _glfwPlatformFocusWindow(_GLFWwindow* window)
@ -538,8 +576,7 @@ int _glfwPlatformWindowIconified(_GLFWwindow* window)
int _glfwPlatformWindowVisible(_GLFWwindow* window) int _glfwPlatformWindowVisible(_GLFWwindow* window)
{ {
// TODO return window->wl.visible;
return GLFW_FALSE;
} }
int _glfwPlatformWindowMaximized(_GLFWwindow* window) int _glfwPlatformWindowMaximized(_GLFWwindow* window)