diff options
author | Rémi Verschelde <rverschelde@gmail.com> | 2020-07-01 16:28:20 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-01 16:28:20 +0200 |
commit | 2fc3c5bb9f0250cb5caecb79f8dc00c100d1e189 (patch) | |
tree | c6c45a4db687fe5ae42019e9f6ac677393f69c4d /platform/linuxbsd/display_server_x11.h | |
parent | 34e011c8a5ba4b9482a44b5601c28c68d65588d3 (diff) | |
parent | 239942cfefc51a907b3fe7eff72818b4a7732726 (diff) | |
download | redot-engine-2fc3c5bb9f0250cb5caecb79f8dc00c100d1e189.tar.gz |
Merge pull request #40015 from reduz/fix-embedded_subwindow-input
Ensure embedded mode works again
Diffstat (limited to 'platform/linuxbsd/display_server_x11.h')
-rw-r--r-- | platform/linuxbsd/display_server_x11.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/platform/linuxbsd/display_server_x11.h b/platform/linuxbsd/display_server_x11.h index 3b2ff0e08d..3d0b2c7e8a 100644 --- a/platform/linuxbsd/display_server_x11.h +++ b/platform/linuxbsd/display_server_x11.h @@ -139,6 +139,8 @@ class DisplayServerX11 : public DisplayServer { bool borderless = false; bool resize_disabled = false; Vector2i last_position_before_fs; + bool focused = false; + bool minimized = false; }; Map<WindowID, WindowData> windows; @@ -164,6 +166,7 @@ class DisplayServerX11 : public DisplayServer { uint64_t last_click_ms; int last_click_button_index; uint32_t last_button_state; + bool app_focused = false; struct { int opcode; @@ -195,8 +198,8 @@ class DisplayServerX11 : public DisplayServer { void _handle_key_event(WindowID p_window, XKeyEvent *p_event, bool p_echo = false); - bool minimized; - bool window_has_focus; + //bool minimized; + //bool window_has_focus; bool do_mouse_warp; const char *cursor_theme; @@ -210,7 +213,7 @@ class DisplayServerX11 : public DisplayServer { bool layered_window; String rendering_driver; - bool window_focused; + //bool window_focused; //void set_wm_border(bool p_enabled); void set_wm_fullscreen(bool p_enabled); void set_wm_above(bool p_enabled); |