asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #21910 from hpvb/fix-8145-x11

Browse source 
Update X11 global mouse position at startup
This commit is contained in:
Rémi Verschelde 2018-09-12 11:03:36 +02:00 committed by GitHub
commit a4958bb867
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
platform/x11/os_x11.cpp
View file

@ -581,6 +581,8 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
} }
} }
update_real_mouse_position();
return OK; return OK;
} }
@ -1050,6 +1052,7 @@ Point2 OS_X11::get_window_position() const {
void OS_X11::set_window_position(const Point2 &p_position) { void OS_X11::set_window_position(const Point2 &p_position) {
XMoveWindow(x11_display, x11_window, p_position.x, p_position.y); XMoveWindow(x11_display, x11_window, p_position.x, p_position.y);
update_real_mouse_position();
} }
Size2 OS_X11::get_window_size() const { Size2 OS_X11::get_window_size() const {
@ -2972,6 +2975,25 @@ OS::LatinKeyboardVariant OS_X11::get_latin_keyboard_variant() const {
return LATIN_KEYBOARD_QWERTY; return LATIN_KEYBOARD_QWERTY;
} }
void OS_X11::update_real_mouse_position() {
Window root_return, child_return;
int root_x, root_y, win_x, win_y;
unsigned int mask_return;
Bool xquerypointer_result = XQueryPointer(x11_display, x11_window, &root_return, &child_return, &root_x, &root_y,
&win_x, &win_y, &mask_return);
if (xquerypointer_result) {
if (win_x > 0 && win_y > 0 && win_x <= current_videomode.width && win_y <= current_videomode.height) {
last_mouse_pos.x = win_x;
last_mouse_pos.y = win_y;
last_mouse_pos_valid = true;
input->set_mouse_position(last_mouse_pos);
}
}
}
OS_X11::OS_X11() { OS_X11::OS_X11() {
#ifdef PULSEAUDIO_ENABLED #ifdef PULSEAUDIO_ENABLED

1
platform/x11/os_x11.h
View file

@ -313,6 +313,7 @@ public:
virtual LatinKeyboardVariant get_latin_keyboard_variant() const; virtual LatinKeyboardVariant get_latin_keyboard_variant() const;
void update_real_mouse_position();
OS_X11(); OS_X11();
}; };