mirror of
https://github.com/glfw/glfw.git
synced 2024-11-14 10:34:34 +00:00
Added ability to override canBecomeKeyWindow
and canBecomeMainWindow
in Cocoa backend
This commit is contained in:
parent
b35641f4a3
commit
f07c466a20
@ -929,6 +929,18 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
#define GLFW_MOUSE_PASSTHROUGH 0x0002000D
|
#define GLFW_MOUSE_PASSTHROUGH 0x0002000D
|
||||||
|
|
||||||
|
/*! @brief Window can become the main window
|
||||||
|
*
|
||||||
|
* Only honored with Cocoa backend
|
||||||
|
*/
|
||||||
|
#define GLFW_CAN_BECOME_MAIN 0x00020010
|
||||||
|
|
||||||
|
/*! @brief Window can receive key inputs
|
||||||
|
*
|
||||||
|
* Only honored with Cocoa backend
|
||||||
|
*/
|
||||||
|
#define GLFW_CAN_BECOME_KEY 0x00020011
|
||||||
|
|
||||||
/*! @brief Initial position x-coordinate window hint.
|
/*! @brief Initial position x-coordinate window hint.
|
||||||
*
|
*
|
||||||
* Initial position x-coordinate [window hint](@ref GLFW_POSITION_X).
|
* Initial position x-coordinate [window hint](@ref GLFW_POSITION_X).
|
||||||
|
@ -752,19 +752,19 @@ static const NSRange kEmptyRange = { NSNotFound, 0 };
|
|||||||
//------------------------------------------------------------------------
|
//------------------------------------------------------------------------
|
||||||
|
|
||||||
@interface GLFWWindow : NSWindow {}
|
@interface GLFWWindow : NSWindow {}
|
||||||
|
@property _GLFWwindow* glfwWindow;
|
||||||
@end
|
@end
|
||||||
|
|
||||||
@implementation GLFWWindow
|
@implementation GLFWWindow
|
||||||
|
|
||||||
- (BOOL)canBecomeKeyWindow
|
- (BOOL)canBecomeKeyWindow
|
||||||
{
|
{
|
||||||
// Required for NSWindowStyleMaskBorderless windows
|
return self.glfwWindow->canBecomeKey;
|
||||||
return YES;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
- (BOOL)canBecomeMainWindow
|
- (BOOL)canBecomeMainWindow
|
||||||
{
|
{
|
||||||
return YES;
|
return self.glfwWindow->canBecomeMain;
|
||||||
}
|
}
|
||||||
|
|
||||||
@end
|
@end
|
||||||
@ -835,6 +835,8 @@ static GLFWbool createNativeWindow(_GLFWwindow* window,
|
|||||||
return GLFW_FALSE;
|
return GLFW_FALSE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
((GLFWWindow*)window->ns.object).glfwWindow = window;
|
||||||
|
|
||||||
if (window->monitor)
|
if (window->monitor)
|
||||||
[window->ns.object setLevel:NSMainMenuWindowLevel + 1];
|
[window->ns.object setLevel:NSMainMenuWindowLevel + 1];
|
||||||
else
|
else
|
||||||
|
@ -413,6 +413,8 @@ struct _GLFWwndconfig
|
|||||||
GLFWbool centerCursor;
|
GLFWbool centerCursor;
|
||||||
GLFWbool focusOnShow;
|
GLFWbool focusOnShow;
|
||||||
GLFWbool mousePassthrough;
|
GLFWbool mousePassthrough;
|
||||||
|
GLFWbool canBecomeMain;
|
||||||
|
GLFWbool canBecomeKey;
|
||||||
GLFWbool scaleToMonitor;
|
GLFWbool scaleToMonitor;
|
||||||
GLFWbool scaleFramebuffer;
|
GLFWbool scaleFramebuffer;
|
||||||
struct {
|
struct {
|
||||||
@ -538,6 +540,8 @@ struct _GLFWwindow
|
|||||||
GLFWbool floating;
|
GLFWbool floating;
|
||||||
GLFWbool focusOnShow;
|
GLFWbool focusOnShow;
|
||||||
GLFWbool mousePassthrough;
|
GLFWbool mousePassthrough;
|
||||||
|
GLFWbool canBecomeMain;
|
||||||
|
GLFWbool canBecomeKey;
|
||||||
GLFWbool shouldClose;
|
GLFWbool shouldClose;
|
||||||
void* userPointer;
|
void* userPointer;
|
||||||
GLFWbool doublebuffer;
|
GLFWbool doublebuffer;
|
||||||
|
20
src/window.c
20
src/window.c
@ -232,6 +232,8 @@ GLFWAPI GLFWwindow* glfwCreateWindow(int width, int height,
|
|||||||
window->floating = wndconfig.floating;
|
window->floating = wndconfig.floating;
|
||||||
window->focusOnShow = wndconfig.focusOnShow;
|
window->focusOnShow = wndconfig.focusOnShow;
|
||||||
window->mousePassthrough = wndconfig.mousePassthrough;
|
window->mousePassthrough = wndconfig.mousePassthrough;
|
||||||
|
window->canBecomeMain = wndconfig.canBecomeMain;
|
||||||
|
window->canBecomeKey = wndconfig.canBecomeKey;
|
||||||
window->cursorMode = GLFW_CURSOR_NORMAL;
|
window->cursorMode = GLFW_CURSOR_NORMAL;
|
||||||
|
|
||||||
window->doublebuffer = fbconfig.doublebuffer;
|
window->doublebuffer = fbconfig.doublebuffer;
|
||||||
@ -398,6 +400,12 @@ GLFWAPI void glfwWindowHint(int hint, int value)
|
|||||||
case GLFW_MOUSE_PASSTHROUGH:
|
case GLFW_MOUSE_PASSTHROUGH:
|
||||||
_glfw.hints.window.mousePassthrough = value ? GLFW_TRUE : GLFW_FALSE;
|
_glfw.hints.window.mousePassthrough = value ? GLFW_TRUE : GLFW_FALSE;
|
||||||
return;
|
return;
|
||||||
|
case GLFW_CAN_BECOME_MAIN:
|
||||||
|
_glfw.hints.window.canBecomeMain = value ? GLFW_TRUE : GLFW_FALSE;
|
||||||
|
return;
|
||||||
|
case GLFW_CAN_BECOME_KEY:
|
||||||
|
_glfw.hints.window.canBecomeKey = value ? GLFW_TRUE : GLFW_FALSE;
|
||||||
|
return;
|
||||||
case GLFW_CLIENT_API:
|
case GLFW_CLIENT_API:
|
||||||
_glfw.hints.context.client = value;
|
_glfw.hints.context.client = value;
|
||||||
return;
|
return;
|
||||||
@ -900,6 +908,10 @@ GLFWAPI int glfwGetWindowAttrib(GLFWwindow* handle, int attrib)
|
|||||||
return window->focusOnShow;
|
return window->focusOnShow;
|
||||||
case GLFW_MOUSE_PASSTHROUGH:
|
case GLFW_MOUSE_PASSTHROUGH:
|
||||||
return window->mousePassthrough;
|
return window->mousePassthrough;
|
||||||
|
case GLFW_CAN_BECOME_MAIN:
|
||||||
|
return window->canBecomeMain;
|
||||||
|
case GLFW_CAN_BECOME_KEY:
|
||||||
|
return window->canBecomeKey;
|
||||||
case GLFW_TRANSPARENT_FRAMEBUFFER:
|
case GLFW_TRANSPARENT_FRAMEBUFFER:
|
||||||
return _glfw.platform.framebufferTransparent(window);
|
return _glfw.platform.framebufferTransparent(window);
|
||||||
case GLFW_RESIZABLE:
|
case GLFW_RESIZABLE:
|
||||||
@ -981,6 +993,14 @@ GLFWAPI void glfwSetWindowAttrib(GLFWwindow* handle, int attrib, int value)
|
|||||||
window->mousePassthrough = value;
|
window->mousePassthrough = value;
|
||||||
_glfw.platform.setWindowMousePassthrough(window, value);
|
_glfw.platform.setWindowMousePassthrough(window, value);
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
case GLFW_CAN_BECOME_MAIN:
|
||||||
|
window->canBecomeMain = value;
|
||||||
|
return;
|
||||||
|
|
||||||
|
case GLFW_CAN_BECOME_KEY:
|
||||||
|
window->canBecomeKey = value;
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
_glfwInputError(GLFW_INVALID_ENUM, "Invalid window attribute 0x%08X", attrib);
|
_glfwInputError(GLFW_INVALID_ENUM, "Invalid window attribute 0x%08X", attrib);
|
||||||
|
Loading…
Reference in New Issue
Block a user