mirror/godot
2
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2025-01-18 20:40:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Improve the situation of DND on X11

Browse Source
This commit is contained in:
Juan Linietsky 2020-07-03 12:08:37 -03:00
parent 96644d23a0
commit 14263d3d0d
2 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
platform/linuxbsd/display_server_x11.cpp
View File

@ -410,7 +410,18 @@ void DisplayServerX11::mouse_warp_to_position(const Point2i &p_to) {
} }
Point2i DisplayServerX11::mouse_get_position() const { Point2i DisplayServerX11::mouse_get_position() const {
return last_mouse_pos; int root_x, root_y;
int win_x, win_y;
unsigned int mask_return;
Window window_returned;
Bool result = XQueryPointer(x11_display, RootWindow(x11_display, DefaultScreen(x11_display)), &window_returned,
&window_returned, &root_x, &root_y, &win_x, &win_y,
&mask_return);
if (result == True) {
return Point2i(root_x, root_y);
}
return Point2i();
} }
Point2i DisplayServerX11::mouse_get_absolute_position() const { Point2i DisplayServerX11::mouse_get_absolute_position() const {
@ -718,6 +729,14 @@ ObjectID DisplayServerX11::window_get_attached_instance_id(WindowID p_window) co
} }
DisplayServerX11::WindowID DisplayServerX11::get_window_at_screen_position(const Point2i &p_position) const { DisplayServerX11::WindowID DisplayServerX11::get_window_at_screen_position(const Point2i &p_position) const {
#warning This is an incorrect implementation, if windows overlap, it should return the topmost visible one or none if occluded by a foreign window
for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
Rect2i win_rect = Rect2i(window_get_position(E->key()), window_get_size(E->key()));
if (win_rect.has_point(p_position)) {
return E->key();
}
}
return INVALID_WINDOW_ID; return INVALID_WINDOW_ID;
} }

2
platform/osx/display_server_osx.mm
View File

@ -3374,6 +3374,8 @@ String DisplayServerOSX::ime_get_text() const {
} }
DisplayServer::WindowID DisplayServerOSX::get_window_at_screen_position(const Point2i &p_position) const { DisplayServer::WindowID DisplayServerOSX::get_window_at_screen_position(const Point2i &p_position) const {
#warning This is an incorrect implementation, if windows overlap, it should return the topmost visible one or none if occluded by a foreign window
for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) { for (Map<WindowID, WindowData>::Element *E = windows.front(); E; E = E->next()) {
Rect2i win_rect = Rect2i(window_get_position(E->key()), window_get_size(E->key())); Rect2i win_rect = Rect2i(window_get_position(E->key()), window_get_size(E->key()));
if (win_rect.has_point(p_position)) { if (win_rect.has_point(p_position)) {