From 56e8df2f9675654d398cf790e8be60890bef1378 Mon Sep 17 00:00:00 2001 From: "robbin.marcus" Date: Sun, 25 Sep 2022 00:22:17 +0200 Subject: [PATCH] Attempt to fix build errors Removed some changes that slipped past me during the latest merge. --- src/cocoa_window.m | 5 -- src/wl_window.c | 4 +- src/x11_window.c | 8 +- tests/windows.c | 180 --------------------------------------------- 4 files changed, 6 insertions(+), 191 deletions(-) delete mode 100644 tests/windows.c diff --git a/src/cocoa_window.m b/src/cocoa_window.m index 047e1d9e..64e6a289 100644 --- a/src/cocoa_window.m +++ b/src/cocoa_window.m @@ -1245,11 +1245,6 @@ void _glfwPlatformResizeWindow(_GLFWwindow* window, int border) { } -void _glfwPlatformSetWindowMonitor(_GLFWwindow* window, - _GLFWmonitor* monitor, - int xpos, int ypos, - int width, int height, - int refreshRate) void _glfwSetWindowMonitorCocoa(_GLFWwindow* window, _GLFWmonitor* monitor, int xpos, int ypos, diff --git a/src/wl_window.c b/src/wl_window.c index 001c0fca..783061c9 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -2100,7 +2100,7 @@ void _glfwFocusWindowWayland(_GLFWwindow* window) void _glfwPlatformDragWindow(_GLFWwindow* window) { - wl_shell_surface_move(window->wl.shellSurface, _glfw.wl.seat, _glfw.wl.serial); + wl_shell_surface_move(window->wl.surface, _glfw.wl.seat, _glfw.wl.serial); } void _glfwPlatformResizeWindow(_GLFWwindow* window, int border) @@ -2135,7 +2135,7 @@ void _glfwPlatformResizeWindow(_GLFWwindow* window, int border) default: assert(GLFW_FALSE); } - wl_shell_surface_resize(window->wl.shellSurface, + wl_shell_surface_resize(window->wl.surface, _glfw.wl.seat, _glfw.wl.serial, wlBorder); diff --git a/src/x11_window.c b/src/x11_window.c index edeebe8f..834460ab 100644 --- a/src/x11_window.c +++ b/src/x11_window.c @@ -2483,8 +2483,8 @@ void _glfwPlatformDragWindow(_GLFWwindow* window) memset(&xclient, 0, sizeof(XClientMessageEvent)); XUngrabPointer(_glfw.x11.display, 0); XFlush(_glfw.x11.display); - _glfwPlatformGetCursorPos(window, &curXpos, &curYpos); - _glfwPlatformGetWindowPos(window, &winXpos, &winYpos); + _glfwGetCursorPosX11(window, &curXpos, &curYpos); + _glfwGetWindowPosX11(window, &winXpos, &winYpos); xclient.type = ClientMessage; xclient.window = window->x11.handle; xclient.message_type = XInternAtom(_glfw.x11.display, "_NET_WM_MOVERESIZE", False); @@ -2505,8 +2505,8 @@ void _glfwPlatformResizeWindow(_GLFWwindow* window, int border) memset(&xclient, 0, sizeof(XClientMessageEvent)); XUngrabPointer(_glfw.x11.display, 0); XFlush(_glfw.x11.display); - _glfwPlatformGetCursorPos(window, &curXpos, &curYpos); - _glfwPlatformGetWindowPos(window, &winXpos, &winYpos); + _glfwGetCursorPosX11(window, &curXpos, &curYpos); + _glfwGetWindowPosX11(window, &winXpos, &winYpos); xclient.type = ClientMessage; xclient.window = window->x11.handle; xclient.message_type = XInternAtom(_glfw.x11.display, "_NET_WM_MOVERESIZE", False); diff --git a/tests/windows.c b/tests/windows.c deleted file mode 100644 index c98d11fb..00000000 --- a/tests/windows.c +++ /dev/null @@ -1,180 +0,0 @@ -//======================================================================== -// Simple multi-window test -// Copyright (c) Camilla Löwy -// -// This software is provided 'as-is', without any express or implied -// warranty. In no event will the authors be held liable for any damages -// arising from the use of this software. -// -// Permission is granted to anyone to use this software for any purpose, -// including commercial applications, and to alter it and redistribute it -// freely, subject to the following restrictions: -// -// 1. The origin of this software must not be misrepresented; you must not -// claim that you wrote the original software. If you use this software -// in a product, an acknowledgment in the product documentation would -// be appreciated but is not required. -// -// 2. Altered source versions must be plainly marked as such, and must not -// be misrepresented as being the original software. -// -// 3. This notice may not be removed or altered from any source -// distribution. -// -//======================================================================== -// -// This test creates four windows and clears each in a different color -// -//======================================================================== - -#include -#include - -#include -#include - -#include "getopt.h" - -static const char* titles[] = -{ - "Red", - "Green", - "Blue", - "Yellow" -}; - -static const struct -{ - float r, g, b; -} colors[] = -{ - { 0.95f, 0.32f, 0.11f }, - { 0.50f, 0.80f, 0.16f }, - { 0.f, 0.68f, 0.94f }, - { 0.98f, 0.74f, 0.04f } -}; - -static void usage(void) -{ - printf("Usage: windows [-h] [-b] [-f] \n"); - printf("Options:\n"); - printf(" -b create decorated windows\n"); - printf(" -f set focus on show off for all but first window\n"); - printf(" -h show this help\n"); -} - -static void error_callback(int error, const char* description) -{ - fprintf(stderr, "Error: %s\n", description); -} - -static void key_callback(GLFWwindow* window, int key, int scancode, int action, int mods) -{ - if (action != GLFW_PRESS) - return; - - switch (key) - { - case GLFW_KEY_SPACE: - { - int xpos, ypos; - glfwGetWindowPos(window, &xpos, &ypos); - glfwSetWindowPos(window, xpos, ypos); - break; - } - - case GLFW_KEY_ESCAPE: - glfwSetWindowShouldClose(window, GLFW_TRUE); - break; - } -} - -void mouse_button_callback(GLFWwindow* window, int button, int action, int mods) -{ - if (button == GLFW_MOUSE_BUTTON_LEFT && action == GLFW_PRESS) - glfwDragWindow(window); -} - -int main(int argc, char** argv) -{ - int i, ch; - int decorated = GLFW_FALSE; - int focusOnShow = GLFW_TRUE; - int running = GLFW_TRUE; - GLFWwindow* windows[4]; - - while ((ch = getopt(argc, argv, "bfh")) != -1) - { - switch (ch) - { - case 'b': - decorated = GLFW_TRUE; - break; - case 'f': - focusOnShow = GLFW_FALSE; - break; - case 'h': - usage(); - exit(EXIT_SUCCESS); - default: - usage(); - exit(EXIT_FAILURE); - } - } - - glfwSetErrorCallback(error_callback); - - if (!glfwInit()) - exit(EXIT_FAILURE); - - glfwWindowHint(GLFW_DECORATED, decorated); - glfwWindowHint(GLFW_VISIBLE, GLFW_FALSE); - - for (i = 0; i < 4; i++) - { - int left, top, right, bottom; - if (i) - glfwWindowHint(GLFW_FOCUS_ON_SHOW, focusOnShow); - - windows[i] = glfwCreateWindow(200, 200, titles[i], NULL, NULL); - if (!windows[i]) - { - glfwTerminate(); - exit(EXIT_FAILURE); - } - - glfwSetKeyCallback(windows[i], key_callback); - glfwSetMouseButtonCallback(windows[i], mouse_button_callback); - - glfwMakeContextCurrent(windows[i]); - gladLoadGL(glfwGetProcAddress); - glClearColor(colors[i].r, colors[i].g, colors[i].b, 1.f); - - glfwGetWindowFrameSize(windows[i], &left, &top, &right, &bottom); - glfwSetWindowPos(windows[i], - 100 + (i & 1) * (200 + left + right), - 100 + (i >> 1) * (200 + top + bottom)); - } - - for (i = 0; i < 4; i++) - glfwShowWindow(windows[i]); - - while (running) - { - for (i = 0; i < 4; i++) - { - glfwMakeContextCurrent(windows[i]); - glClear(GL_COLOR_BUFFER_BIT); - glfwSwapBuffers(windows[i]); - - if (glfwWindowShouldClose(windows[i])) - running = GLFW_FALSE; - } - - glfwWaitEvents(); - } - - glfwTerminate(); - exit(EXIT_SUCCESS); -} -