mirror of
https://gitlab.uni-freiburg.de/opensourcevdi/win32-vd_agent
synced 2026-01-07 02:44:09 +00:00
b127e5fdae
On any change of the display settings, driven by client message or guest user, normalize all display positions to non-negative coordinates, and update total width and height of the virtual desktop. The bug was due to wrong handling of (non-primary) displays positioned on negative coordinates. Primary monitor is always located (in windows) in (0,0). When a secondary monitor is positioned above/to the left of the primary, it will have negative coordinate. This can be the case when guest display settings are changed either manually on the guest, or due to a message (auto-conf VD_AGENT_MONITORS_CONFIG) from the client to the agent. In VDAgent::handle_mouse_event(), mouse event is generated by scaling the received (x,y, display_id) to normalized absolute coordinates (0..0xffff) on the entire virtual desktop which contains all the displays. Keeping negative display coordinates, as received from the client, was mistakenly handled and generated wrong (sometimes even negative) coordinates.
90 lines
2.6 KiB
C++
90 lines
2.6 KiB
C++
/*
|
|
Copyright (C) 2009 Red Hat, Inc.
|
|
|
|
This program is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public License as
|
|
published by the Free Software Foundation; either version 2 of
|
|
the License, or (at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#ifndef _H_DESKTOP_LAYOUT
|
|
#define _H_DESKTOP_LAYOUT
|
|
|
|
#include <vector>
|
|
#include "vdcommon.h"
|
|
|
|
class DisplayMode {
|
|
public:
|
|
DisplayMode(LONG pos_x, LONG pos_y, DWORD width, DWORD height, DWORD depth, bool attached)
|
|
: _pos_x (pos_x)
|
|
, _pos_y (pos_y)
|
|
, _width (width)
|
|
, _height (height)
|
|
, _depth (depth)
|
|
, _attached (attached)
|
|
{
|
|
}
|
|
|
|
LONG get_pos_x() { return _pos_x;}
|
|
LONG get_pos_y() { return _pos_y;}
|
|
DWORD get_width() { return _width;}
|
|
DWORD get_height() { return _height;}
|
|
DWORD get_depth() { return _depth;}
|
|
bool get_attached() { return _attached;}
|
|
void set_pos(LONG x, LONG y) { _pos_x = x; _pos_y = y;}
|
|
void move_pos(LONG x, LONG y) { _pos_x += x; _pos_y += y;}
|
|
void set_res(DWORD width, DWORD height, DWORD depth);
|
|
void set_depth(DWORD depth) { _depth = depth;}
|
|
void set_attached(bool attached) { _attached = attached;}
|
|
|
|
private:
|
|
LONG _pos_x;
|
|
LONG _pos_y;
|
|
DWORD _width;
|
|
DWORD _height;
|
|
DWORD _depth;
|
|
bool _attached;
|
|
|
|
friend class DesktopLayout;
|
|
};
|
|
|
|
typedef std::vector<DisplayMode*> Displays;
|
|
|
|
class DesktopLayout {
|
|
public:
|
|
DesktopLayout();
|
|
~DesktopLayout();
|
|
void get_displays();
|
|
void set_displays();
|
|
void lock() { MUTEX_LOCK(_mutex);}
|
|
void unlock() { MUTEX_UNLOCK(_mutex);}
|
|
DisplayMode* get_display(int i) { return _displays.at(i);}
|
|
size_t get_display_count() { return _displays.size();}
|
|
DWORD get_total_width() { return _total_width;}
|
|
DWORD get_total_height() { return _total_height;}
|
|
|
|
private:
|
|
void clean_displays();
|
|
void normalize_displays_pos();
|
|
static bool consistent_displays();
|
|
static bool is_attached(LPCTSTR dev_name);
|
|
static bool get_qxl_device_id(WCHAR* device_key, DWORD* device_id);
|
|
static bool init_dev_mode(LPCTSTR dev_name, DEVMODE* dev_mode, DisplayMode* mode, bool set_pos);
|
|
|
|
private:
|
|
mutex_t _mutex;
|
|
Displays _displays;
|
|
DWORD _total_width;
|
|
DWORD _total_height;
|
|
};
|
|
|
|
#endif
|